From e78278875615e81aa39bb42207d9717270a614b3 Mon Sep 17 00:00:00 2001
From: Richard Purdie <rpurdie@linux.intel.com>
Date: Mon, 9 Nov 2009 15:27:59 +0000
Subject: gnu-config: Don't run sed substituation for perl location in native
 case

Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
---
 meta/packages/gnu-config/gnu-config_20050701.bb | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'meta')

diff --git a/meta/packages/gnu-config/gnu-config_20050701.bb b/meta/packages/gnu-config/gnu-config_20050701.bb
index 69d026f35..d93d57d3f 100644
--- a/meta/packages/gnu-config/gnu-config_20050701.bb
+++ b/meta/packages/gnu-config/gnu-config_20050701.bb
@@ -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/
 }
-- 
cgit v1.2.3