gnu-config: Only apply path transformations in the non-native/non-nativesdk case

The BUILD_ARCH != TARGET_ARCH check isn't a safe one to detect native builds
and doesn't cover the nativesdk case. This converts the recipe to use PN
instead which is more accurate and ensures the correct entries making it
into the correct packages.

(From OE-Core rev: 4a601314604e8428d9dace95c32a71a57eacaaf5)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

2 files changed, 2 insertions, 2 deletions

diff --git a/meta/recipes-devtools/gnu-config/gnu-config_20111111.bb b/meta/recipes-devtools/gnu-config/gnu-config_20111111.bb
index 0c652c27b5..d4588daa81 100644
--- a/meta/recipes-devtools/gnu-config/gnu-config_20111111.bb
+++ b/meta/recipes-devtools/gnu-config/gnu-config_20111111.bb
@@ -28,7 +28,7 @@ do_install () {
                 sed -e 's,@gnu-configdir@,${datadir}/gnu-config,g' \
                     -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
+        if [ "${PN}" != "gnu-config-native" -a "${PN}" != "gnu-config-nativesdk" ]; then
                 sed -i -e 's,/usr/bin/env,${bindir}/env,g' ${D}${bindir}/gnu-configize
         fi
         chmod 755 ${D}${bindir}/gnu-configize
diff --git a/meta/recipes-devtools/gnu-config/gnu-config_git.bb b/meta/recipes-devtools/gnu-config/gnu-config_git.bb
index 0fdee66ba4..4de479915b 100644
--- a/meta/recipes-devtools/gnu-config/gnu-config_git.bb
+++ b/meta/recipes-devtools/gnu-config/gnu-config_git.bb
@@ -29,7 +29,7 @@ do_install () {
                 sed -e 's,@gnu-configdir@,${datadir}/gnu-config,g' \
                     -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
+        if [ "${PN}" != "gnu-config-native" -a "${PN}" != "gnu-config-nativesdk" ]; then
                 sed -i -e 's,/usr/bin/env,${bindir}/env,g' ${D}${bindir}/gnu-configize
         fi
         chmod 755 ${D}${bindir}/gnu-configize