Lib Pfade und Erstellung korrigiert, so das ein ldconfig -v jetzt fehlerfrei bleibt
git-svn-id: svn://svn.compuextreme.de/Viitor/V962/ViitorMake@4699 504e572c-2e33-0410-9681-be2bf7408885
This commit is contained in:
parent
9e50fc5035
commit
c88f0f0658
@ -86,7 +86,7 @@ mk32() {
|
||||
mkdir -p $TMPROOT/usr/lib $TMPROOT/lib
|
||||
cp -v libbz2.a $TMPROOT/usr/lib
|
||||
cp -av libbz2.so* $TMPROOT/lib
|
||||
ln -sv ../../libbz2.so.1.0 $TMPROOT/usr/lib/libbz2.so
|
||||
ln -sv ../../lib/libbz2.so.1.0 $TMPROOT/usr/lib/libbz2.so
|
||||
make clean
|
||||
make distclean
|
||||
}
|
||||
@ -113,10 +113,10 @@ postmk() {
|
||||
if [ "$MK64BIT" == "true" ]; then
|
||||
mkdir $TMPROOT/lib64
|
||||
cp -a libbz2.so* libbz2.a $TMPROOT/lib64
|
||||
ln -sf ../../lib/libbz2.so $TMPROOT/usr/lib64/libbz2.so
|
||||
ln -sf ../../lib64/libbz2.so.1.0 $TMPROOT/usr/lib64/libbz2.so
|
||||
else
|
||||
cp -a libbz2.so* libbz2.a $TMPROOT/lib
|
||||
ln -sf ../../lib/libbz2.so $TMPROOT/usr/lib/libbz2.so
|
||||
ln -sf ../../lib/libbz2.so.1.0 $TMPROOT/usr/lib/libbz2.so
|
||||
fi
|
||||
cd $TMPROOT/usr/bin
|
||||
rm bunzip2 bzcat bzip2
|
||||
|
@ -100,12 +100,21 @@ mk32() {
|
||||
rm -r ../build-shadow
|
||||
mkdir ../build-shadow
|
||||
cd ../build-shadow
|
||||
mkdir /tmp/shadow
|
||||
cd /tmp/shadow
|
||||
ar -x $TMPROOT/lib/libshadow.a
|
||||
gcc $BUILDOPTIONS32 -shared -Wl,-soname,libshadow.so.0 -o $TMPROOT/lib/libshadow.so.0 *.o
|
||||
rm *.o
|
||||
ar -x $TMPROOT/lib/libmisc.a
|
||||
gcc $BUILDOPTIONS32 -shared -Wl,-soname,libmisc.so.0 -o $TMPROOT/lib/libmisc.so.0 *.o
|
||||
cd -
|
||||
rm -r /tmp/shadow
|
||||
}
|
||||
|
||||
|
||||
mk() {
|
||||
CC="gcc ${BUILDOPTIONS}" \
|
||||
CC="gcc ${BUILDOPTIONS}" \
|
||||
CC="gcc ${BUILDOPTIONS} -fPIC" \
|
||||
CC="gcc ${BUILDOPTIONS} -fPIC" \
|
||||
../shadow*/configure --host=$TARGET \
|
||||
--prefix=/usr \
|
||||
--libdir=/$LIBDIR \
|
||||
@ -127,8 +136,17 @@ mk() {
|
||||
if [ ! -d $TMPROOT/usr/$LIBDIR ]; then
|
||||
mkdir $TMPROOT/usr/$LIBDIR
|
||||
fi
|
||||
cp lib/.libs/libshadow.a $TMPROOT/usr/$LIBDIR
|
||||
cp lib/.libs/libshadow.a $TMPROOT/$LIBDIR
|
||||
cp libmisc/libmisc.a $TMPROOT/$LIBDIR
|
||||
mkdir /tmp/shadow
|
||||
cd /tmp/shadow
|
||||
ar -x $TMPROOT/$LIBDIR/libshadow.a
|
||||
gcc $BUILDOPTIONS -shared -Wl,-soname,libshadow.so.0 -o $TMPROOT/$LIBDIR/libshadow.so.0 *.o
|
||||
rm *.o
|
||||
ar -x $TMPROOT/$LIBDIR/libmisc.a
|
||||
gcc $BUILDOPTIONS -shared -Wl,-soname,libmisc.so.0 -o $TMPROOT/$LIBDIR/libmisc.so.0 *.o
|
||||
cd -
|
||||
rm -r /tmp/shadow
|
||||
}
|
||||
|
||||
postmk() {
|
||||
|
@ -105,7 +105,7 @@ mk32() {
|
||||
cd $MAKEDIR/zlib-*
|
||||
mkdir -p $TMPROOT/lib
|
||||
mv -v $TMPROOT/usr/lib/libz.so.* $TMPROOT/lib
|
||||
ln -s ../../lib/libz.so.1 $TMPROOT/usr/lib/libz.so
|
||||
ln -sf ../../lib/libz.so.1 $TMPROOT/usr/lib/libz.so
|
||||
mv /usr/lib/libz.a $TMPROOT/usr/lib/libz.a
|
||||
chmod -v 644 $TMPROOT/usr/lib/libz.a
|
||||
make distclean
|
||||
@ -131,7 +131,7 @@ mk() {
|
||||
mkdir -p $TMPROOT/$LIBDIR
|
||||
mv libz.a $TMPROOT/usr/$LIBDIR
|
||||
mv -v $TMPROOT/usr/$LIBDIR/libz.so.* $TMPROOT/$LIBDIR
|
||||
ln -s ../../$LIBDIR/libz.so.1 $TMPROOT/usr/$LIBDIR/libz.so
|
||||
ln -sf ../../$LIBDIR/libz.so.1 $TMPROOT/usr/$LIBDIR/libz.so
|
||||
chmod -v 644 $TMPROOT/usr/$LIBDIR/libz.a
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user