gnu-config: merge Poky improvements (BBCLASSEXTEND, new staging)

Signed-off-by: Marcin Juszkiewicz <marcin@juszkiewicz.com.pl>

diff --git a/recipes/gnu-config/gnu-config-native_20050701.bb b/recipes/gnu-config/gnu-config-native_20050701.bb
deleted file mode 100644 (file)
index 43df124..0000000
--- a/recipes/gnu-config/gnu-config-native_20050701.bb
+++ /dev/null
@@ -1,16 +0,0 @@
-SECTION = "base"
-require gnu-config_${PV}.bb
-
-inherit native
-
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gnu-config"
-
-do_stage () {
-       install -d ${STAGING_DATADIR}/gnu-config/
-       install -d ${STAGING_BINDIR}/
-       cat ${WORKDIR}/gnu-configize.in | \
-               sed -e 's,@gnu-configdir@,${STAGING_DATADIR}/gnu-config,' \
-                   -e 's,@autom4te_perllibdir@,${STAGING_DATADIR}/autoconf,' > ${STAGING_BINDIR}/gnu-configize
-       chmod 755 ${STAGING_BINDIR}/gnu-configize
-       install -m 0644 config.guess config.sub ${STAGING_DATADIR}/gnu-config/
-}

diff --git a/recipes/gnu-config/gnu-config_20050701.bb b/recipes/gnu-config/gnu-config_20050701.bb
index 8ee0a32..c6a75ac 100644 (file)
--- a/recipes/gnu-config/gnu-config_20050701.bb
+++ b/recipes/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,10 +23,17 @@ 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 | \
+                       sed -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/
 }
 
 FILES_${PN} = "${bindir} ${datadir}/gnu-config"
+
+BBCLASSEXTEND = "native"
+NATIVE_INSTALL_WORKS = "1"