perl: Move the do_configure from perl.inc into perl_5.8.4.bb since it is

only really useful for this version of perl the way it's written.

diff --git a/packages/perl/perl.inc b/packages/perl/perl.inc
index 3e5ac50..cda260e 100644 (file)
--- a/packages/perl/perl.inc
+++ b/packages/perl/perl.inc
@@ -13,28 +13,6 @@ SRC_URI = "ftp://ftp.funet.fi/pub/CPAN/src/perl-${PV}.tar.gz \
 
 HOSTPERL="${STAGING_BINDIR_NATIVE}/perl${PV}"
 
-do_configure() {
-       ln -sf ${HOSTPERL} ${STAGING_BINDIR_NATIVE}/hostperl 
-       cp ${HOSTPERL} hostperl
-       cd Cross
-       rm -f Makefile.SH.patch
-       cp ${WORKDIR}/Makefile.SH.patch .
-       cp ${WORKDIR}/config.sh-mipsel-linux .
-       cp ${WORKDIR}/config.sh-i686-linux .
-       cat config.sh-arm-linux | sed -e "s,arm-linux,armeb-linux,g" > config.sh-armeb-linux
-       for i in config.sh-*-linux; do
-               a="`echo $i|sed -e 's,^config.sh-,,; s,-linux$,,'`"
-               newfile="`echo $i|sed -e 's,-linux$,-linux-uclibc,g'`"
-               cat $i | sed -e "s,${a}-linux,${a}-linux-uclibc,g; \
-                                s,d_sockatmark='define',d_sockatmark='undef',g;" > $newfile
-       done
-       sed -i -e 's,./install_me_here,${D},g' config.sh-${TARGET_ARCH}-${TARGET_OS}
-       rm -f config
-       echo "ARCH = ${TARGET_ARCH}" > config
-       echo "OS = ${TARGET_OS}" >> config
-       oe_runmake patch 
-}
-
 do_compile() {
        sed -i -e 's|/usr/include|${STAGING_INCDIR}|g' ext/Errno/Errno_pm.PL
        cd Cross

diff --git a/packages/perl/perl_5.8.4.bb b/packages/perl/perl_5.8.4.bb
index 085182b..10a871c 100644 (file)
--- a/packages/perl/perl_5.8.4.bb
+++ b/packages/perl/perl_5.8.4.bb
@@ -5,3 +5,25 @@ PR = "r5"
 SRC_URI += "file://uclibc.patch;patch=1 \
             file://config.sh-mipsel-linux \
             file://config.sh-i686-linux"
+
+do_configure() {
+       ln -sf ${HOSTPERL} ${STAGING_BINDIR_NATIVE}/hostperl 
+       cp ${HOSTPERL} hostperl
+       cd Cross
+       rm -f Makefile.SH.patch
+       cp ${WORKDIR}/Makefile.SH.patch .
+       cp ${WORKDIR}/config.sh-mipsel-linux .
+       cp ${WORKDIR}/config.sh-i686-linux .
+       cat config.sh-arm-linux | sed -e "s,arm-linux,armeb-linux,g" > config.sh-armeb-linux
+       for i in config.sh-*-linux; do
+               a="`echo $i|sed -e 's,^config.sh-,,; s,-linux$,,'`"
+               newfile="`echo $i|sed -e 's,-linux$,-linux-uclibc,g'`"
+               cat $i | sed -e "s,${a}-linux,${a}-linux-uclibc,g; \
+                                s,d_sockatmark='define',d_sockatmark='undef',g;" > $newfile
+       done
+       sed -i -e 's,./install_me_here,${D},g' config.sh-${TARGET_ARCH}-${TARGET_OS}
+       rm -f config
+       echo "ARCH = ${TARGET_ARCH}" > config
+       echo "OS = ${TARGET_OS}" >> config
+       oe_runmake patch 
+}