diff options
43 files changed, 5 insertions, 615 deletions
diff --git a/meta/conf/distro/include/security_flags.inc b/meta/conf/distro/include/security_flags.inc index e162abeb3d..38164d08b8 100644 --- a/meta/conf/distro/include/security_flags.inc +++ b/meta/conf/distro/include/security_flags.inc @@ -84,8 +84,6 @@ SECURITY_CFLAGS_pn-slang = "${SECURITY_NO_PIE_CFLAGS}" SECURITY_CFLAGS_pn-source-highlight = "${SECURITY_NO_PIE_CFLAGS}" SECURITY_CFLAGS_pn-tcl = "${SECURITY_NO_PIE_CFLAGS}" SECURITY_CFLAGS_pn-tiff = "${SECURITY_NO_PIE_CFLAGS}" -SECURITY_CFLAGS_pn-uclibc = "" -SECURITY_CFLAGS_pn-uclibc-initial = "" SECURITY_CFLAGS_pn-valgrind = "" SECURITY_CFLAGS_pn-zlib = "${SECURITY_NO_PIE_CFLAGS}" @@ -100,8 +98,6 @@ TARGET_LDFLAGS_append_class-target = " ${SECURITY_LDFLAGS}" SECURITY_LDFLAGS_remove_pn-gcc-runtime = "-fstack-protector-strong" SECURITY_LDFLAGS_remove_pn-glibc = "-fstack-protector-strong" SECURITY_LDFLAGS_remove_pn-glibc-initial = "-fstack-protector-strong" -SECURITY_LDFLAGS_remove_pn-uclibc = "-fstack-protector-strong" -SECURITY_LDFLAGS_remove_pn-uclibc-initial = "-fstack-protector-strong" SECURITY_LDFLAGS_pn-xf86-video-fbdev = "${SECURITY_X_LDFLAGS}" SECURITY_LDFLAGS_pn-xf86-video-intel = "${SECURITY_X_LDFLAGS}" SECURITY_LDFLAGS_pn-xf86-video-omapfb = "${SECURITY_X_LDFLAGS}" diff --git a/meta/conf/distro/include/tcmode-default.inc b/meta/conf/distro/include/tcmode-default.inc index d5ba38d442..424b8887cc 100644 --- a/meta/conf/distro/include/tcmode-default.inc +++ b/meta/conf/distro/include/tcmode-default.inc @@ -27,7 +27,6 @@ SDKGCCVERSION ?= "${GCCVERSION}" BINUVERSION ?= "2.28%" GDBVERSION ?= "8.0%" GLIBCVERSION ?= "2.25" -UCLIBCVERSION ?= "1.0%" LINUXLIBCVERSION ?= "4.10%" PREFERRED_VERSION_gcc ?= "${GCCVERSION}" @@ -64,8 +63,6 @@ PREFERRED_VERSION_nativesdk-glibc ?= "${GLIBCVERSION}" PREFERRED_VERSION_glibc-initial ?= "${GLIBCVERSION}" PREFERRED_VERSION_nativesdk-glibc-initial ?= "${GLIBCVERSION}" PREFERRED_VERSION_cross-localedef-native ?= "${GLIBCVERSION}" -PREFERRED_VERSION_uclibc ?= "${UCLIBCVERSION}" -PREFERRED_VERSION_uclibc-initial ?= "${UCLIBCVERSION}" # don't use version earlier than 1.4 for gzip-native, as it's necessary for # some packages using an archive format incompatible with earlier gzip PREFERRED_VERSION_gzip-native ?= "1.8" diff --git a/meta/conf/local.conf.sample.extended b/meta/conf/local.conf.sample.extended index f7cabf095d..5d6c37dbcf 100644 --- a/meta/conf/local.conf.sample.extended +++ b/meta/conf/local.conf.sample.extended @@ -94,10 +94,7 @@ # PACKAGE_DEBUG_SPLIT_STYLE = 'debug-file-directory' # Uncomment these to build a package such that you can use gprof to profile it. -# NOTE: This will only work with 'linux' targets, not -# 'linux-uclibc', as uClibc doesn't provide the necessary -# object files. Also, don't build glibc itself with these -# flags, or it'll fail to build. +# NOTE: Don't build glibc itself with these flags, or it'll fail to build. # # PROFILE_OPTIMIZATION = "-pg" # SELECTED_OPTIMIZATION = "${PROFILE_OPTIMIZATION}" diff --git a/meta/recipes-connectivity/avahi/avahi.inc b/meta/recipes-connectivity/avahi/avahi.inc index faa8741dc5..7814464940 100644 --- a/meta/recipes-connectivity/avahi/avahi.inc +++ b/meta/recipes-connectivity/avahi/avahi.inc @@ -63,10 +63,6 @@ EXTRA_OECONF = "--with-avahi-priv-access-group=adm \ EXTRA_OECONF_SYSVINIT = "${@bb.utils.contains('DISTRO_FEATURES','sysvinit','--with-distro=debian','--with-distro=none',d)}" EXTRA_OECONF_SYSTEMD = "${@bb.utils.contains('DISTRO_FEATURES','systemd','--with-systemdsystemunitdir=${systemd_unitdir}/system/','--without-systemdsystemunitdir',d)}" - -LDFLAGS_append_libc-uclibc = " -lintl" -LDFLAGS_append_uclinux-uclibc = " -lintl" - do_configure_prepend() { sed 's:AM_CHECK_PYMOD:echo "no pymod" #AM_CHECK_PYMOD:g' -i ${S}/configure.ac @@ -111,7 +107,6 @@ FILES_avahi-utils = "${bindir}/avahi-*" RDEPENDS_${PN}-dev = "avahi-daemon (= ${EXTENDPKGV}) libavahi-core (= ${EXTENDPKGV}) libavahi-client (= ${EXTENDPKGV})" -# uclibc has no nss RRECOMMENDS_avahi-daemon_append_libc-glibc = " libnss-mdns" RRECOMMENDS_${PN}_append_libc-glibc = " libnss-mdns" diff --git a/meta/recipes-connectivity/ofono/ofono_1.20.bb b/meta/recipes-connectivity/ofono/ofono_1.20.bb index 356a996d3e..18f983e854 100644 --- a/meta/recipes-connectivity/ofono/ofono_1.20.bb +++ b/meta/recipes-connectivity/ofono/ofono_1.20.bb @@ -6,5 +6,3 @@ SRC_URI = "\ " SRC_URI[md5sum] = "fad0630fce6a9aecdb7db37bc1f1db7d" SRC_URI[sha256sum] = "5d7ba8f481a7715d013a79f8d6477eb89d8aaae399395d5d008a1317c34a31d5" - -CFLAGS_append_libc-uclibc = " -D_GNU_SOURCE" diff --git a/meta/recipes-connectivity/openssh/openssh_7.5p1.bb b/meta/recipes-connectivity/openssh/openssh_7.5p1.bb index 5b96745aae..7bd313bb4e 100644 --- a/meta/recipes-connectivity/openssh/openssh_7.5p1.bb +++ b/meta/recipes-connectivity/openssh/openssh_7.5p1.bb @@ -69,12 +69,6 @@ CACHED_CONFIGUREVARS += "ac_cv_path_PATH_PASSWD_PROG=${bindir}/passwd" # We don't want to depend on libblockfile CACHED_CONFIGUREVARS += "ac_cv_header_maillock_h=no" -# This is a workaround for uclibc because including stdio.h -# pulls in pthreads.h and causes conflicts in function prototypes. -# This results in compilation failure, so unless this is fixed, -# disable pam for uclibc. -EXTRA_OECONF_append_libc-uclibc=" --without-pam" - do_configure_prepend () { export LD="${CC}" install -m 0644 ${WORKDIR}/sshd_config ${B}/ diff --git a/meta/recipes-core/busybox/busybox.inc b/meta/recipes-core/busybox/busybox.inc index 0816df624a..b8edd3942c 100644 --- a/meta/recipes-core/busybox/busybox.inc +++ b/meta/recipes-core/busybox/busybox.inc @@ -71,7 +71,7 @@ def features_to_busybox_settings(d): busybox_cfg(bb.utils.contains('DISTRO_FEATURES', 'bluetooth', True, False, d), 'CONFIG_RFKILL', cnf, rem) return "\n".join(cnf), "\n".join(rem) -# X, Y = ${@features_to_uclibc_settings(d)} +# X, Y = ${@features_to_busybox_settings(d)} # unfortunately doesn't seem to work with bitbake, workaround: def features_to_busybox_conf(d): cnf, rem = features_to_busybox_settings(d) diff --git a/meta/recipes-core/gettext/gettext_0.19.8.1.bb b/meta/recipes-core/gettext/gettext_0.19.8.1.bb index 83edffe530..97e7986dc1 100644 --- a/meta/recipes-core/gettext/gettext_0.19.8.1.bb +++ b/meta/recipes-core/gettext/gettext_0.19.8.1.bb @@ -24,8 +24,6 @@ SRC_URI[sha256sum] = "ff942af0e438ced4a8b0ea4b0b6e0d6d657157c5e2364de57baa279c1c PACKAGECONFIG[msgcat-curses] = "--with-libncurses-prefix=${STAGING_LIBDIR}/..,--disable-curses,ncurses," -LDFLAGS_prepend_libc-uclibc = " -lrt -lpthread " - inherit autotools texinfo EXTRA_OECONF += "--without-lispdir \ @@ -86,15 +84,9 @@ FILES_gettext-runtime = "${bindir}/gettext \ ${libdir}/libasprintf.so* \ ${libdir}/GNU.Gettext.dll \ " -FILES_gettext-runtime_append_libc-uclibc = " ${libdir}/libintl.so.* \ - ${libdir}/charset.alias \ - " FILES_gettext-runtime-dev += "${libdir}/libasprintf.a \ ${includedir}/autosprintf.h \ " -FILES_gettext-runtime-dev_append_libc-uclibc = " ${libdir}/libintl.so \ - ${includedir}/libintl.h \ - " FILES_gettext-runtime-doc = "${mandir}/man1/gettext.* \ ${mandir}/man1/ngettext.* \ ${mandir}/man1/envsubst.* \ diff --git a/meta/recipes-core/glib-2.0/glib.inc b/meta/recipes-core/glib-2.0/glib.inc index 2caa341869..4a145ae69c 100644 --- a/meta/recipes-core/glib-2.0/glib.inc +++ b/meta/recipes-core/glib-2.0/glib.inc @@ -43,7 +43,6 @@ PRINTF_darwin = "--enable-included-printf=yes" PRINTF_mingw32 = "--enable-included-printf=yes" EXTRA_OECONF = "${PRINTF} ${CORECONF}" EXTRA_OECONF_class-native = "${CORECONF} --disable-selinux" -EXTRA_OECONF_append_libc-uclibc = " --with-libiconv=gnu" # Tell configure that we'll have dbus-daemon on the target for the tests EXTRA_OECONF_class-target_append = " ${@bb.utils.contains('PTEST_ENABLED', '1', ' ac_cv_prog_DBUS_DAEMON=dbus-daemon', '', d)}" diff --git a/meta/recipes-core/glibc/glibc-collateral.inc b/meta/recipes-core/glibc/glibc-collateral.inc index 37f27ca448..de859d5ce9 100644 --- a/meta/recipes-core/glibc/glibc-collateral.inc +++ b/meta/recipes-core/glibc/glibc-collateral.inc @@ -18,5 +18,4 @@ do_compile[noexec] = "1" do_install[depends] += "virtual/${MLPREFIX}libc:do_stash_locale" COMPATIBLE_HOST_libc-musl_class-target = "null" -COMPATIBLE_HOST_libc-uclibc_class-target = "null" diff --git a/meta/recipes-core/glibc/glibc-package.inc b/meta/recipes-core/glibc/glibc-package.inc index 9f7fa62a37..645be694b5 100644 --- a/meta/recipes-core/glibc/glibc-package.inc +++ b/meta/recipes-core/glibc/glibc-package.inc @@ -1,19 +1,3 @@ -# -# For now, we will skip building of a gcc package if it is a uclibc one -# and our build is not a uclibc one, and we skip a glibc one if our build -# is a uclibc build. -# -# See the note in gcc/gcc_3.4.0.oe -# - -python __anonymous () { - import bb, re - uc_os = (re.match('.*uclibc*', d.getVar('TARGET_OS')) != None) - if uc_os: - raise bb.parse.SkipPackage("incompatible with target %s" % - d.getVar('TARGET_OS')) -} - INHIBIT_SYSROOT_STRIP = "1" PACKAGES = "${PN}-dbg catchsegv sln nscd ldd tzcode glibc-thread-db ${PN}-pic libcidn libmemusage libsegfault ${PN}-pcprofile libsotruss ${PN} ${PN}-utils glibc-extra-nss ${PN}-dev ${PN}-staticdev ${PN}-doc" diff --git a/meta/recipes-core/glibc/glibc_2.25.bb b/meta/recipes-core/glibc/glibc_2.25.bb index 83a1249b8c..c37438a2d1 100644 --- a/meta/recipes-core/glibc/glibc_2.25.bb +++ b/meta/recipes-core/glibc/glibc_2.25.bb @@ -67,7 +67,6 @@ GLIBC_BROKEN_LOCALES = "" # this helps in easing out parsing for non-glibc system libraries # COMPATIBLE_HOST_libc-musl_class-target = "null" -COMPATIBLE_HOST_libc-uclibc_class-target = "null" EXTRA_OECONF = "--enable-kernel=${OLDEST_KERNEL} \ --without-cvs --disable-profile \ diff --git a/meta/recipes-core/packagegroups/packagegroup-core-sdk.bb b/meta/recipes-core/packagegroups/packagegroup-core-sdk.bb index 7d6d41473a..af0ce2013e 100644 --- a/meta/recipes-core/packagegroups/packagegroup-core-sdk.bb +++ b/meta/recipes-core/packagegroups/packagegroup-core-sdk.bb @@ -33,7 +33,6 @@ SANITIZERS_nios2 = "" SANITIZERS_powerpc64 = "" SANITIZERS_sparc = "" SANITIZERS_libc-musl = "" -SANITIZERS_libc-uclibc = "" RRECOMMENDS_packagegroup-core-sdk = "\ libgomp \ diff --git a/meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb b/meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb index 946c947c8f..51335e232d 100644 --- a/meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb +++ b/meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb @@ -31,23 +31,15 @@ PROFILETOOLS = "\ PERF = "perf" PERF_libc-musl = "" -# systemtap needs elfutils which is not fully buildable on uclibc -# hence we exclude it from uclibc based builds +# systemtap needs elfutils which is not fully buildable on some arches/libcs SYSTEMTAP = "systemtap" -SYSTEMTAP_libc-uclibc = "" SYSTEMTAP_libc-musl = "" SYSTEMTAP_mipsarch = "" SYSTEMTAP_nios2 = "" SYSTEMTAP_aarch64 = "" -# lttng-ust uses sched_getcpu() which is not there on uclibc -# for some of the architectures it can be patched to call the -# syscall directly but for x86_64 __NR_getcpu is a vsyscall -# which means we can not use syscall() to call it. So we ignore -# it for x86_64/uclibc - +# lttng-ust uses sched_getcpu() which is not there on for some platforms. LTTNGUST = "lttng-ust" -LTTNGUST_libc-uclibc = "" LTTNGUST_libc-musl = "" LTTNGTOOLS = "lttng-tools" @@ -60,7 +52,6 @@ BABELTRACE = "babeltrace" # valgrind does not work on the following configurations/architectures VALGRIND = "valgrind" -VALGRIND_libc-uclibc = "" VALGRIND_libc-musl = "" VALGRIND_mipsarch = "" VALGRIND_nios2 = "" diff --git a/meta/recipes-core/systemd/systemd.inc b/meta/recipes-core/systemd/systemd.inc index 29e0be6ae5..a4def99884 100644 --- a/meta/recipes-core/systemd/systemd.inc +++ b/meta/recipes-core/systemd/systemd.inc @@ -19,5 +19,3 @@ SRCREV = "a1e2ef7ec912902d8142e7cb5830cbfb47dba86c" SRC_URI = "git://github.com/systemd/systemd.git;protocol=git" S = "${WORKDIR}/git" - -LDFLAGS_append_libc-uclibc = " -lrt -lssp_nonshared -lssp " diff --git a/meta/recipes-core/systemd/systemd_232.bb b/meta/recipes-core/systemd/systemd_232.bb index 6aeccbd422..a6e6401da7 100644 --- a/meta/recipes-core/systemd/systemd_232.bb +++ b/meta/recipes-core/systemd/systemd_232.bb @@ -35,9 +35,6 @@ SRC_URI += " \ file://0020-back-port-233-don-t-use-the-unified-hierarchy-for-the-systemd.patch \ file://0021-build-sys-check-for-lz4-in-the-old-and-new-numbering.patch \ " -SRC_URI_append_libc-uclibc = "\ - file://0002-units-Prefer-getty-to-agetty-in-console-setup-system.patch \ -" SRC_URI_append_qemuall = " file://0001-core-device.c-Change-the-default-device-timeout-to-2.patch" PACKAGECONFIG ??= "xz \ 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 EXTRA_OECONF = "--program-prefix=eu- --without-lzma" EXTRA_OECONF_append_class-native = " --without-bzlib" -EXTRA_OECONF_append_libc-uclibc = " --enable-uclibc" do_install_append() { if [ "${TARGET_ARCH}" != "x86_64" ] && [ -z `echo "${TARGET_ARCH}"|grep 'i.86'` ];then @@ -56,11 +55,6 @@ do_install_append() { fi } -# we can not build complete elfutils when using uclibc -# but some recipes e.g. gcc 4.5 depends on libelf so we -# build only libelf for uclibc case - -EXTRA_OEMAKE_libc-uclibc = "-C libelf" EXTRA_OEMAKE_class-native = "" EXTRA_OEMAKE_class-nativesdk = "" 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}" LTTNGUST = "lttng-ust" LTTNGUST_aarch64 = "" -LTTNGUST_libc-uclibc = "" LTTNGUST_mipsarch = "" LTTNGUST_sh4 = "" 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 @@ -Upstream-Status: Pending - -Patch courtesy gentoo-portage/sys-devel/gnuconfig/files/automake-1.8.5-config-guess-uclibc.patch. - -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 <sgw@linux.intel.com> -Signed-off-by: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> - ---- - config.guess | 67 +++++++++++++++++++++++++++++++++++------------------------ - 1 file changed, 40 insertions(+), 27 deletions(-) - ---- 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 - -+# 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 -@@ -886,15 +899,15 @@ EOF - EV68*) UNAME_MACHINE=alphaev68 ;; - esac - objdump --private-headers /bin/sh | grep -q ld.so.1 -- if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi -- echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} -+ if test "$?" = 0 ; then LIBC="gnulibc1" ; else LIBC="" ; fi -+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - exit ;; - arm*:Linux:*:*) - eval $set_cc_for_build - 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 - if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ - | grep -q __ARM_PCS_VFP -@@ -906,19 +919,19 @@ EOF - fi - exit ;; - avr32*:Linux:*:*) -- echo ${UNAME_MACHINE}-unknown-linux-gnu -+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - exit ;; - cris:Linux:*:*) -- echo ${UNAME_MACHINE}-axis-linux-gnu -+ echo ${UNAME_MACHINE}-axis-linux-${LIBC} - exit ;; - crisv32:Linux:*:*) -- echo ${UNAME_MACHINE}-axis-linux-gnu -+ echo ${UNAME_MACHINE}-axis-linux-${LIBC} - exit ;; - frv:Linux:*:*) -- echo ${UNAME_MACHINE}-unknown-linux-gnu -+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - exit ;; - hexagon:Linux:*:*) -- echo ${UNAME_MACHINE}-unknown-linux-gnu -+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - exit ;; - i*86:Linux:*:*) - LIBC=gnu -@@ -932,13 +945,13 @@ EOF - 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 -@@ -957,54 +970,54 @@ 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 ${UNAME_MACHINE}-unknown-linux-gnu -+ echo ${UNAME_MACHINE}-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 ;; - tile*: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 ${UNAME_MACHINE}-unknown-linux-gnu -+ echo ${UNAME_MACHINE}-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/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 @@ -Upstream-Status: Pending - ---- config.sub.orig 2004-05-14 19:38:36.000000000 -0500 -+++ config.sub 2004-05-14 19:39:17.000000000 -0500 -@@ -118,7 +118,7 @@ - # Here we must recognize all the valid KERNEL-OS combinations. - maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` - case $maybe_os in -- nto-qnx* | linux-gnu* | kfreebsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*) -+ nto-qnx* | linux-gnu* | linux-uclibc* | freebsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*) - os=-$maybe_os - basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` - ;; -@@ -1135,7 +1135,8 @@ - | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ - | -chorusos* | -chorusrdb* \ - | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ -- | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \ -+ | -mingw32* | -linux-gnu* | -linux-uclibc* \ -+ | -uxpv* | -beos* | -mpeix* | -udk* \ - | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ - | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ - | -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" SRC_URI = "http://downloads.yoctoproject.org/releases/gnu-config/gnu-config-${PV}.tar.bz2 \ - file://config-guess-uclibc.patch \ file://musl-support.patch \ file://gnu-configize.in" 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, inherit autotools texinfo EXTRA_OEMAKE += "'infodir=${infodir}'" -LDFLAGS_prepend_libc-uclibc = " -lrt " 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 EXTRA_OECONF = "--without-x" -LDFLAGS_append_libc-uclibc = " -liconv " - BBCLASSEXTEND = "native nativesdk" PACKAGECONFIG ?? |