Anpassung an neue perl und neue Viitor Version
git-svn-id: svn://svn.compuextreme.de/Viitor/V962/ViitorMake@4501 504e572c-2e33-0410-9681-be2bf7408885
This commit is contained in:
parent
412ca060f5
commit
a519c39a41
@ -72,15 +72,33 @@ SRCPATH=Base/Development
|
||||
|
||||
premk() {
|
||||
mkdir -p $TMPROOT/usr/share
|
||||
if [ "$MK64BIT" == "true" ];then
|
||||
SrcPatch $MAKEDIR/perl* $LFSSOURCE/$SRCPATH/perl-*-Configure_multilib-1.patch*
|
||||
SrcPatch $MAKEDIR/perl* $LFSSOURCE/$SRCPATH/perl-*-libc_lib64-1.patch*
|
||||
fi
|
||||
echo 'installstyle="lib64/perl5"' >>hints/linux.sh
|
||||
mkdir -p $TMPROOT/usr/bin
|
||||
SrcPatch $MAKEDIR/perl* $LFSSOURCE/$SRCPATH/perl-*-gcc42_fix-?.patch.*
|
||||
echo "127.0.0.1 localhost $(hostname)" >/etc/hosts
|
||||
sed -e "s/^ccflags=.*$/ccflags=\'-fPIC \'/" Configure >/tmp/Configure
|
||||
mv /tmp/Configure .
|
||||
chmod 755 Configure
|
||||
sed -i -e "s@pldlflags=''@pldlflags=\"\$cccdlflags\"@g" \
|
||||
-e "s@static_target='static'@static_target='static_pic'@g" Makefile.SH
|
||||
}
|
||||
|
||||
mk32() {
|
||||
./configure.gnu --prefix=/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
|
||||
make -j $NUMCPU
|
||||
make -j $NUMCPU DESTDIR=$TMPROOT install
|
||||
mv $TMPROOT/usr/bin/perl{,-32}
|
||||
mv $TMPROOT/usr/bin/perl5.8.8{,-32}
|
||||
rm -r $MAKEDIR/perl-*
|
||||
UnPack $MAKEDIR $LFSSOURCE/$SRCPATH/perl-*.tar*
|
||||
SrcPatch $MAKEDIR/perl* $LFSSOURCE/$SRCPATH/perl-*-gcc42_fix-?.patch.*
|
||||
sed -i -e "s@pldlflags=''@pldlflags=\"\$cccdlflags\"@g" \
|
||||
-e "s@static_target='static'@static_target='static_pic'@g" Makefile.SH
|
||||
SrcPatch $MAKEDIR/perl* $LFSSOURCE/$SRCPATH/perl-*-Configure_multilib-?.patch.*
|
||||
sed -i "/libc/s@/lib@/lib64@" hints/linux.sh
|
||||
echo 'installstyle="lib64/perl5"' >>hints/linux.sh
|
||||
}
|
||||
|
||||
mk() {
|
||||
@ -94,13 +112,20 @@ mk() {
|
||||
-Dman3dir=/usr/share/man/man3 \
|
||||
-Dpager="/bin/less -isR" \
|
||||
$ADDOPTIONS \
|
||||
-Dcc="gcc ${BUILDOPTIONS} -fPIC" \
|
||||
-Dcc="gcc ${BUILDOPTIONS}" \
|
||||
-Dusethreads
|
||||
make CC="gcc $BUILDOPTIONS -fPIC " -j $NUMCPU
|
||||
make -j $NUMCPU
|
||||
MakeCheck -j $NUMCPU test
|
||||
make -j $NUMCPU DESTDIR=$TMPROOT install
|
||||
}
|
||||
|
||||
postmk() {
|
||||
echo "Nothing to do for premk() "
|
||||
if [ ${MK64BIT} == "true" ]; then
|
||||
mv $TMPROOT/usr/bin/perl{,-64}
|
||||
mv $TMPROOT/usr/bin/perl5.8.8{,-64}
|
||||
ln -sv /usr/bin/multiarch_wrapper $TMPROOT/usr/bin/perl
|
||||
ln -sv /usr/bin/multiarch_wrapper $TMPROOT/usr/bin/perl5.8.8
|
||||
else
|
||||
echo "Nothing to do for premk() "
|
||||
fi
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user