Merge oe-devel@oe-devel.bkbits.net:openembedded

into handhelds.org:/home/kergoth/code/openembedded

2005/03/09 13:55:44-05:00 handhelds.org!kergoth
Apply config-guess-uclibc patch from gentoo, which makes it able to pick up on a uclibc environment when run in one.  This should fix ./configure scripts run natively inside linux-uclibc root filesystems.

BKrev: 422f46e4hX3j48w9mWFop_sczDhETw

diff --git a/packages/gnu-config/gnu-config-native.bb b/packages/gnu-config/gnu-config-native.bb
deleted file mode 100644 (file)
index 9467746..0000000
--- a/packages/gnu-config/gnu-config-native.bb
+++ /dev/null
@@ -1,16 +0,0 @@
-SECTION = "base"
-include gnu-config.bb
-
-inherit native
-
-DEPENDS = ""
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gnu-config"
-
-do_stage () {
-       install -d ${STAGING_DATADIR}/gnu-config
-       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/packages/gnu-config/gnu-config.bb b/packages/gnu-config/gnu-config.bb
deleted file mode 100644 (file)
index 092da13..0000000
--- a/packages/gnu-config/gnu-config.bb
+++ /dev/null
@@ -1,25 +0,0 @@
-SECTION = "base"
-PV = "0.1"
-LICENSE = "GPL"
-MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
-SRC_URI = "ftp://ftp.club.cc.cmu.edu/pub/gnu/config/config.guess \
-          ftp://ftp.club.cc.cmu.edu/pub/gnu/config/config.sub \
-          file://uclibc.patch;patch=1;pnum=0 \
-          file://gnu-configize.in"
-S = "${WORKDIR}" 
-
-INHIBIT_DEFAULT_DEPS = "1"
-DEPENDS = ""
-PACKAGES = "${PN}"
-FILES_${PN} = "${bindir} \
-              ${datadir}/gnu-config"
-
-do_install () {
-       install -d ${D}${datadir}/gnu-config \
-                  ${D}${bindir}
-       cat ${WORKDIR}/gnu-configize.in | \
-               sed -e 's,@gnu-configdir@,${datadir}/gnu-config,' \
-                   -e 's,@autom4te_perllibdir@,${STAGING_DATADIR}/autoconf,' > ${STAGING_BINDIR}/gnu-configize
-       chmod 755 ${D}${bindir}/gnu-configize
-       install -m 0644 config.guess config.sub ${D}${datadir}/gnu-config/
-}

diff --git a/packages/gnu-config/gnu-config/config-guess-uclibc.patch b/packages/gnu-config/gnu-config/config-guess-uclibc.patch
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/packages/gnu-config/gnu-config_cvs.bb b/packages/gnu-config/gnu-config_cvs.bb
index 5aaf276..2ac9eea 100644 (file)
--- a/packages/gnu-config/gnu-config_cvs.bb
+++ b/packages/gnu-config/gnu-config_cvs.bb
@@ -5,9 +5,10 @@ DEPENDS = ""
 INHIBIT_DEFAULT_DEPS = "1"
 MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
 PV = "0.1cvs${CVSDATE}"
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "cvs://anoncvs:@savannah.gnu.org/cvsroot/config;module=config;method=ext;rsh=ssh \
+          file://config-guess-uclibc.patch;patch=1 \
            file://gnu-configize.in"
 S = "${WORKDIR}/config"