diff --git a/BaseBuild/Basesys/perl b/BaseBuild/Basesys/perl index ae8bd38..d94d2a8 100644 --- a/BaseBuild/Basesys/perl +++ b/BaseBuild/Basesys/perl @@ -73,59 +73,72 @@ SRCPATH=Base/Development premk() { mkdir -p $TMPROOT/usr/share mkdir -p $TMPROOT/usr/bin - SrcPatch $MAKEDIR/perl* $LFSSOURCE/$SRCPATH/perl-*-gcc42_fix-?.patch.* echo "127.0.0.1 localhost $(hostname)" >/etc/hosts sed -i -e "s@pldlflags=''@pldlflags=\"\$cccdlflags\"@g" \ -e "s@static_target='static'@static_target='static_pic'@g" Makefile.SH + #sed -i -e '/^BUILD_ZLIB/ s/True/False/' \ + #-e '/^INCLUDE\|^LIB/ s|\./zlib-src|/usr/include|' \ + #ext/Compress/Raw/Zlib/config.in + if [ ! -f /etc/hosts ]; then + echo "127.0.0.1 localhost $(hostname)" >/etc/hosts + fi } mk32() { ./configure.gnu --prefix=/usr \ + -Dvendorprefix=/usr \ -Dman1dir=/usr/share/man/man1 \ -Dman3dir=/usr/share/man/man3 \ -Dpager="/bin/less -isR" \ -Dgcc="gcc ${BUILDOPTIONS32}" \ - -Dlibpath="/usr/local/lib /lib /usr/lib" \ - -Dusethreads + -Dusethreads \ + -Duseshrplib \ make -j $NUMCPU make -j $NUMCPU DESTDIR=$TMPROOT install mv $TMPROOT/usr/bin/perl{,-32} - mv $TMPROOT/usr/bin/perl5.8.8{,-32} + mv $TMPROOT/usr/bin/perl5.10.0{,-32} rm -r $MAKEDIR/perl-* UnPack $MAKEDIR $LFSSOURCE/$SRCPATH/perl-*.tar* - SrcPatch $MAKEDIR/perl* $LFSSOURCE/$SRCPATH/perl-*-gcc42_fix-?.patch.* + cd $MAKEDIR/perl* sed -i -e "s@pldlflags=''@pldlflags=\"\$cccdlflags\"@g" \ -e "s@static_target='static'@static_target='static_pic'@g" Makefile.SH + #sed -i -e '/^BUILD_ZLIB/ s/True/False/' \ + #-e '/^INCLUDE\|^LIB/ s|\./zlib-src|/usr/include|' \ + #ext/Compress/Raw/Zlib/config.in SrcPatch $MAKEDIR/perl* $LFSSOURCE/$SRCPATH/perl-*-Configure_multilib-?.patch.* + SrcPatch $MAKEDIR/perl* $LFSSOURCE/$SRCPATH/perl-*-libc-*.patch* sed -i "/libc/s@/lib@/lib64@" hints/linux.sh echo 'installstyle="lib64/perl5"' >>hints/linux.sh } mk() { if [ "$MK64BIT" == "true" ]; then - ADDOPTIONS="-Dlibpath=\"/usr/local/lib64 /lib64 /usr/lib64\"" + ADDOPTIONS="-Dlibpth=\"/usr/local/lib64 /lib64 /usr/lib64\"" else - ADDOPTIONS="-Dlibpath=\"/usr/local/lib /lib /usr/lib\"" + ADDOPTIONS="-Dlibpth=\"/usr/local/lib /lib /usr/lib\"" fi + sed -i -e "s/CLDFLAGS =/CLDFLAGS = -lm -lrt/" Makefile.SH ./configure.gnu --prefix=/usr \ + -Dvendorprefix=/usr \ -Dman1dir=/usr/share/man/man1 \ -Dman3dir=/usr/share/man/man3 \ -Dpager="/bin/less -isR" \ $ADDOPTIONS \ -Dcc="gcc ${BUILDOPTIONS}" \ - -Dusethreads - make -j $NUMCPU - MakeCheck -j $NUMCPU test - make -j $NUMCPU DESTDIR=$TMPROOT install + -Dusethreads \ + -Duseshrplib + make + MakeCheck test + make DESTDIR=$TMPROOT install } postmk() { if [ ${MK64BIT} == "true" ]; then mv $TMPROOT/usr/bin/perl{,-64} - mv $TMPROOT/usr/bin/perl5.8.8{,-64} + mv $TMPROOT/usr/bin/perl5.10.0{,-64} ln -sv /usr/bin/multiarch_wrapper $TMPROOT/usr/bin/perl - ln -sv /usr/bin/multiarch_wrapper $TMPROOT/usr/bin/perl5.8.8 + ln -sv /usr/bin/multiarch_wrapper $TMPROOT/usr/bin/perl5.10.0 else - echo "Nothing to do for premk() " + echo "Nothing to do for postmk() " fi }