diff options
author | Khem Raj <raj.khem@gmail.com> | 2010-06-15 13:52:40 -0700 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2010-06-15 13:54:37 -0700 |
commit | 473cd5f616190739550abd8bf71629a87036730b (patch) | |
tree | ce130da514df01b33c769be10e9657d13c1e320e /recipes | |
parent | 9191c2a222bc7f9b8908513ed2fb849e07d536c0 (diff) |
gnu-config: Add recipe for git version.
* Rename gnu-config to files folder.
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'recipes')
-rw-r--r-- | recipes/gnu-config/files/avr32.patch (renamed from recipes/gnu-config/gnu-config/avr32.patch) | 0 | ||||
-rw-r--r-- | recipes/gnu-config/files/config-guess-uclibc.patch (renamed from recipes/gnu-config/gnu-config/config-guess-uclibc.patch) | 0 | ||||
-rwxr-xr-x | recipes/gnu-config/files/gnu-configize.in (renamed from recipes/gnu-config/gnu-config/gnu-configize.in) | 0 | ||||
-rw-r--r-- | recipes/gnu-config/gnu-config-git/config-guess-uclibc.patch | 145 | ||||
-rw-r--r-- | recipes/gnu-config/gnu-config_git.bb | 38 |
5 files changed, 183 insertions, 0 deletions
diff --git a/recipes/gnu-config/gnu-config/avr32.patch b/recipes/gnu-config/files/avr32.patch index 43efcd8a2e..43efcd8a2e 100644 --- a/recipes/gnu-config/gnu-config/avr32.patch +++ b/recipes/gnu-config/files/avr32.patch diff --git a/recipes/gnu-config/gnu-config/config-guess-uclibc.patch b/recipes/gnu-config/files/config-guess-uclibc.patch index b322157e9b..b322157e9b 100644 --- a/recipes/gnu-config/gnu-config/config-guess-uclibc.patch +++ b/recipes/gnu-config/files/config-guess-uclibc.patch diff --git a/recipes/gnu-config/gnu-config/gnu-configize.in b/recipes/gnu-config/files/gnu-configize.in index be8580c8e6..be8580c8e6 100755 --- a/recipes/gnu-config/gnu-config/gnu-configize.in +++ b/recipes/gnu-config/files/gnu-configize.in diff --git a/recipes/gnu-config/gnu-config-git/config-guess-uclibc.patch b/recipes/gnu-config/gnu-config-git/config-guess-uclibc.patch new file mode 100644 index 0000000000..e6bf6c37fa --- /dev/null +++ b/recipes/gnu-config/gnu-config-git/config-guess-uclibc.patch @@ -0,0 +1,145 @@ +diff --git a/config.guess b/config.guess +index 115f944..cdd1367 100755 +--- a/config.guess ++++ b/config.guess +@@ -140,6 +140,18 @@ UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown + UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown + UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown + ++# Detect uclibc systems. ++ ++LIBC="gnu" ++if [ -f /usr/include/bits/uClibc_config.h ]; then ++ LIBC=uclibc ++ if [ -n `grep "#define __UCLIBC_CONFIG_VERSION__" /usr/include/bits/uClibc_config.h` ] ++ then ++ UCLIBC_SUBVER=`sed -n "/#define __UCLIBC_CONFIG_VERSION__ /s///p" /usr/include/bits/uClibc_config.h` ++ LIBC=$LIBC$UCLIBC_SUBVER ++ fi ++fi ++ + # Note: order is significant - the case branches are not exclusive. + + case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in +@@ -877,22 +889,22 @@ EOF + if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ + | grep -q __ARM_EABI__ + then +- echo ${UNAME_MACHINE}-unknown-linux-gnu ++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + else +- echo ${UNAME_MACHINE}-unknown-linux-gnueabi ++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi + fi + exit ;; + avr32*:Linux:*:*) +- echo ${UNAME_MACHINE}-unknown-linux-gnu ++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + cris:Linux:*:*) +- echo cris-axis-linux-gnu ++ echo cris-axis-linux-${LIBC} + exit ;; + crisv32:Linux:*:*) +- echo crisv32-axis-linux-gnu ++ echo crisv32-axis-linux-${LIBC} + exit ;; + frv:Linux:*:*) +- echo frv-unknown-linux-gnu ++ echo frv-unknown-linux-${LIBC} + exit ;; + i*86:Linux:*:*) + LIBC=gnu +@@ -902,17 +914,22 @@ EOF + LIBC=dietlibc + #endif + EOF ++ sed 's/^ //' << EOF >$dummy.c ++ #ifdef __UCLIBC__ ++ LIBC=uclib ++ #endif ++EOF + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'` + echo "${UNAME_MACHINE}-pc-linux-${LIBC}" + exit ;; + ia64:Linux:*:*) +- echo ${UNAME_MACHINE}-unknown-linux-gnu ++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + m32r*:Linux:*:*) +- echo ${UNAME_MACHINE}-unknown-linux-gnu ++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + m68*:Linux:*:*) +- echo ${UNAME_MACHINE}-unknown-linux-gnu ++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + mips:Linux:*:* | mips64:Linux:*:*) + eval $set_cc_for_build +@@ -931,51 +948,51 @@ EOF + #endif + EOF + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` +- test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } ++ test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; } + ;; + or32:Linux:*:*) +- echo or32-unknown-linux-gnu ++ echo or32-unknown-linux-${LIBC} + exit ;; + padre:Linux:*:*) +- echo sparc-unknown-linux-gnu ++ echo sparc-unknown-linux-${LIBC} + exit ;; + parisc64:Linux:*:* | hppa64:Linux:*:*) +- echo hppa64-unknown-linux-gnu ++ echo hppa64-unknown-linux-${LIBC} + exit ;; + parisc:Linux:*:* | hppa:Linux:*:*) + # Look for CPU level + case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in +- PA7*) echo hppa1.1-unknown-linux-gnu ;; +- PA8*) echo hppa2.0-unknown-linux-gnu ;; +- *) echo hppa-unknown-linux-gnu ;; ++ PA7*) echo hppa1.1-unknown-linux-${LIBC} ;; ++ PA8*) echo hppa2.0-unknown-linux-${LIBC} ;; ++ *) echo hppa-unknown-linux-${LIBC} ;; + esac + exit ;; + ppc64:Linux:*:*) +- echo powerpc64-unknown-linux-gnu ++ echo powerpc64-unknown-linux-${LIBC} + exit ;; + ppc:Linux:*:*) +- echo powerpc-unknown-linux-gnu ++ echo powerpc-unknown-linux-${LIBC} + exit ;; + s390:Linux:*:* | s390x:Linux:*:*) + echo ${UNAME_MACHINE}-ibm-linux + exit ;; + sh64*:Linux:*:*) +- echo ${UNAME_MACHINE}-unknown-linux-gnu ++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + sh*:Linux:*:*) +- echo ${UNAME_MACHINE}-unknown-linux-gnu ++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + sparc:Linux:*:* | sparc64:Linux:*:*) +- echo ${UNAME_MACHINE}-unknown-linux-gnu ++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + vax:Linux:*:*) +- echo ${UNAME_MACHINE}-dec-linux-gnu ++ echo ${UNAME_MACHINE}-dec-linux-${LIBC} + exit ;; + x86_64:Linux:*:*) +- echo x86_64-unknown-linux-gnu ++ echo x86_64-unknown-linux-${LIBC} + exit ;; + xtensa*:Linux:*:*) +- echo ${UNAME_MACHINE}-unknown-linux-gnu ++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + i*86:DYNIX/ptx:4*:*) + # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. diff --git a/recipes/gnu-config/gnu-config_git.bb b/recipes/gnu-config/gnu-config_git.bb new file mode 100644 index 0000000000..d275db3f96 --- /dev/null +++ b/recipes/gnu-config/gnu-config_git.bb @@ -0,0 +1,38 @@ +DESCRIPTION = "The GNU config.guess and config.sub scripts" +SECTION = "base" +LICENSE = "GPL" +DEPENDS = "" +INHIBIT_DEFAULT_DEPS = "1" + +PR = "r0" +SRCREV="e35217687ee5f39b428119fe31c7e954f6de64f0" +PR_append = "+gitr${SRCPV}" + +SRC_URI = "git://git.savannah.gnu.org/config.git;branch=master;protocol=git \ + file://config-guess-uclibc.patch \ + file://gnu-configize.in" +S = "${WORKDIR}/git" + +do_compile() { + : +} + +do_install () { + install -d ${D}${datadir}/gnu-config \ + ${D}${bindir} + cat ${WORKDIR}/gnu-configize.in | \ + 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 + 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" |