diff --git a/package/base/perl5/perl5.conf b/package/base/perl5/perl5.conf index c6720deb2..e6e1ddd74 100644 --- a/package/base/perl5/perl5.conf +++ b/package/base/perl5/perl5.conf @@ -1,3 +1,4 @@ +#!/bin/bash # --- ROCK-COPYRIGHT-NOTE-BEGIN --- # # This copyright note is auto-generated by ./scripts/Create-CopyPatch. @@ -22,7 +23,7 @@ runconfig=0 -confopt="-des -Dprefix=$root/usr -Darchname=$arch_target \ +confopt="-des -Dprefix=/usr -Dinstallprefix=$root/usr -Darchname=$arch_target \ -Dmyhostname=$ROCKCFG_PKG_PERL5_HOST_NAME \ -Dsiteprefix=/$ROCKCFG_PKG_PERL5_SITE_PREFIX \ -Dvendorprefix=/$ROCKCFG_PKG_PERL5_VENDOR_PREFIX" @@ -30,7 +31,7 @@ confopt="-des -Dprefix=$root/usr -Darchname=$arch_target \ [ "$ROCKCFG_PKG_PERL5_THREADS" = "1" ] && confopt="$confopt -Dusethreads" [ "$ROCKCFG_PKG_PERL5_USE_DB3" = "1" ] && patchfiles="$patchfiles $confdir/use_db3.diff" -if [ "$stagelevel" -le 1 ] ; then +if [ "$stagelevel" -le 2 ] ; then custmain=pkg_perl_custmain else hook_add preconf 2 "( rm -f config.sh Policy.sh; sh Configure \$confopt; )" @@ -38,22 +39,29 @@ else fi pkg_perl_custmain () { - sed -i -e 's/miniperl/miniperl-cross/g' \ - ext/util/make_ext x2p/Makefile.SH utils/Makefile - CC=gcc ./configure.gnu --prefix=$root/usr -Dstatic_ext='Data/Dumper IO Fcntl POSIX' + if [ "$ROCKCFG_CROSSBUILD" = 1 ] ; then + sed -i -e 's/miniperl/miniperl-cross/g' \ + ext/util/make_ext x2p/Makefile.SH utils/Makefile + fi - make miniperl - mv miniperl miniperl-cross + rm -f config.sh Policy.sh + eval sh Configure $confopt -Dstatic_ext='Data/Dumper IO Fcntl POSIX' - make clean + if [ "$ROCKCFG_CROSSBUILD" = 1 ] ; then + make miniperl + mv miniperl miniperl-cross - sed -i -e "s@\(^ar=\).*@\1'${AR}'@g" \ - -e "s@\(^ranlib=\).*@\1'${RANLIB}'@g" \ - -e "s@\(^cc=\).*@\1'${CC} ${BUILD32}'@g" \ - -e "s@\(^ld=\).*@\1'${CC} ${BUILD32}'@g" config.sh - make miniperl + make clean + + sed -i -e "s@\(^ar=\).*@\1'${AR}'@g" \ + -e "s@\(^ranlib=\).*@\1'${RANLIB}'@g" \ + -e "s@\(^cc=\).*@\1'${CC}'@g" \ + -e "s@\(^ld=\).*@\1'${CC}'@g" config.sh + make miniperl + + sed -i -e 's|(LDLIBPTH) ./miniperl|(LDLIBPTH) ./miniperl-cross|g' Makefile + fi - sed -i -e 's|(LDLIBPTH) ./miniperl|(LDLIBPTH) ./miniperl-cross|g' Makefile make perl utilities cp perl pod/pod2man $root/usr/bin