From 27def855170c063959b005213cb2891886e8230d Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Mon, 8 Oct 2012 18:23:19 +0200 Subject: gnu-config: update to 2012.08.14 to get support for AArch64 architecture (From OE-Core rev: fd082d328f1312847097794dea588ed670206cb4) Signed-off-by: Marcin Juszkiewicz Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- .../gnu-config/config-guess-uclibc.patch | 47 ++++++++++++---------- .../gnu-config/gnu-config_20111111.bb | 41 ------------------- .../gnu-config/gnu-config_20120814.bb | 41 +++++++++++++++++++ 3 files changed, 67 insertions(+), 62 deletions(-) delete mode 100644 meta/recipes-devtools/gnu-config/gnu-config_20111111.bb create mode 100644 meta/recipes-devtools/gnu-config/gnu-config_20120814.bb (limited to 'meta/recipes-devtools/gnu-config') diff --git a/meta/recipes-devtools/gnu-config/gnu-config/config-guess-uclibc.patch b/meta/recipes-devtools/gnu-config/gnu-config/config-guess-uclibc.patch index dc15d91..2094116 100644 --- a/meta/recipes-devtools/gnu-config/gnu-config/config-guess-uclibc.patch +++ b/meta/recipes-devtools/gnu-config/gnu-config/config-guess-uclibc.patch @@ -5,13 +5,18 @@ Patch courtesy gentoo-portage/sys-devel/gnuconfig/files/automake-1.8.5-config-gu updated to 20050516 by Marcin 'Hrw' Juszkiewicz (by hand) updated to 20080123 by Nitin A Kamble (by hand) updated to 20111001 by Saul Wold (by hand) +updated to 20120818 by Marcin 'Hrw' Juszkiewicz (by hand) + Signed-off-by: Saul Wold +Signed-off-by: Marcin Juszkiewicz + +--- + config.guess | 67 +++++++++++++++++++++++++++++++++++------------------------ + 1 file changed, 40 insertions(+), 27 deletions(-) -Index: git/config.guess -=================================================================== ---- git.orig/config.guess 2011-10-20 15:15:25.000000000 -0700 -+++ git/config.guess 2011-10-20 16:56:43.810830229 -0700 -@@ -140,6 +140,19 @@ +--- git.orig/config.guess ++++ git/config.guess +@@ -138,6 +138,19 @@ UNAME_RELEASE=`(uname -r) 2>/dev/null` | UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown @@ -31,7 +36,7 @@ Index: git/config.guess # Note: order is significant - the case branches are not exclusive. case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in -@@ -871,15 +884,15 @@ +@@ -886,15 +899,15 @@ EOF EV68*) UNAME_MACHINE=alphaev68 ;; esac objdump --private-headers /bin/sh | grep -q ld.so.1 @@ -50,7 +55,7 @@ Index: git/config.guess else if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ | grep -q __ARM_PCS_VFP -@@ -891,19 +904,19 @@ +@@ -906,19 +919,19 @@ EOF fi exit ;; avr32*:Linux:*:*) @@ -58,24 +63,24 @@ Index: git/config.guess + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; cris:Linux:*:*) -- echo cris-axis-linux-gnu -+ echo cris-axis-linux-${LIBC} +- echo ${UNAME_MACHINE}-axis-linux-gnu ++ echo ${UNAME_MACHINE}-axis-linux-${LIBC} exit ;; crisv32:Linux:*:*) -- echo crisv32-axis-linux-gnu -+ echo crisv32-axis-linux-${LIBC} +- echo ${UNAME_MACHINE}-axis-linux-gnu ++ echo ${UNAME_MACHINE}-axis-linux-${LIBC} exit ;; frv:Linux:*:*) -- echo frv-unknown-linux-gnu -+ echo frv-unknown-linux-${LIBC} +- echo ${UNAME_MACHINE}-unknown-linux-gnu ++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; hexagon:Linux:*:*) -- echo hexagon-unknown-linux-gnu -+ echo hexagon-unknown-linux-${LIBC} +- echo ${UNAME_MACHINE}-unknown-linux-gnu ++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; i*86:Linux:*:*) LIBC=gnu -@@ -917,13 +930,13 @@ +@@ -932,13 +945,13 @@ EOF echo "${UNAME_MACHINE}-pc-linux-${LIBC}" exit ;; ia64:Linux:*:*) @@ -92,7 +97,7 @@ Index: git/config.guess exit ;; mips:Linux:*:* | mips64:Linux:*:*) eval $set_cc_for_build -@@ -942,54 +955,54 @@ +@@ -957,54 +970,54 @@ EOF #endif EOF eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` @@ -100,8 +105,8 @@ Index: git/config.guess + test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; } ;; or32:Linux:*:*) -- echo or32-unknown-linux-gnu -+ echo or32-unknown-linux-${LIBC} +- echo ${UNAME_MACHINE}-unknown-linux-gnu ++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; padre:Linux:*:*) - echo sparc-unknown-linux-gnu @@ -154,8 +159,8 @@ Index: git/config.guess + echo ${UNAME_MACHINE}-dec-linux-${LIBC} exit ;; x86_64:Linux:*:*) -- echo x86_64-unknown-linux-gnu -+ echo x86_64-unknown-linux-${LIBC} +- echo ${UNAME_MACHINE}-unknown-linux-gnu ++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; xtensa*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu diff --git a/meta/recipes-devtools/gnu-config/gnu-config_20111111.bb b/meta/recipes-devtools/gnu-config/gnu-config_20111111.bb deleted file mode 100644 index f731360..0000000 --- a/meta/recipes-devtools/gnu-config/gnu-config_20111111.bb +++ /dev/null @@ -1,41 +0,0 @@ -SUMMARY = "gnu-configize" -DESCRIPTION = "Tool that installs the GNU config.guess / config.sub into a directory tree" -SECTION = "devel" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://config.guess;endline=39;md5=a3669d051b3a8408d69751e53b2e1cc1" - -DEPENDS_virtclass-native = "perl-native-runtime" - -INHIBIT_DEFAULT_DEPS = "1" - -PR = "r1" - -SRC_URI = "http://downloads.yoctoproject.org/releases/gnu-config/gnu-config-yocto-${PV}.tgz \ - file://config-guess-uclibc.patch \ - file://gnu-configize.in" - -SRC_URI[md5sum] = "30be385c919a25cd9522205ef49e5328" -SRC_URI[sha256sum] = "0750afa8d8ee988b6ead1c2d02b565597f809e2e3ad14886ed7803d3bbc8b0cd" - -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 [ "${PN}" != "gnu-config-native" -a "${PN}" != "nativesdk-gnu-config" ]; then - sed -i -e 's,/usr/bin/env,${bindir}/env,g' ${D}${bindir}/gnu-configize - fi - chmod 755 ${D}${bindir}/gnu-configize - install -m 0644 config.guess config.sub ${D}${datadir}/gnu-config/ -} - -PACKAGES = "${PN}" -FILES_${PN} = "${bindir} ${datadir}/gnu-config" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta/recipes-devtools/gnu-config/gnu-config_20120814.bb b/meta/recipes-devtools/gnu-config/gnu-config_20120814.bb new file mode 100644 index 0000000..dd9248f --- /dev/null +++ b/meta/recipes-devtools/gnu-config/gnu-config_20120814.bb @@ -0,0 +1,41 @@ +SUMMARY = "gnu-configize" +DESCRIPTION = "Tool that installs the GNU config.guess / config.sub into a directory tree" +SECTION = "devel" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://config.guess;endline=39;md5=b79a4663475f4d724846463277817e0d" + +DEPENDS_virtclass-native = "perl-native-runtime" + +INHIBIT_DEFAULT_DEPS = "1" + +PR = "r0" + +SRC_URI = "http://downloads.yoctoproject.org/releases/gnu-config/gnu-config-${PV}.tar.bz2 \ + file://config-guess-uclibc.patch \ + file://gnu-configize.in" + +SRC_URI[md5sum] = "bcfca5a2bb39edad4aae5a65efc84094" +SRC_URI[sha256sum] = "44f99a8e76f3e8e4fec0bb5ad4762f8e44366168554ce66cb85afbe2ed3efd8b" + +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 [ "${PN}" != "gnu-config-native" -a "${PN}" != "nativesdk-gnu-config" ]; then + sed -i -e 's,/usr/bin/env,${bindir}/env,g' ${D}${bindir}/gnu-configize + fi + chmod 755 ${D}${bindir}/gnu-configize + install -m 0644 config.guess config.sub ${D}${datadir}/gnu-config/ +} + +PACKAGES = "${PN}" +FILES_${PN} = "${bindir} ${datadir}/gnu-config" + +BBCLASSEXTEND = "native nativesdk" -- cgit v1.1