diff options
| author | Marcin Juszkiewicz <marcin@juszkiewicz.com.pl> | 2010-03-01 14:09:12 +0100 |
|---|---|---|
| committer | Marcin Juszkiewicz <marcin@juszkiewicz.com.pl> | 2010-03-01 14:09:12 +0100 |
| commit | d0d9ad50a4871f38945881f55158370c4a4d9f3f (patch) | |
| tree | 97d2060d584ec9da304c18c6d9b332ee094fe275 | |
| parent | 15ab483e62f05c84237b2a92d2a5009d99143113 (diff) | |
gnu-config: merge Poky improvements (BBCLASSEXTEND, new staging)
Signed-off-by: Marcin Juszkiewicz <marcin@juszkiewicz.com.pl>
| -rw-r--r-- | recipes/gnu-config/gnu-config-native_20050701.bb | 16 | ||||
| -rw-r--r-- | recipes/gnu-config/gnu-config_20050701.bb | 13 |
2 files changed, 10 insertions, 19 deletions
diff --git a/recipes/gnu-config/gnu-config-native_20050701.bb b/recipes/gnu-config/gnu-config-native_20050701.bb deleted file mode 100644 index 43df124f7f..0000000000 --- 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 8ee0a32120..c6a75ac9c0 100644 --- 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" |