]> code.ossystems Code Review - openembedded-core.git/commitdiff
gnu-config: Don't run sed substituation for perl location in native case
authorRichard Purdie <rpurdie@linux.intel.com>
Mon, 9 Nov 2009 15:27:59 +0000 (15:27 +0000)
committerRichard Purdie <rpurdie@linux.intel.com>
Fri, 13 Nov 2009 12:15:28 +0000 (12:15 +0000)
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
meta/packages/gnu-config/gnu-config_20050701.bb

index 69d026f35e5ae63a4e39e84474f187f39b7d678f..d93d57d3f1bf2e54eb9c8a3bfc4804ea9cb77a99 100644 (file)
@@ -6,7 +6,7 @@ INHIBIT_DEFAULT_DEPS = "1"
 
 FIXEDSRCDATE = "${@bb.data.getVar('FILE', d, 1).split('_')[-1].split('.')[0]}"
 PV = "0.1+cvs${FIXEDSRCDATE}"
-PR = "r5"
+PR = "r6"
 
 SRC_URI = "cvs://anonymous@cvs.sv.gnu.org/cvsroot/config;module=config;method=pserver;date=${FIXEDSRCDATE} \
           file://config-guess-uclibc.patch;patch=1 \
@@ -23,8 +23,12 @@ do_install () {
                   ${D}${bindir}
        cat ${WORKDIR}/gnu-configize.in | \
                sed -e 's,@gnu-configdir@,${datadir}/gnu-config,g' \
-                   -e 's,@autom4te_perllibdir@,${datadir}/autoconf,g' \
-                   -e 's,/usr/bin/perl,${bindir}/perl,g' > ${D}${bindir}/gnu-configize
+                   -e 's,@autom4te_perllibdir@,${datadir}/autoconf,g' > ${D}${bindir}/gnu-configize
+       # In the native case we want the system perl as perl-native can't have built yet
+       if [ "${BUILD_ARCH}" != "${TARGET_ARCH}" ]; then
+               cat ${WORKDIR}/gnu-configize.in | \
+                           -e 's,/usr/bin/perl,${bindir}/perl,g' > ${D}${bindir}/gnu-configize
+       fi
        chmod 755 ${D}${bindir}/gnu-configize
        install -m 0644 config.guess config.sub ${D}${datadir}/gnu-config/
 }