Anpassung an neue Version. Diverse neue patches für Multilib. Workaarounds, da nicht sauber

(trotz patch) nach /usr/lib64 installiert wird.



git-svn-id: svn://svn.compuextreme.de/Viitor/V962/ViitorMake@4667 504e572c-2e33-0410-9681-be2bf7408885
This commit is contained in:
kueller 2009-05-04 09:30:18 +00:00
parent 874e2e9d2a
commit f294e86671

View File

@ -70,6 +70,9 @@
SRCPATH=Tools/lib
(( MKPKG = $MKPKG | 4 ))
(( MKPKG = $MKPKG | 128 ))
#Funktion wird nach dem Entpacken der Sourcen, im Tree der Sourcen
#ausgeführt (sprich unpack src; cd src; premk)
#Hier kann z.B. das Makefile gepatcht werden (SED lässt grüssen
@ -79,53 +82,61 @@ premk() {
}
mk32() {
CC="gcc $BUILDOPTIONS32" \
CXX="g++ $BUILDOPTIONS32" \
LANG="C" \
./Configure --prefix=/usr \
--openssldir=/usr/share/ssl \
threads \
shared \
zlib \
linux-generic32 &&
make CC="gcc $BUILDOPTIONS32" \
CXX="g++ $BUILDOPTIONS32" &&
make INSTALL_PREFIX=$TMPROOT install
make clean
tar -C $MAKEDIR -xvf $LFSSOURCE/$SRCPATH/openssl-*.tar.*
SrcPatch $MAKEDIR/openssl* $LFSSOURCE/$SRCPATH/openssl-*-32bit_x86_64-*.patch.*
SrcPatch $MAKEDIR/openssl* $LFSSOURCE/$SRCPATH/openssl-*-fix_manpages-*.patch.*
SrcPatch $MAKEDIR/openssl* $LFSSOURCE/$SRCPATH/openssl-*-build_fix-*.patch.*
SrcPatch $MAKEDIR/openssl* $LFSSOURCE/$SRCPATH/openssl-*-mips_support-*.patch.*
cd $MAKEDIR/openssl*
USE_ARCH=$UARCH \
./Configure linux-x86_64-32 \
--openssldir=/etc/sysconfig/ssl \
--prefix=/usr \
shared
make -j $NUMCPU MANDIR=/usr/share/man
make INSTALL_PREFIX=$TMPROOT MANDIR=/usr/share/man install
cd ..
rm -r $MAKEDIR/openssl*
}
#Hier wird der Make Prozess der Sourcen definiert
mk() {
tar -C $MAKEDIR -xvf $LFSSOURCE/$SRCPATH/openssl-*.tar.*
if [ "$MK64BIT" == "true" ]; then
SrcPatch $MAKEDIR/openssl* $LFSSOURCE/$SRCPATH/openssl-*-allow_lib64-*.patch.*
SYSTYPE=linux-x86_64
mv $TMPROOT/usr/lib $TMPROOT/usr/lib32
sed -e "s%/lib%/lib64%" Makefile >/tmp/Makefile
mv /tmp/Makefile .
fi
CC="gcc $BUILDOPTIONS" \
CXX="g++ $BUILDOPTIONS" \
LANG="C" \
./config --prefix=/usr \
--openssldir=/usr/share/ssl \
threads \
shared \
zlib &&
make CC="gcc $BUILDOPTIONS" \
CXX="g++ $BUILDOPTIONS" &&
make INSTALL_PREFIX=$TMPROOT install
if [ "$MK64BIT" == "true" ]; then
mv $TMPROOT/usr/lib $TMPROOT/usr/lib64
mv $TMPROOT/usr/lib32 $TMPROOT/usr/lib
cd $TMPROOT/usr/lib64/pkgconfig
for i in *.pc; do
sed -e "s%/lib%/lib64%" $i >/tmp/$i
mv /tmp/$i .
done
cd -
mkdir -p $TMPROOT/usr/lib64/engines
ln -s lib64/engines $TMPROOT/usr/engines
ln -s lib64 $TMPROOT/usr/lib
else
SYSTYPE=linux-generic32
fi
SrcPatch $MAKEDIR/openssl* $LFSSOURCE/$SRCPATH/openssl-*-fix_manpages-*.patch.*
SrcPatch $MAKEDIR/openssl* $LFSSOURCE/$SRCPATH/openssl-*-build_fix-*.patch.*
SrcPatch $MAKEDIR/openssl* $LFSSOURCE/$SRCPATH/openssl-*-mips_support-*.patch.*
cd $MAKEDIR/openssl*
USE_ARCH=$UARCH \
./Configure $SYSTYPE \
--openssldir=/etc/sysconfig/ssl \
--prefix=/usr \
shared
make MANDIR=/usr/share/man
make INSTALL_PREFIX=$TMPROOT MANDIR=/usr/share/man install
cp -v -r certs $TMPROOT/etc/sysconfig/ssl
install -v -d -m755 $TMPROOT/usr/share/doc/openssl-0.9.8k &&
cp -v -r doc/{HOWTO,README,*.{txt,html,gif}} \
$TMPROOT/usr/share/doc/openssl-0.9.8k
}
#Funktion wird nach Ablauf des Make Prozesses ausgeführt, und kann
#in $TMPROOT noch einiges korrigieren
postmk() {
echo "Nothing to do for postmk()"
if [ "$MK64BIT" == "true" ]; then
rm $TMPROOT/usr/engines
rm $TMPROOT/usr/lib
mv $TMPROOT/usr/lib32 $TMPROOT/usr/lib
fi
cd
rm -r $MAKEDIR/openssl*
}