Unnoetiger link entfernt
git-svn-id: svn://svn.compuextreme.de/Viitor/V962/ViitorMake@4504 504e572c-2e33-0410-9681-be2bf7408885
This commit is contained in:
parent
a1650b682d
commit
112e58307d
@ -78,6 +78,7 @@ mk32() {
|
|||||||
make -f Makefile-libbz2_so \
|
make -f Makefile-libbz2_so \
|
||||||
CC="gcc ${BUILDOPTIONS32}" \
|
CC="gcc ${BUILDOPTIONS32}" \
|
||||||
CXX="g++ ${BUILDOPTIONS32}"
|
CXX="g++ ${BUILDOPTIONS32}"
|
||||||
|
make clean
|
||||||
make CC="gcc ${BUILDOPTIONS32}" CXX="g++ ${BUILDOPTIONS32}" libbz2.a
|
make CC="gcc ${BUILDOPTIONS32}" CXX="g++ ${BUILDOPTIONS32}" libbz2.a
|
||||||
mkdir -p $TMPROOT/usr/lib $TMPROOT/lib
|
mkdir -p $TMPROOT/usr/lib $TMPROOT/lib
|
||||||
cp -v libbz2.a $TMPROOT/usr/lib
|
cp -v libbz2.a $TMPROOT/usr/lib
|
||||||
@ -88,8 +89,8 @@ mk32() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
mk() {
|
mk() {
|
||||||
SrcPatch $MAKEDIR/bzip2* $LFSSOURCE/$SRCPATH/bzip2-*-install_docs-1.patch*
|
# 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-*-remove_tempfile-1.patch*
|
||||||
if [ "$MK64BIT" == "true" ]; then
|
if [ "$MK64BIT" == "true" ]; then
|
||||||
sed -i 's@/lib\(/\| \|$\)@/lib64\1@g' Makefile
|
sed -i 's@/lib\(/\| \|$\)@/lib64\1@g' Makefile
|
||||||
fi
|
fi
|
||||||
@ -99,7 +100,7 @@ mk() {
|
|||||||
make -j $NUMCPU clean
|
make -j $NUMCPU clean
|
||||||
make -j $NUMCPU CC="gcc -fPIC ${BUILDOPTIONS}" \
|
make -j $NUMCPU CC="gcc -fPIC ${BUILDOPTIONS}" \
|
||||||
CXX="gcc -fPIC ${BUILDOPTIONS}"
|
CXX="gcc -fPIC ${BUILDOPTIONS}"
|
||||||
make -j $NUMCPU install
|
make -j $NUMCPU PREFIX=/usr install
|
||||||
make PREFIX=$TMPROOT/usr install
|
make PREFIX=$TMPROOT/usr install
|
||||||
rm $TMPROOT/usr/man
|
rm $TMPROOT/usr/man
|
||||||
}
|
}
|
||||||
@ -108,7 +109,6 @@ postmk() {
|
|||||||
mkdir -p $TMPROOT/bin $TMPROOT/usr/share/man/man1 $TMPROOT/lib
|
mkdir -p $TMPROOT/bin $TMPROOT/usr/share/man/man1 $TMPROOT/lib
|
||||||
WDIR=`pwd`
|
WDIR=`pwd`
|
||||||
cp bzip2-shared $TMPROOT/bin/bzip2
|
cp bzip2-shared $TMPROOT/bin/bzip2
|
||||||
ln -sf libbz2.so.1.0 libbz2.so
|
|
||||||
if [ "$MK64BIT" == "true" ]; then
|
if [ "$MK64BIT" == "true" ]; then
|
||||||
mkdir $TMPROOT/lib64
|
mkdir $TMPROOT/lib64
|
||||||
cp -a libbz2.so* libbz2.a $TMPROOT/lib64
|
cp -a libbz2.so* libbz2.a $TMPROOT/lib64
|
||||||
|
Loading…
Reference in New Issue
Block a user