diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-06-15 15:21:42 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-06-22 09:16:00 +0100 |
| commit | eb40fcf6279478bf53f961f5477fc9e4162dd9a9 (patch) | |
| tree | 71f1faf5904a8b8785bcf73b70ae60f679ec0274 /meta/recipes-devtools | |
| parent | 1b489073dcf1e0836f7f2db8cb171debeb7a02e7 (diff) | |
| download | poky-eb40fcf6279478bf53f961f5477fc9e4162dd9a9.tar.gz | |
meta: Drop remnants of uclibc support
uclibc support was removed a while ago and musl works much better. Start to
remove the various overrides and patches related to uclibc which are no longer
needed.
uclibc support in a layer would still be possible. I have strong reasons to
believe nobody is still using uclibc since patches are missing and I doubt
the metadata even parses anymore.
(From OE-Core rev: 653704e9cf325cb494eb23facca19e9f05132ffd)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools')
| -rw-r--r-- | meta/recipes-devtools/elfutils/elfutils_0.168.bb | 6 | ||||
| -rw-r--r-- | meta/recipes-devtools/gdb/gdb-common.inc | 1 | ||||
| -rw-r--r-- | meta/recipes-devtools/gnu-config/gnu-config/config-guess-uclibc.patch | 170 | ||||
| -rw-r--r-- | meta/recipes-devtools/gnu-config/gnu-config/uclibc.patch | 23 | ||||
| -rw-r--r-- | meta/recipes-devtools/gnu-config/gnu-config_20120814.bb | 1 | ||||
| -rw-r--r-- | meta/recipes-devtools/m4/m4.inc | 1 | ||||
| -rw-r--r-- | meta/recipes-devtools/mtools/mtools_4.0.18.bb | 2 |
7 files changed, 0 insertions, 204 deletions
diff --git a/meta/recipes-devtools/elfutils/elfutils_0.168.bb b/meta/recipes-devtools/elfutils/elfutils_0.168.bb index 3b8f2a3147..c0a4f23402 100644 --- a/meta/recipes-devtools/elfutils/elfutils_0.168.bb +++ b/meta/recipes-devtools/elfutils/elfutils_0.168.bb | |||
| @@ -48,7 +48,6 @@ inherit autotools gettext | |||
| 48 | 48 | ||
| 49 | EXTRA_OECONF = "--program-prefix=eu- --without-lzma" | 49 | EXTRA_OECONF = "--program-prefix=eu- --without-lzma" |
| 50 | EXTRA_OECONF_append_class-native = " --without-bzlib" | 50 | EXTRA_OECONF_append_class-native = " --without-bzlib" |
| 51 | EXTRA_OECONF_append_libc-uclibc = " --enable-uclibc" | ||
| 52 | 51 | ||
| 53 | do_install_append() { | 52 | do_install_append() { |
| 54 | if [ "${TARGET_ARCH}" != "x86_64" ] && [ -z `echo "${TARGET_ARCH}"|grep 'i.86'` ];then | 53 | if [ "${TARGET_ARCH}" != "x86_64" ] && [ -z `echo "${TARGET_ARCH}"|grep 'i.86'` ];then |
| @@ -56,11 +55,6 @@ do_install_append() { | |||
| 56 | fi | 55 | fi |
| 57 | } | 56 | } |
| 58 | 57 | ||
| 59 | # we can not build complete elfutils when using uclibc | ||
| 60 | # but some recipes e.g. gcc 4.5 depends on libelf so we | ||
| 61 | # build only libelf for uclibc case | ||
| 62 | |||
| 63 | EXTRA_OEMAKE_libc-uclibc = "-C libelf" | ||
| 64 | EXTRA_OEMAKE_class-native = "" | 58 | EXTRA_OEMAKE_class-native = "" |
| 65 | EXTRA_OEMAKE_class-nativesdk = "" | 59 | EXTRA_OEMAKE_class-nativesdk = "" |
| 66 | 60 | ||
diff --git a/meta/recipes-devtools/gdb/gdb-common.inc b/meta/recipes-devtools/gdb/gdb-common.inc index 239b37586b..9164a2bba4 100644 --- a/meta/recipes-devtools/gdb/gdb-common.inc +++ b/meta/recipes-devtools/gdb/gdb-common.inc | |||
| @@ -5,7 +5,6 @@ DEPENDS = "expat zlib ncurses virtual/libiconv ${LTTNGUST}" | |||
| 5 | 5 | ||
| 6 | LTTNGUST = "lttng-ust" | 6 | LTTNGUST = "lttng-ust" |
| 7 | LTTNGUST_aarch64 = "" | 7 | LTTNGUST_aarch64 = "" |
| 8 | LTTNGUST_libc-uclibc = "" | ||
| 9 | LTTNGUST_mipsarch = "" | 8 | LTTNGUST_mipsarch = "" |
| 10 | LTTNGUST_sh4 = "" | 9 | LTTNGUST_sh4 = "" |
| 11 | LTTNGUST_libc-musl = "" | 10 | LTTNGUST_libc-musl = "" |
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 deleted file mode 100644 index 2094116f0d..0000000000 --- a/meta/recipes-devtools/gnu-config/gnu-config/config-guess-uclibc.patch +++ /dev/null | |||
| @@ -1,170 +0,0 @@ | |||
| 1 | Upstream-Status: Pending | ||
| 2 | |||
| 3 | Patch courtesy gentoo-portage/sys-devel/gnuconfig/files/automake-1.8.5-config-guess-uclibc.patch. | ||
| 4 | |||
| 5 | updated to 20050516 by Marcin 'Hrw' Juszkiewicz (by hand) | ||
| 6 | updated to 20080123 by Nitin A Kamble (by hand) | ||
| 7 | updated to 20111001 by Saul Wold (by hand) | ||
| 8 | updated to 20120818 by Marcin 'Hrw' Juszkiewicz (by hand) | ||
| 9 | |||
| 10 | Signed-off-by: Saul Wold <sgw@linux.intel.com> | ||
| 11 | Signed-off-by: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> | ||
| 12 | |||
| 13 | --- | ||
| 14 | config.guess | 67 +++++++++++++++++++++++++++++++++++------------------------ | ||
| 15 | 1 file changed, 40 insertions(+), 27 deletions(-) | ||
| 16 | |||
| 17 | --- git.orig/config.guess | ||
| 18 | +++ git/config.guess | ||
| 19 | @@ -138,6 +138,19 @@ UNAME_RELEASE=`(uname -r) 2>/dev/null` | | ||
| 20 | UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown | ||
| 21 | UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown | ||
| 22 | |||
| 23 | +# Detect uclibc systems. | ||
| 24 | + | ||
| 25 | +LIBC="gnu" | ||
| 26 | +if [ -f /usr/include/bits/uClibc_config.h ] | ||
| 27 | +then | ||
| 28 | + LIBC=uclibc | ||
| 29 | + if [ -n `grep "#define __UCLIBC_CONFIG_VERSION__" /usr/include/bits/uClibc_config.h` ] | ||
| 30 | + then | ||
| 31 | + UCLIBC_SUBVER=`sed -n "/#define __UCLIBC_CONFIG_VERSION__ /s///p" /usr/include/bits/uClibc_config.h` | ||
| 32 | + LIBC=$LIBC$UCLIBC_SUBVER | ||
| 33 | + fi | ||
| 34 | +fi | ||
| 35 | + | ||
| 36 | # Note: order is significant - the case branches are not exclusive. | ||
| 37 | |||
| 38 | case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in | ||
| 39 | @@ -886,15 +899,15 @@ EOF | ||
| 40 | EV68*) UNAME_MACHINE=alphaev68 ;; | ||
| 41 | esac | ||
| 42 | objdump --private-headers /bin/sh | grep -q ld.so.1 | ||
| 43 | - if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi | ||
| 44 | - echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} | ||
| 45 | + if test "$?" = 0 ; then LIBC="gnulibc1" ; else LIBC="" ; fi | ||
| 46 | + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} | ||
| 47 | exit ;; | ||
| 48 | arm*:Linux:*:*) | ||
| 49 | eval $set_cc_for_build | ||
| 50 | if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ | ||
| 51 | | grep -q __ARM_EABI__ | ||
| 52 | then | ||
| 53 | - echo ${UNAME_MACHINE}-unknown-linux-gnu | ||
| 54 | + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} | ||
| 55 | else | ||
| 56 | if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ | ||
| 57 | | grep -q __ARM_PCS_VFP | ||
| 58 | @@ -906,19 +919,19 @@ EOF | ||
| 59 | fi | ||
| 60 | exit ;; | ||
| 61 | avr32*:Linux:*:*) | ||
| 62 | - echo ${UNAME_MACHINE}-unknown-linux-gnu | ||
| 63 | + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} | ||
| 64 | exit ;; | ||
| 65 | cris:Linux:*:*) | ||
| 66 | - echo ${UNAME_MACHINE}-axis-linux-gnu | ||
| 67 | + echo ${UNAME_MACHINE}-axis-linux-${LIBC} | ||
| 68 | exit ;; | ||
| 69 | crisv32:Linux:*:*) | ||
| 70 | - echo ${UNAME_MACHINE}-axis-linux-gnu | ||
| 71 | + echo ${UNAME_MACHINE}-axis-linux-${LIBC} | ||
| 72 | exit ;; | ||
| 73 | frv:Linux:*:*) | ||
| 74 | - echo ${UNAME_MACHINE}-unknown-linux-gnu | ||
| 75 | + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} | ||
| 76 | exit ;; | ||
| 77 | hexagon:Linux:*:*) | ||
| 78 | - echo ${UNAME_MACHINE}-unknown-linux-gnu | ||
| 79 | + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} | ||
| 80 | exit ;; | ||
| 81 | i*86:Linux:*:*) | ||
| 82 | LIBC=gnu | ||
| 83 | @@ -932,13 +945,13 @@ EOF | ||
| 84 | echo "${UNAME_MACHINE}-pc-linux-${LIBC}" | ||
| 85 | exit ;; | ||
| 86 | ia64:Linux:*:*) | ||
| 87 | - echo ${UNAME_MACHINE}-unknown-linux-gnu | ||
| 88 | + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} | ||
| 89 | exit ;; | ||
| 90 | m32r*:Linux:*:*) | ||
| 91 | - echo ${UNAME_MACHINE}-unknown-linux-gnu | ||
| 92 | + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} | ||
| 93 | exit ;; | ||
| 94 | m68*:Linux:*:*) | ||
| 95 | - echo ${UNAME_MACHINE}-unknown-linux-gnu | ||
| 96 | + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} | ||
| 97 | exit ;; | ||
| 98 | mips:Linux:*:* | mips64:Linux:*:*) | ||
| 99 | eval $set_cc_for_build | ||
| 100 | @@ -957,54 +970,54 @@ EOF | ||
| 101 | #endif | ||
| 102 | EOF | ||
| 103 | eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` | ||
| 104 | - test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } | ||
| 105 | + test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; } | ||
| 106 | ;; | ||
| 107 | or32:Linux:*:*) | ||
| 108 | - echo ${UNAME_MACHINE}-unknown-linux-gnu | ||
| 109 | + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} | ||
| 110 | exit ;; | ||
| 111 | padre:Linux:*:*) | ||
| 112 | - echo sparc-unknown-linux-gnu | ||
| 113 | + echo sparc-unknown-linux-${LIBC} | ||
| 114 | exit ;; | ||
| 115 | parisc64:Linux:*:* | hppa64:Linux:*:*) | ||
| 116 | - echo hppa64-unknown-linux-gnu | ||
| 117 | + echo hppa64-unknown-linux-${LIBC} | ||
| 118 | exit ;; | ||
| 119 | parisc:Linux:*:* | hppa:Linux:*:*) | ||
| 120 | # Look for CPU level | ||
| 121 | case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in | ||
| 122 | - PA7*) echo hppa1.1-unknown-linux-gnu ;; | ||
| 123 | - PA8*) echo hppa2.0-unknown-linux-gnu ;; | ||
| 124 | - *) echo hppa-unknown-linux-gnu ;; | ||
| 125 | + PA7*) echo hppa1.1-unknown-linux-${LIBC} ;; | ||
| 126 | + PA8*) echo hppa2.0-unknown-linux-${LIBC} ;; | ||
| 127 | + *) echo hppa-unknown-linux-${LIBC} ;; | ||
| 128 | esac | ||
| 129 | exit ;; | ||
| 130 | ppc64:Linux:*:*) | ||
| 131 | - echo powerpc64-unknown-linux-gnu | ||
| 132 | + echo powerpc64-unknown-linux-${LIBC} | ||
| 133 | exit ;; | ||
| 134 | ppc:Linux:*:*) | ||
| 135 | - echo powerpc-unknown-linux-gnu | ||
| 136 | + echo powerpc-unknown-linux-${LIBC} | ||
| 137 | exit ;; | ||
| 138 | s390:Linux:*:* | s390x:Linux:*:*) | ||
| 139 | echo ${UNAME_MACHINE}-ibm-linux | ||
| 140 | exit ;; | ||
| 141 | sh64*:Linux:*:*) | ||
| 142 | - echo ${UNAME_MACHINE}-unknown-linux-gnu | ||
| 143 | + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} | ||
| 144 | exit ;; | ||
| 145 | sh*:Linux:*:*) | ||
| 146 | - echo ${UNAME_MACHINE}-unknown-linux-gnu | ||
| 147 | + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} | ||
| 148 | exit ;; | ||
| 149 | sparc:Linux:*:* | sparc64:Linux:*:*) | ||
| 150 | - echo ${UNAME_MACHINE}-unknown-linux-gnu | ||
| 151 | + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} | ||
| 152 | exit ;; | ||
| 153 | tile*:Linux:*:*) | ||
| 154 | - echo ${UNAME_MACHINE}-unknown-linux-gnu | ||
| 155 | + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} | ||
| 156 | exit ;; | ||
| 157 | vax:Linux:*:*) | ||
| 158 | - echo ${UNAME_MACHINE}-dec-linux-gnu | ||
| 159 | + echo ${UNAME_MACHINE}-dec-linux-${LIBC} | ||
| 160 | exit ;; | ||
| 161 | x86_64:Linux:*:*) | ||
| 162 | - echo ${UNAME_MACHINE}-unknown-linux-gnu | ||
| 163 | + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} | ||
| 164 | exit ;; | ||
| 165 | xtensa*:Linux:*:*) | ||
| 166 | - echo ${UNAME_MACHINE}-unknown-linux-gnu | ||
| 167 | + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} | ||
| 168 | exit ;; | ||
| 169 | i*86:DYNIX/ptx:4*:*) | ||
| 170 | # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. | ||
diff --git a/meta/recipes-devtools/gnu-config/gnu-config/uclibc.patch b/meta/recipes-devtools/gnu-config/gnu-config/uclibc.patch deleted file mode 100644 index 75fe100825..0000000000 --- a/meta/recipes-devtools/gnu-config/gnu-config/uclibc.patch +++ /dev/null | |||
| @@ -1,23 +0,0 @@ | |||
| 1 | Upstream-Status: Pending | ||
| 2 | |||
| 3 | --- config.sub.orig 2004-05-14 19:38:36.000000000 -0500 | ||
| 4 | +++ config.sub 2004-05-14 19:39:17.000000000 -0500 | ||
| 5 | @@ -118,7 +118,7 @@ | ||
| 6 | # Here we must recognize all the valid KERNEL-OS combinations. | ||
| 7 | maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` | ||
| 8 | case $maybe_os in | ||
| 9 | - nto-qnx* | linux-gnu* | kfreebsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*) | ||
| 10 | + nto-qnx* | linux-gnu* | linux-uclibc* | freebsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*) | ||
| 11 | os=-$maybe_os | ||
| 12 | basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` | ||
| 13 | ;; | ||
| 14 | @@ -1135,7 +1135,8 @@ | ||
| 15 | | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ | ||
| 16 | | -chorusos* | -chorusrdb* \ | ||
| 17 | | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ | ||
| 18 | - | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \ | ||
| 19 | + | -mingw32* | -linux-gnu* | -linux-uclibc* \ | ||
| 20 | + | -uxpv* | -beos* | -mpeix* | -udk* \ | ||
| 21 | | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ | ||
| 22 | | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ | ||
| 23 | | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ | ||
diff --git a/meta/recipes-devtools/gnu-config/gnu-config_20120814.bb b/meta/recipes-devtools/gnu-config/gnu-config_20120814.bb index 0d05e79fd5..3d428b9b78 100644 --- a/meta/recipes-devtools/gnu-config/gnu-config_20120814.bb +++ b/meta/recipes-devtools/gnu-config/gnu-config_20120814.bb | |||
| @@ -10,7 +10,6 @@ INHIBIT_DEFAULT_DEPS = "1" | |||
| 10 | 10 | ||
| 11 | 11 | ||
| 12 | SRC_URI = "http://downloads.yoctoproject.org/releases/gnu-config/gnu-config-${PV}.tar.bz2 \ | 12 | SRC_URI = "http://downloads.yoctoproject.org/releases/gnu-config/gnu-config-${PV}.tar.bz2 \ |
| 13 | file://config-guess-uclibc.patch \ | ||
| 14 | file://musl-support.patch \ | 13 | file://musl-support.patch \ |
| 15 | file://gnu-configize.in" | 14 | file://gnu-configize.in" |
| 16 | 15 | ||
diff --git a/meta/recipes-devtools/m4/m4.inc b/meta/recipes-devtools/m4/m4.inc index 4a83929f0c..75d8bbec23 100644 --- a/meta/recipes-devtools/m4/m4.inc +++ b/meta/recipes-devtools/m4/m4.inc | |||
| @@ -6,5 +6,4 @@ GNU M4 also has built-in functions for including files, running shell commands, | |||
| 6 | inherit autotools texinfo | 6 | inherit autotools texinfo |
| 7 | 7 | ||
| 8 | EXTRA_OEMAKE += "'infodir=${infodir}'" | 8 | EXTRA_OEMAKE += "'infodir=${infodir}'" |
| 9 | LDFLAGS_prepend_libc-uclibc = " -lrt " | ||
| 10 | SRC_URI = "${GNU_MIRROR}/m4/m4-${PV}.tar.gz" | 9 | SRC_URI = "${GNU_MIRROR}/m4/m4-${PV}.tar.gz" |
diff --git a/meta/recipes-devtools/mtools/mtools_4.0.18.bb b/meta/recipes-devtools/mtools/mtools_4.0.18.bb index 5d84001a52..dcd32ed94c 100644 --- a/meta/recipes-devtools/mtools/mtools_4.0.18.bb +++ b/meta/recipes-devtools/mtools/mtools_4.0.18.bb | |||
| @@ -39,8 +39,6 @@ inherit autotools texinfo | |||
| 39 | 39 | ||
| 40 | EXTRA_OECONF = "--without-x" | 40 | EXTRA_OECONF = "--without-x" |
| 41 | 41 | ||
| 42 | LDFLAGS_append_libc-uclibc = " -liconv " | ||
| 43 | |||
| 44 | BBCLASSEXTEND = "native nativesdk" | 42 | BBCLASSEXTEND = "native nativesdk" |
| 45 | 43 | ||
| 46 | PACKAGECONFIG ??= "" | 44 | PACKAGECONFIG ??= "" |
