diff --git a/BaseBuild/Basesys/bzip2 b/BaseBuild/Basesys/bzip2 index 0c2a29e..6541c5e 100644 --- a/BaseBuild/Basesys/bzip2 +++ b/BaseBuild/Basesys/bzip2 @@ -78,6 +78,7 @@ mk32() { make -f Makefile-libbz2_so \ CC="gcc ${BUILDOPTIONS32}" \ CXX="g++ ${BUILDOPTIONS32}" + make clean make CC="gcc ${BUILDOPTIONS32}" CXX="g++ ${BUILDOPTIONS32}" libbz2.a mkdir -p $TMPROOT/usr/lib $TMPROOT/lib cp -v libbz2.a $TMPROOT/usr/lib @@ -88,8 +89,8 @@ mk32() { } mk() { - SrcPatch $MAKEDIR/bzip2* $LFSSOURCE/$SRCPATH/bzip2-*-install_docs-1.patch* - SrcPatch $MAKEDIR/bzip2* $LFSSOURCE/$SRCPATH/bzip2-*-remove_tempfile-1.patch* +# SrcPatch $MAKEDIR/bzip2* $LFSSOURCE/$SRCPATH/bzip2-*-install_docs-1.patch* +# SrcPatch $MAKEDIR/bzip2* $LFSSOURCE/$SRCPATH/bzip2-*-remove_tempfile-1.patch* if [ "$MK64BIT" == "true" ]; then sed -i 's@/lib\(/\| \|$\)@/lib64\1@g' Makefile fi @@ -99,7 +100,7 @@ mk() { make -j $NUMCPU clean make -j $NUMCPU CC="gcc -fPIC ${BUILDOPTIONS}" \ CXX="gcc -fPIC ${BUILDOPTIONS}" - make -j $NUMCPU install + make -j $NUMCPU PREFIX=/usr install make PREFIX=$TMPROOT/usr install rm $TMPROOT/usr/man } @@ -108,7 +109,6 @@ postmk() { mkdir -p $TMPROOT/bin $TMPROOT/usr/share/man/man1 $TMPROOT/lib WDIR=`pwd` cp bzip2-shared $TMPROOT/bin/bzip2 - ln -sf libbz2.so.1.0 libbz2.so if [ "$MK64BIT" == "true" ]; then mkdir $TMPROOT/lib64 cp -a libbz2.so* libbz2.a $TMPROOT/lib64