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-support | |
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-support')
-rw-r--r-- | meta/recipes-support/attr/ea-acl.inc | 3 | ||||
-rw-r--r-- | meta/recipes-support/gnutls/gnutls.inc | 1 | ||||
-rw-r--r-- | meta/recipes-support/icu/icu.inc | 2 | ||||
-rw-r--r-- | meta/recipes-support/liburcu/liburcu_0.9.3.bb | 1 | ||||
-rw-r--r-- | meta/recipes-support/rng-tools/rng-tools/uclibc-libuargp-configure.patch | 63 | ||||
-rw-r--r-- | meta/recipes-support/rng-tools/rng-tools_5.bb | 3 |
6 files changed, 0 insertions, 73 deletions
diff --git a/meta/recipes-support/attr/ea-acl.inc b/meta/recipes-support/attr/ea-acl.inc index c587b3caca..e6f4c72e8c 100644 --- a/meta/recipes-support/attr/ea-acl.inc +++ b/meta/recipes-support/attr/ea-acl.inc | |||
@@ -47,6 +47,3 @@ PACKAGES =+ "lib${BPN}" | |||
47 | FILES_lib${BPN} = "${base_libdir}/lib*${SOLIBS}" | 47 | FILES_lib${BPN} = "${base_libdir}/lib*${SOLIBS}" |
48 | 48 | ||
49 | BBCLASSEXTEND = "native" | 49 | BBCLASSEXTEND = "native" |
50 | # Only append ldflags for target recipe and if USE_NLS is enabled | ||
51 | LDFLAGS_append_libc-uclibc_class-target = "${@['', ' -lintl '][(d.getVar('USE_NLS') == 'yes')]}" | ||
52 | EXTRA_OECONF_append_libc-uclibc_class-target = "${@['', ' --disable-gettext '][(d.getVar('USE_NLS') == 'no')]}" | ||
diff --git a/meta/recipes-support/gnutls/gnutls.inc b/meta/recipes-support/gnutls/gnutls.inc index e75d3a672c..29b5dd6ae7 100644 --- a/meta/recipes-support/gnutls/gnutls.inc +++ b/meta/recipes-support/gnutls/gnutls.inc | |||
@@ -46,7 +46,6 @@ EXTRA_OECONF = " \ | |||
46 | " | 46 | " |
47 | 47 | ||
48 | LDFLAGS_append_libc-musl = " -largp" | 48 | LDFLAGS_append_libc-musl = " -largp" |
49 | LDFLAGS_append_libc-uclibc = " -luargp -pthread" | ||
50 | 49 | ||
51 | do_configure_prepend() { | 50 | do_configure_prepend() { |
52 | for dir in . lib; do | 51 | for dir in . lib; do |
diff --git a/meta/recipes-support/icu/icu.inc b/meta/recipes-support/icu/icu.inc index f3dc1e0abf..52862745e4 100644 --- a/meta/recipes-support/icu/icu.inc +++ b/meta/recipes-support/icu/icu.inc | |||
@@ -13,8 +13,6 @@ S = "${WORKDIR}/icu/source" | |||
13 | SPDX_S = "${WORKDIR}/icu" | 13 | SPDX_S = "${WORKDIR}/icu" |
14 | STAGING_ICU_DIR_NATIVE = "${STAGING_DATADIR_NATIVE}/${BPN}/${PV}" | 14 | STAGING_ICU_DIR_NATIVE = "${STAGING_DATADIR_NATIVE}/${BPN}/${PV}" |
15 | 15 | ||
16 | CPPFLAGS_append_libc-uclibc = " -DU_TIMEZONE=0" | ||
17 | |||
18 | BINCONFIG = "${bindir}/icu-config" | 16 | BINCONFIG = "${bindir}/icu-config" |
19 | 17 | ||
20 | inherit autotools pkgconfig binconfig | 18 | inherit autotools pkgconfig binconfig |
diff --git a/meta/recipes-support/liburcu/liburcu_0.9.3.bb b/meta/recipes-support/liburcu/liburcu_0.9.3.bb index 4486e0abeb..926ba024ca 100644 --- a/meta/recipes-support/liburcu/liburcu_0.9.3.bb +++ b/meta/recipes-support/liburcu/liburcu_0.9.3.bb | |||
@@ -15,5 +15,4 @@ SRC_URI[md5sum] = "920970e35a1a2066c8353eabfeab8730" | |||
15 | SRC_URI[sha256sum] = "1bce32e6a6c967fef6d37adaadf33df19878d69673f9ef9d3f2470e0c6ed4006" | 15 | SRC_URI[sha256sum] = "1bce32e6a6c967fef6d37adaadf33df19878d69673f9ef9d3f2470e0c6ed4006" |
16 | 16 | ||
17 | S = "${WORKDIR}/userspace-rcu-${PV}" | 17 | S = "${WORKDIR}/userspace-rcu-${PV}" |
18 | CFLAGS_append_libc-uclibc = " -D_GNU_SOURCE" | ||
19 | inherit autotools | 18 | inherit autotools |
diff --git a/meta/recipes-support/rng-tools/rng-tools/uclibc-libuargp-configure.patch b/meta/recipes-support/rng-tools/rng-tools/uclibc-libuargp-configure.patch deleted file mode 100644 index e691315d16..0000000000 --- a/meta/recipes-support/rng-tools/rng-tools/uclibc-libuargp-configure.patch +++ /dev/null | |||
@@ -1,63 +0,0 @@ | |||
1 | In case of uclibc, use libuargp | ||
2 | |||
3 | If we use uclibc for system libraries, select libuargp | ||
4 | |||
5 | Upstream-Status: Pending | ||
6 | |||
7 | Signed-off-by: Maxin B. John <maxin.john@intel.com> | ||
8 | --- | ||
9 | diff -Naur rng-tools-5-orig/configure.ac rng-tools-5/configure.ac | ||
10 | --- rng-tools-5-orig/configure.ac 2016-02-24 18:11:24.023690235 +0200 | ||
11 | +++ rng-tools-5/configure.ac 2016-02-24 18:14:49.763118138 +0200 | ||
12 | @@ -39,6 +39,13 @@ | ||
13 | [with_libargp=check] | ||
14 | ) | ||
15 | |||
16 | +AC_ARG_ENABLE([uclibc], | ||
17 | + AS_HELP_STRING([--enable-uclibc], [Use uclibc for system libraries]), | ||
18 | + use_uclibc=yes, use_uclibc=no) | ||
19 | +AM_CONDITIONAL(USE_UCLIBC, test "x$use_uclibc" = "xyes") | ||
20 | +AS_IF([test "x$use_uclibc" = "xyes"], [AC_DEFINE(USE_UCLIBC)]) | ||
21 | +AH_TEMPLATE([USE_UCLIBC], [Defined if uclibc libraries are used.]) | ||
22 | + | ||
23 | dnl Make sure anyone changing configure.ac/Makefile.am has a clue | ||
24 | AM_MAINTAINER_MODE | ||
25 | |||
26 | @@ -101,7 +108,7 @@ | ||
27 | [need_libargp=no], | ||
28 | [need_libargp=yes | ||
29 | if test "x$with_libargp" = "xno"; then | ||
30 | - AC_MSG_FAILURE([libargp disabled and libc does not have argp]) | ||
31 | + AC_MSG_WARN([libargp disabled and libc does not have argp]) | ||
32 | fi] | ||
33 | ) | ||
34 | ], | ||
35 | @@ -110,7 +117,7 @@ | ||
36 | |||
37 | dnl Check for libargp | ||
38 | AS_IF( | ||
39 | - [test "x$need_libargp" = "xyes"], | ||
40 | + [test "x$need_libargp" = "xyes" -a "x$use_uclibc" = "xno"], | ||
41 | [ | ||
42 | AC_CHECK_LIB( | ||
43 | [argp], | ||
44 | @@ -120,6 +127,19 @@ | ||
45 | ) | ||
46 | ] | ||
47 | ) | ||
48 | + | ||
49 | +dnl Check for libuargp | ||
50 | +AS_IF( | ||
51 | + [test "x$use_uclibc" = "xyes"], | ||
52 | + [ | ||
53 | + AC_CHECK_LIB( | ||
54 | + [uargp], | ||
55 | + [argp_parse], | ||
56 | + [LIBS="$LIBS -luargp"], | ||
57 | + [AC_MSG_FAILURE([libuargp not found])] | ||
58 | + ) | ||
59 | + ] | ||
60 | +) | ||
61 | |||
62 | dnl ----------------- | ||
63 | dnl Configure options | ||
diff --git a/meta/recipes-support/rng-tools/rng-tools_5.bb b/meta/recipes-support/rng-tools/rng-tools_5.bb index e2acaba91a..de6e5f9a76 100644 --- a/meta/recipes-support/rng-tools/rng-tools_5.bb +++ b/meta/recipes-support/rng-tools/rng-tools_5.bb | |||
@@ -6,7 +6,6 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/gkernel/${BP}.tar.gz \ | |||
6 | file://0001-If-the-libc-is-lacking-argp-use-libargp.patch \ | 6 | file://0001-If-the-libc-is-lacking-argp-use-libargp.patch \ |
7 | file://0002-Add-argument-to-control-the-libargp-dependency.patch \ | 7 | file://0002-Add-argument-to-control-the-libargp-dependency.patch \ |
8 | file://underquote.patch \ | 8 | file://underquote.patch \ |
9 | file://uclibc-libuargp-configure.patch \ | ||
10 | file://rng-tools-5-fix-textrels-on-PIC-x86.patch \ | 9 | file://rng-tools-5-fix-textrels-on-PIC-x86.patch \ |
11 | file://init \ | 10 | file://init \ |
12 | file://default" | 11 | file://default" |
@@ -25,9 +24,7 @@ inherit autotools update-rc.d | |||
25 | 24 | ||
26 | PACKAGECONFIG = "libgcrypt" | 25 | PACKAGECONFIG = "libgcrypt" |
27 | PACKAGECONFIG_libc-musl = "libargp" | 26 | PACKAGECONFIG_libc-musl = "libargp" |
28 | PACKAGECONFIG_libc-uclibc = "libuargp" | ||
29 | PACKAGECONFIG[libargp] = "--with-libargp,--without-libargp,argp-standalone," | 27 | PACKAGECONFIG[libargp] = "--with-libargp,--without-libargp,argp-standalone," |
30 | PACKAGECONFIG[libuargp] = "--enable-uclibc,,," | ||
31 | PACKAGECONFIG[libgcrypt] = "--with-libgcrypt,--without-libgcrypt,libgcrypt," | 28 | PACKAGECONFIG[libgcrypt] = "--with-libgcrypt,--without-libgcrypt,libgcrypt," |
32 | 29 | ||
33 | do_install_append() { | 30 | do_install_append() { |