summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--meta/conf/distro/include/security_flags.inc4
-rw-r--r--meta/conf/distro/include/tcmode-default.inc3
-rw-r--r--meta/recipes-connectivity/avahi/avahi.inc5
-rw-r--r--meta/recipes-connectivity/ofono/ofono_1.20.bb2
-rw-r--r--meta/recipes-connectivity/openssh/openssh_7.5p1.bb6
-rw-r--r--meta/recipes-core/busybox/busybox.inc2
-rw-r--r--meta/recipes-core/gettext/gettext_0.19.8.1.bb8
-rw-r--r--meta/recipes-core/glib-2.0/glib.inc1
-rw-r--r--meta/recipes-core/glibc/glibc-collateral.inc1
-rw-r--r--meta/recipes-core/glibc/glibc-package.inc16
-rw-r--r--meta/recipes-core/glibc/glibc_2.25.bb1
-rw-r--r--meta/recipes-core/packagegroups/packagegroup-core-sdk.bb1
-rw-r--r--meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb13
-rw-r--r--meta/recipes-core/systemd/systemd.inc2
-rw-r--r--meta/recipes-core/systemd/systemd_232.bb3
-rw-r--r--meta/recipes-devtools/elfutils/elfutils_0.168.bb6
-rw-r--r--meta/recipes-devtools/gdb/gdb-common.inc1
-rw-r--r--meta/recipes-devtools/gnu-config/gnu-config/config-guess-uclibc.patch170
-rw-r--r--meta/recipes-devtools/gnu-config/gnu-config/uclibc.patch23
-rw-r--r--meta/recipes-devtools/gnu-config/gnu-config_20120814.bb1
-rw-r--r--meta/recipes-devtools/m4/m4.inc1
-rw-r--r--meta/recipes-devtools/mtools/mtools_4.0.18.bb2
-rw-r--r--meta/recipes-extended/diffutils/diffutils.inc7
-rw-r--r--meta/recipes-extended/findutils/findutils.inc7
-rw-r--r--meta/recipes-extended/libtirpc/libtirpc_1.0.1.bb3
-rw-r--r--meta/recipes-extended/net-tools/net-tools_1.60-26.bb2
-rw-r--r--meta/recipes-extended/pam/libpam/use-utmpx.patch233
-rw-r--r--meta/recipes-extended/pam/libpam_1.3.0.bb2
-rw-r--r--meta/recipes-extended/parted/parted_3.2.bb1
-rw-r--r--meta/recipes-extended/shadow/shadow.inc1
-rw-r--r--meta/recipes-extended/sysstat/sysstat.inc1
-rw-r--r--meta/recipes-extended/tcp-wrappers/tcp-wrappers_7.6.bb1
-rw-r--r--meta/recipes-gnome/gnome/gconf_3.2.6.bb3
-rw-r--r--meta/recipes-multimedia/alsa/alsa-lib_1.1.4.1.bb2
-rw-r--r--meta/recipes-multimedia/alsa/alsa-utils_1.1.4.bb6
-rw-r--r--meta/recipes-sato/packagegroups/packagegroup-core-x11-sato.bb1
-rw-r--r--meta/recipes-support/attr/ea-acl.inc3
-rw-r--r--meta/recipes-support/gnutls/gnutls.inc1
-rw-r--r--meta/recipes-support/icu/icu.inc2
-rw-r--r--meta/recipes-support/liburcu/liburcu_0.9.3.bb1
-rw-r--r--meta/recipes-support/rng-tools/rng-tools/uclibc-libuargp-configure.patch63
-rw-r--r--meta/recipes-support/rng-tools/rng-tools_5.bb3
42 files changed, 4 insertions, 611 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}"
84SECURITY_CFLAGS_pn-source-highlight = "${SECURITY_NO_PIE_CFLAGS}" 84SECURITY_CFLAGS_pn-source-highlight = "${SECURITY_NO_PIE_CFLAGS}"
85SECURITY_CFLAGS_pn-tcl = "${SECURITY_NO_PIE_CFLAGS}" 85SECURITY_CFLAGS_pn-tcl = "${SECURITY_NO_PIE_CFLAGS}"
86SECURITY_CFLAGS_pn-tiff = "${SECURITY_NO_PIE_CFLAGS}" 86SECURITY_CFLAGS_pn-tiff = "${SECURITY_NO_PIE_CFLAGS}"
87SECURITY_CFLAGS_pn-uclibc = ""
88SECURITY_CFLAGS_pn-uclibc-initial = ""
89SECURITY_CFLAGS_pn-valgrind = "" 87SECURITY_CFLAGS_pn-valgrind = ""
90SECURITY_CFLAGS_pn-zlib = "${SECURITY_NO_PIE_CFLAGS}" 88SECURITY_CFLAGS_pn-zlib = "${SECURITY_NO_PIE_CFLAGS}"
91 89
@@ -100,8 +98,6 @@ TARGET_LDFLAGS_append_class-target = " ${SECURITY_LDFLAGS}"
100SECURITY_LDFLAGS_remove_pn-gcc-runtime = "-fstack-protector-strong" 98SECURITY_LDFLAGS_remove_pn-gcc-runtime = "-fstack-protector-strong"
101SECURITY_LDFLAGS_remove_pn-glibc = "-fstack-protector-strong" 99SECURITY_LDFLAGS_remove_pn-glibc = "-fstack-protector-strong"
102SECURITY_LDFLAGS_remove_pn-glibc-initial = "-fstack-protector-strong" 100SECURITY_LDFLAGS_remove_pn-glibc-initial = "-fstack-protector-strong"
103SECURITY_LDFLAGS_remove_pn-uclibc = "-fstack-protector-strong"
104SECURITY_LDFLAGS_remove_pn-uclibc-initial = "-fstack-protector-strong"
105SECURITY_LDFLAGS_pn-xf86-video-fbdev = "${SECURITY_X_LDFLAGS}" 101SECURITY_LDFLAGS_pn-xf86-video-fbdev = "${SECURITY_X_LDFLAGS}"
106SECURITY_LDFLAGS_pn-xf86-video-intel = "${SECURITY_X_LDFLAGS}" 102SECURITY_LDFLAGS_pn-xf86-video-intel = "${SECURITY_X_LDFLAGS}"
107SECURITY_LDFLAGS_pn-xf86-video-omapfb = "${SECURITY_X_LDFLAGS}" 103SECURITY_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}"
27BINUVERSION ?= "2.28%" 27BINUVERSION ?= "2.28%"
28GDBVERSION ?= "8.0%" 28GDBVERSION ?= "8.0%"
29GLIBCVERSION ?= "2.25" 29GLIBCVERSION ?= "2.25"
30UCLIBCVERSION ?= "1.0%"
31LINUXLIBCVERSION ?= "4.10%" 30LINUXLIBCVERSION ?= "4.10%"
32 31
33PREFERRED_VERSION_gcc ?= "${GCCVERSION}" 32PREFERRED_VERSION_gcc ?= "${GCCVERSION}"
@@ -64,8 +63,6 @@ PREFERRED_VERSION_nativesdk-glibc ?= "${GLIBCVERSION}"
64PREFERRED_VERSION_glibc-initial ?= "${GLIBCVERSION}" 63PREFERRED_VERSION_glibc-initial ?= "${GLIBCVERSION}"
65PREFERRED_VERSION_nativesdk-glibc-initial ?= "${GLIBCVERSION}" 64PREFERRED_VERSION_nativesdk-glibc-initial ?= "${GLIBCVERSION}"
66PREFERRED_VERSION_cross-localedef-native ?= "${GLIBCVERSION}" 65PREFERRED_VERSION_cross-localedef-native ?= "${GLIBCVERSION}"
67PREFERRED_VERSION_uclibc ?= "${UCLIBCVERSION}"
68PREFERRED_VERSION_uclibc-initial ?= "${UCLIBCVERSION}"
69# don't use version earlier than 1.4 for gzip-native, as it's necessary for 66# don't use version earlier than 1.4 for gzip-native, as it's necessary for
70# some packages using an archive format incompatible with earlier gzip 67# some packages using an archive format incompatible with earlier gzip
71PREFERRED_VERSION_gzip-native ?= "1.8" 68PREFERRED_VERSION_gzip-native ?= "1.8"
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 \
63EXTRA_OECONF_SYSVINIT = "${@bb.utils.contains('DISTRO_FEATURES','sysvinit','--with-distro=debian','--with-distro=none',d)}" 63EXTRA_OECONF_SYSVINIT = "${@bb.utils.contains('DISTRO_FEATURES','sysvinit','--with-distro=debian','--with-distro=none',d)}"
64EXTRA_OECONF_SYSTEMD = "${@bb.utils.contains('DISTRO_FEATURES','systemd','--with-systemdsystemunitdir=${systemd_unitdir}/system/','--without-systemdsystemunitdir',d)}" 64EXTRA_OECONF_SYSTEMD = "${@bb.utils.contains('DISTRO_FEATURES','systemd','--with-systemdsystemunitdir=${systemd_unitdir}/system/','--without-systemdsystemunitdir',d)}"
65 65
66
67LDFLAGS_append_libc-uclibc = " -lintl"
68LDFLAGS_append_uclinux-uclibc = " -lintl"
69
70do_configure_prepend() { 66do_configure_prepend() {
71 sed 's:AM_CHECK_PYMOD:echo "no pymod" #AM_CHECK_PYMOD:g' -i ${S}/configure.ac 67 sed 's:AM_CHECK_PYMOD:echo "no pymod" #AM_CHECK_PYMOD:g' -i ${S}/configure.ac
72 68
@@ -111,7 +107,6 @@ FILES_avahi-utils = "${bindir}/avahi-*"
111 107
112RDEPENDS_${PN}-dev = "avahi-daemon (= ${EXTENDPKGV}) libavahi-core (= ${EXTENDPKGV}) libavahi-client (= ${EXTENDPKGV})" 108RDEPENDS_${PN}-dev = "avahi-daemon (= ${EXTENDPKGV}) libavahi-core (= ${EXTENDPKGV}) libavahi-client (= ${EXTENDPKGV})"
113 109
114# uclibc has no nss
115RRECOMMENDS_avahi-daemon_append_libc-glibc = " libnss-mdns" 110RRECOMMENDS_avahi-daemon_append_libc-glibc = " libnss-mdns"
116RRECOMMENDS_${PN}_append_libc-glibc = " libnss-mdns" 111RRECOMMENDS_${PN}_append_libc-glibc = " libnss-mdns"
117 112
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 = "\
6" 6"
7SRC_URI[md5sum] = "fad0630fce6a9aecdb7db37bc1f1db7d" 7SRC_URI[md5sum] = "fad0630fce6a9aecdb7db37bc1f1db7d"
8SRC_URI[sha256sum] = "5d7ba8f481a7715d013a79f8d6477eb89d8aaae399395d5d008a1317c34a31d5" 8SRC_URI[sha256sum] = "5d7ba8f481a7715d013a79f8d6477eb89d8aaae399395d5d008a1317c34a31d5"
9
10CFLAGS_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"
69# We don't want to depend on libblockfile 69# We don't want to depend on libblockfile
70CACHED_CONFIGUREVARS += "ac_cv_header_maillock_h=no" 70CACHED_CONFIGUREVARS += "ac_cv_header_maillock_h=no"
71 71
72# This is a workaround for uclibc because including stdio.h
73# pulls in pthreads.h and causes conflicts in function prototypes.
74# This results in compilation failure, so unless this is fixed,
75# disable pam for uclibc.
76EXTRA_OECONF_append_libc-uclibc=" --without-pam"
77
78do_configure_prepend () { 72do_configure_prepend () {
79 export LD="${CC}" 73 export LD="${CC}"
80 install -m 0644 ${WORKDIR}/sshd_config ${B}/ 74 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):
71 busybox_cfg(bb.utils.contains('DISTRO_FEATURES', 'bluetooth', True, False, d), 'CONFIG_RFKILL', cnf, rem) 71 busybox_cfg(bb.utils.contains('DISTRO_FEATURES', 'bluetooth', True, False, d), 'CONFIG_RFKILL', cnf, rem)
72 return "\n".join(cnf), "\n".join(rem) 72 return "\n".join(cnf), "\n".join(rem)
73 73
74# X, Y = ${@features_to_uclibc_settings(d)} 74# X, Y = ${@features_to_busybox_settings(d)}
75# unfortunately doesn't seem to work with bitbake, workaround: 75# unfortunately doesn't seem to work with bitbake, workaround:
76def features_to_busybox_conf(d): 76def features_to_busybox_conf(d):
77 cnf, rem = features_to_busybox_settings(d) 77 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
24 24
25PACKAGECONFIG[msgcat-curses] = "--with-libncurses-prefix=${STAGING_LIBDIR}/..,--disable-curses,ncurses," 25PACKAGECONFIG[msgcat-curses] = "--with-libncurses-prefix=${STAGING_LIBDIR}/..,--disable-curses,ncurses,"
26 26
27LDFLAGS_prepend_libc-uclibc = " -lrt -lpthread "
28
29inherit autotools texinfo 27inherit autotools texinfo
30 28
31EXTRA_OECONF += "--without-lispdir \ 29EXTRA_OECONF += "--without-lispdir \
@@ -86,15 +84,9 @@ FILES_gettext-runtime = "${bindir}/gettext \
86 ${libdir}/libasprintf.so* \ 84 ${libdir}/libasprintf.so* \
87 ${libdir}/GNU.Gettext.dll \ 85 ${libdir}/GNU.Gettext.dll \
88 " 86 "
89FILES_gettext-runtime_append_libc-uclibc = " ${libdir}/libintl.so.* \
90 ${libdir}/charset.alias \
91 "
92FILES_gettext-runtime-dev += "${libdir}/libasprintf.a \ 87FILES_gettext-runtime-dev += "${libdir}/libasprintf.a \
93 ${includedir}/autosprintf.h \ 88 ${includedir}/autosprintf.h \
94 " 89 "
95FILES_gettext-runtime-dev_append_libc-uclibc = " ${libdir}/libintl.so \
96 ${includedir}/libintl.h \
97 "
98FILES_gettext-runtime-doc = "${mandir}/man1/gettext.* \ 90FILES_gettext-runtime-doc = "${mandir}/man1/gettext.* \
99 ${mandir}/man1/ngettext.* \ 91 ${mandir}/man1/ngettext.* \
100 ${mandir}/man1/envsubst.* \ 92 ${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"
43PRINTF_mingw32 = "--enable-included-printf=yes" 43PRINTF_mingw32 = "--enable-included-printf=yes"
44EXTRA_OECONF = "${PRINTF} ${CORECONF}" 44EXTRA_OECONF = "${PRINTF} ${CORECONF}"
45EXTRA_OECONF_class-native = "${CORECONF} --disable-selinux" 45EXTRA_OECONF_class-native = "${CORECONF} --disable-selinux"
46EXTRA_OECONF_append_libc-uclibc = " --with-libiconv=gnu"
47 46
48# Tell configure that we'll have dbus-daemon on the target for the tests 47# Tell configure that we'll have dbus-daemon on the target for the tests
49EXTRA_OECONF_class-target_append = " ${@bb.utils.contains('PTEST_ENABLED', '1', ' ac_cv_prog_DBUS_DAEMON=dbus-daemon', '', d)}" 48EXTRA_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"
18do_install[depends] += "virtual/${MLPREFIX}libc:do_stash_locale" 18do_install[depends] += "virtual/${MLPREFIX}libc:do_stash_locale"
19 19
20COMPATIBLE_HOST_libc-musl_class-target = "null" 20COMPATIBLE_HOST_libc-musl_class-target = "null"
21COMPATIBLE_HOST_libc-uclibc_class-target = "null"
22 21
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 @@
1#
2# For now, we will skip building of a gcc package if it is a uclibc one
3# and our build is not a uclibc one, and we skip a glibc one if our build
4# is a uclibc build.
5#
6# See the note in gcc/gcc_3.4.0.oe
7#
8
9python __anonymous () {
10 import bb, re
11 uc_os = (re.match('.*uclibc*', d.getVar('TARGET_OS')) != None)
12 if uc_os:
13 raise bb.parse.SkipPackage("incompatible with target %s" %
14 d.getVar('TARGET_OS'))
15}
16
17INHIBIT_SYSROOT_STRIP = "1" 1INHIBIT_SYSROOT_STRIP = "1"
18 2
19PACKAGES = "${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" 3PACKAGES = "${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 = ""
67# this helps in easing out parsing for non-glibc system libraries 67# this helps in easing out parsing for non-glibc system libraries
68# 68#
69COMPATIBLE_HOST_libc-musl_class-target = "null" 69COMPATIBLE_HOST_libc-musl_class-target = "null"
70COMPATIBLE_HOST_libc-uclibc_class-target = "null"
71 70
72EXTRA_OECONF = "--enable-kernel=${OLDEST_KERNEL} \ 71EXTRA_OECONF = "--enable-kernel=${OLDEST_KERNEL} \
73 --without-cvs --disable-profile \ 72 --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 = ""
33SANITIZERS_powerpc64 = "" 33SANITIZERS_powerpc64 = ""
34SANITIZERS_sparc = "" 34SANITIZERS_sparc = ""
35SANITIZERS_libc-musl = "" 35SANITIZERS_libc-musl = ""
36SANITIZERS_libc-uclibc = ""
37 36
38RRECOMMENDS_packagegroup-core-sdk = "\ 37RRECOMMENDS_packagegroup-core-sdk = "\
39 libgomp \ 38 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 = "\
31PERF = "perf" 31PERF = "perf"
32PERF_libc-musl = "" 32PERF_libc-musl = ""
33 33
34# systemtap needs elfutils which is not fully buildable on uclibc 34# systemtap needs elfutils which is not fully buildable on some arches/libcs
35# hence we exclude it from uclibc based builds
36SYSTEMTAP = "systemtap" 35SYSTEMTAP = "systemtap"
37SYSTEMTAP_libc-uclibc = ""
38SYSTEMTAP_libc-musl = "" 36SYSTEMTAP_libc-musl = ""
39SYSTEMTAP_mipsarch = "" 37SYSTEMTAP_mipsarch = ""
40SYSTEMTAP_nios2 = "" 38SYSTEMTAP_nios2 = ""
41SYSTEMTAP_aarch64 = "" 39SYSTEMTAP_aarch64 = ""
42 40
43# lttng-ust uses sched_getcpu() which is not there on uclibc 41# lttng-ust uses sched_getcpu() which is not there on for some platforms.
44# for some of the architectures it can be patched to call the
45# syscall directly but for x86_64 __NR_getcpu is a vsyscall
46# which means we can not use syscall() to call it. So we ignore
47# it for x86_64/uclibc
48
49LTTNGUST = "lttng-ust" 42LTTNGUST = "lttng-ust"
50LTTNGUST_libc-uclibc = ""
51LTTNGUST_libc-musl = "" 43LTTNGUST_libc-musl = ""
52 44
53LTTNGTOOLS = "lttng-tools" 45LTTNGTOOLS = "lttng-tools"
@@ -60,7 +52,6 @@ BABELTRACE = "babeltrace"
60# valgrind does not work on the following configurations/architectures 52# valgrind does not work on the following configurations/architectures
61 53
62VALGRIND = "valgrind" 54VALGRIND = "valgrind"
63VALGRIND_libc-uclibc = ""
64VALGRIND_libc-musl = "" 55VALGRIND_libc-musl = ""
65VALGRIND_mipsarch = "" 56VALGRIND_mipsarch = ""
66VALGRIND_nios2 = "" 57VALGRIND_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"
19SRC_URI = "git://github.com/systemd/systemd.git;protocol=git" 19SRC_URI = "git://github.com/systemd/systemd.git;protocol=git"
20 20
21S = "${WORKDIR}/git" 21S = "${WORKDIR}/git"
22
23LDFLAGS_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 += " \
35 file://0020-back-port-233-don-t-use-the-unified-hierarchy-for-the-systemd.patch \ 35 file://0020-back-port-233-don-t-use-the-unified-hierarchy-for-the-systemd.patch \
36 file://0021-build-sys-check-for-lz4-in-the-old-and-new-numbering.patch \ 36 file://0021-build-sys-check-for-lz4-in-the-old-and-new-numbering.patch \
37" 37"
38SRC_URI_append_libc-uclibc = "\
39 file://0002-units-Prefer-getty-to-agetty-in-console-setup-system.patch \
40"
41SRC_URI_append_qemuall = " file://0001-core-device.c-Change-the-default-device-timeout-to-2.patch" 38SRC_URI_append_qemuall = " file://0001-core-device.c-Change-the-default-device-timeout-to-2.patch"
42 39
43PACKAGECONFIG ??= "xz \ 40PACKAGECONFIG ??= "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
48 48
49EXTRA_OECONF = "--program-prefix=eu- --without-lzma" 49EXTRA_OECONF = "--program-prefix=eu- --without-lzma"
50EXTRA_OECONF_append_class-native = " --without-bzlib" 50EXTRA_OECONF_append_class-native = " --without-bzlib"
51EXTRA_OECONF_append_libc-uclibc = " --enable-uclibc"
52 51
53do_install_append() { 52do_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
63EXTRA_OEMAKE_libc-uclibc = "-C libelf"
64EXTRA_OEMAKE_class-native = "" 58EXTRA_OEMAKE_class-native = ""
65EXTRA_OEMAKE_class-nativesdk = "" 59EXTRA_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
6LTTNGUST = "lttng-ust" 6LTTNGUST = "lttng-ust"
7LTTNGUST_aarch64 = "" 7LTTNGUST_aarch64 = ""
8LTTNGUST_libc-uclibc = ""
9LTTNGUST_mipsarch = "" 8LTTNGUST_mipsarch = ""
10LTTNGUST_sh4 = "" 9LTTNGUST_sh4 = ""
11LTTNGUST_libc-musl = "" 10LTTNGUST_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 @@
1Upstream-Status: Pending
2
3Patch courtesy gentoo-portage/sys-devel/gnuconfig/files/automake-1.8.5-config-guess-uclibc.patch.
4
5updated to 20050516 by Marcin 'Hrw' Juszkiewicz (by hand)
6updated to 20080123 by Nitin A Kamble (by hand)
7updated to 20111001 by Saul Wold (by hand)
8updated to 20120818 by Marcin 'Hrw' Juszkiewicz (by hand)
9
10Signed-off-by: Saul Wold <sgw@linux.intel.com>
11Signed-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 @@
1Upstream-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
12SRC_URI = "http://downloads.yoctoproject.org/releases/gnu-config/gnu-config-${PV}.tar.bz2 \ 12SRC_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,
6inherit autotools texinfo 6inherit autotools texinfo
7 7
8EXTRA_OEMAKE += "'infodir=${infodir}'" 8EXTRA_OEMAKE += "'infodir=${infodir}'"
9LDFLAGS_prepend_libc-uclibc = " -lrt "
10SRC_URI = "${GNU_MIRROR}/m4/m4-${PV}.tar.gz" 9SRC_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
40EXTRA_OECONF = "--without-x" 40EXTRA_OECONF = "--without-x"
41 41
42LDFLAGS_append_libc-uclibc = " -liconv "
43
44BBCLASSEXTEND = "native nativesdk" 42BBCLASSEXTEND = "native nativesdk"
45 43
46PACKAGECONFIG ??= "" 44PACKAGECONFIG ??= ""
diff --git a/meta/recipes-extended/diffutils/diffutils.inc b/meta/recipes-extended/diffutils/diffutils.inc
index 243341aa9c..c81348b3da 100644
--- a/meta/recipes-extended/diffutils/diffutils.inc
+++ b/meta/recipes-extended/diffutils/diffutils.inc
@@ -6,13 +6,6 @@ SECTION = "base"
6 6
7inherit autotools texinfo update-alternatives gettext 7inherit autotools texinfo update-alternatives gettext
8 8
9# diffutils assumes non-glibc compilation with uclibc and
10# this causes it to generate its own implementations of
11# standard functionality. regex.c actually breaks compilation
12# because it uses __mempcpy, there are other things (TBD:
13# see diffutils.mk in buildroot)
14EXTRA_OECONF_libc-uclibc = "--without-included-regex"
15
16ALTERNATIVE_${PN} = "diff cmp" 9ALTERNATIVE_${PN} = "diff cmp"
17ALTERNATIVE_PRIORITY = "100" 10ALTERNATIVE_PRIORITY = "100"
18 11
diff --git a/meta/recipes-extended/findutils/findutils.inc b/meta/recipes-extended/findutils/findutils.inc
index bfedf874be..ad3642923c 100644
--- a/meta/recipes-extended/findutils/findutils.inc
+++ b/meta/recipes-extended/findutils/findutils.inc
@@ -13,11 +13,4 @@ inherit autotools gettext texinfo update-alternatives upstream-version-is-even
13ALTERNATIVE_${PN} = "find xargs" 13ALTERNATIVE_${PN} = "find xargs"
14ALTERNATIVE_PRIORITY = "100" 14ALTERNATIVE_PRIORITY = "100"
15 15
16# diffutils assumes non-glibc compilation with uclibc and
17# this causes it to generate its own implementations of
18# standard functionality. regex.c actually breaks compilation
19# because it uses __mempcpy, there are other things (TBD:
20# see diffutils.mk in buildroot)
21EXTRA_OECONF_libc-uclibc = "--without-included-regex"
22
23BBCLASSEXTEND = "native nativesdk" 16BBCLASSEXTEND = "native nativesdk"
diff --git a/meta/recipes-extended/libtirpc/libtirpc_1.0.1.bb b/meta/recipes-extended/libtirpc/libtirpc_1.0.1.bb
index f41d2f3e3d..7be8e1062c 100644
--- a/meta/recipes-extended/libtirpc/libtirpc_1.0.1.bb
+++ b/meta/recipes-extended/libtirpc/libtirpc_1.0.1.bb
@@ -19,9 +19,6 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BP}.tar.bz2;name=libtirpc \
19 file://0001-Fix-for-CVE-2017-8779.patch \ 19 file://0001-Fix-for-CVE-2017-8779.patch \
20 " 20 "
21 21
22SRC_URI_append_libc-uclibc = " file://remove-des-functionality.patch \
23 "
24
25SRC_URI_append_libc-musl = " \ 22SRC_URI_append_libc-musl = " \
26 file://Use-netbsd-queue.h.patch \ 23 file://Use-netbsd-queue.h.patch \
27 " 24 "
diff --git a/meta/recipes-extended/net-tools/net-tools_1.60-26.bb b/meta/recipes-extended/net-tools/net-tools_1.60-26.bb
index 45d7bf4524..c23d53376a 100644
--- a/meta/recipes-extended/net-tools/net-tools_1.60-26.bb
+++ b/meta/recipes-extended/net-tools/net-tools_1.60-26.bb
@@ -39,8 +39,6 @@ inherit gettext
39 39
40do_patch[depends] = "quilt-native:do_populate_sysroot" 40do_patch[depends] = "quilt-native:do_populate_sysroot"
41 41
42LDFLAGS_append_libc-uclibc = " -lintl "
43
44# The Makefile is lame, no parallel build 42# The Makefile is lame, no parallel build
45PARALLEL_MAKE = "" 43PARALLEL_MAKE = ""
46 44
diff --git a/meta/recipes-extended/pam/libpam/use-utmpx.patch b/meta/recipes-extended/pam/libpam/use-utmpx.patch
deleted file mode 100644
index dd04bbb844..0000000000
--- a/meta/recipes-extended/pam/libpam/use-utmpx.patch
+++ /dev/null
@@ -1,233 +0,0 @@
1utmp() may not be configured in and use posix compliant utmpx always
2UTMP is SVID legacy, UTMPX is mandated by POSIX
3
4Upstream-Status: Pending
5Signed-off-by: Khem Raj <raj.khem@gmail.com>
6Index: Linux-PAM-1.2.1/libpam/pam_modutil_getlogin.c
7===================================================================
8--- Linux-PAM-1.2.1.orig/libpam/pam_modutil_getlogin.c
9+++ Linux-PAM-1.2.1/libpam/pam_modutil_getlogin.c
10@@ -10,8 +10,7 @@
11
12 #include <stdlib.h>
13 #include <unistd.h>
14-#include <utmp.h>
15-
16+#include <utmpx.h>
17 #define _PAMMODUTIL_GETLOGIN "_pammodutil_getlogin"
18
19 const char *
20@@ -22,7 +21,7 @@ pam_modutil_getlogin(pam_handle_t *pamh)
21 const void *void_curr_tty;
22 const char *curr_tty;
23 char *curr_user;
24- struct utmp *ut, line;
25+ struct utmpx *ut, line;
26
27 status = pam_get_data(pamh, _PAMMODUTIL_GETLOGIN, &logname);
28 if (status == PAM_SUCCESS) {
29@@ -48,10 +47,10 @@ pam_modutil_getlogin(pam_handle_t *pamh)
30 }
31 logname = NULL;
32
33- setutent();
34+ setutxent();
35 strncpy(line.ut_line, curr_tty, sizeof(line.ut_line));
36
37- if ((ut = getutline(&line)) == NULL) {
38+ if ((ut = getutxline(&line)) == NULL) {
39 goto clean_up_and_go_home;
40 }
41
42@@ -74,7 +73,7 @@ pam_modutil_getlogin(pam_handle_t *pamh)
43
44 clean_up_and_go_home:
45
46- endutent();
47+ endutxent();
48
49 return logname;
50 }
51Index: Linux-PAM-1.2.1/modules/pam_issue/pam_issue.c
52===================================================================
53--- Linux-PAM-1.2.1.orig/modules/pam_issue/pam_issue.c
54+++ Linux-PAM-1.2.1/modules/pam_issue/pam_issue.c
55@@ -25,7 +25,7 @@
56 #include <string.h>
57 #include <unistd.h>
58 #include <sys/utsname.h>
59-#include <utmp.h>
60+#include <utmpx.h>
61 #include <time.h>
62 #include <syslog.h>
63
64@@ -246,13 +246,13 @@ read_issue_quoted(pam_handle_t *pamh, FI
65 case 'U':
66 {
67 unsigned int users = 0;
68- struct utmp *ut;
69- setutent();
70- while ((ut = getutent())) {
71+ struct utmpx *ut;
72+ setutxent();
73+ while ((ut = getutxent())) {
74 if (ut->ut_type == USER_PROCESS)
75 ++users;
76 }
77- endutent();
78+ endutxent();
79 if (c == 'U')
80 snprintf (buf, sizeof buf, "%u %s", users,
81 (users == 1) ? "user" : "users");
82Index: Linux-PAM-1.2.1/modules/pam_lastlog/pam_lastlog.c
83===================================================================
84--- Linux-PAM-1.2.1.orig/modules/pam_lastlog/pam_lastlog.c
85+++ Linux-PAM-1.2.1/modules/pam_lastlog/pam_lastlog.c
86@@ -15,8 +15,9 @@
87 #include <errno.h>
88 #ifdef HAVE_UTMP_H
89 # include <utmp.h>
90-#else
91-# include <lastlog.h>
92+#endif
93+#ifdef HAVE_UTMPX_H
94+# include <utmpx.h>
95 #endif
96 #include <pwd.h>
97 #include <stdlib.h>
98@@ -27,6 +28,12 @@
99 #include <syslog.h>
100 #include <unistd.h>
101
102+#ifndef HAVE_UTMP_H
103+#define UT_LINESIZE 32
104+#define UT_HOSTSIZE 32
105+#define UT_NAMESIZE 256
106+#endif
107+
108 #if defined(hpux) || defined(sunos) || defined(solaris)
109 # ifndef _PATH_LASTLOG
110 # define _PATH_LASTLOG "/usr/adm/lastlog"
111@@ -38,7 +45,7 @@
112 # define UT_LINESIZE 12
113 # endif /* UT_LINESIZE */
114 #endif
115-#if defined(hpux)
116+#if defined(hpux) || !defined HAVE_UTMP_H
117 struct lastlog {
118 time_t ll_time;
119 char ll_line[UT_LINESIZE];
120@@ -447,8 +454,8 @@ last_login_failed(pam_handle_t *pamh, in
121 {
122 int retval;
123 int fd;
124- struct utmp ut;
125- struct utmp utuser;
126+ struct utmpx ut;
127+ struct utmpx utuser;
128 int failed = 0;
129 char the_time[256];
130 char *date = NULL;
131Index: Linux-PAM-1.2.1/modules/pam_limits/pam_limits.c
132===================================================================
133--- Linux-PAM-1.2.1.orig/modules/pam_limits/pam_limits.c
134+++ Linux-PAM-1.2.1/modules/pam_limits/pam_limits.c
135@@ -33,7 +33,7 @@
136 #include <sys/resource.h>
137 #include <limits.h>
138 #include <glob.h>
139-#include <utmp.h>
140+#include <utmpx.h>
141 #ifndef UT_USER /* some systems have ut_name instead of ut_user */
142 #define UT_USER ut_user
143 #endif
144@@ -227,7 +227,7 @@ static int
145 check_logins (pam_handle_t *pamh, const char *name, int limit, int ctrl,
146 struct pam_limit_s *pl)
147 {
148- struct utmp *ut;
149+ struct utmpx *ut;
150 int count;
151
152 if (ctrl & PAM_DEBUG_ARG) {
153@@ -242,7 +242,7 @@ check_logins (pam_handle_t *pamh, const
154 return LOGIN_ERR;
155 }
156
157- setutent();
158+ setutxent();
159
160 /* Because there is no definition about when an application
161 actually adds a utmp entry, some applications bizarrely do the
162@@ -260,7 +260,7 @@ check_logins (pam_handle_t *pamh, const
163 count = 1;
164 }
165
166- while((ut = getutent())) {
167+ while((ut = getutxent())) {
168 #ifdef USER_PROCESS
169 if (ut->ut_type != USER_PROCESS) {
170 continue;
171@@ -296,7 +296,7 @@ check_logins (pam_handle_t *pamh, const
172 break;
173 }
174 }
175- endutent();
176+ endutxent();
177 if (count > limit) {
178 if (name) {
179 pam_syslog(pamh, LOG_WARNING,
180Index: Linux-PAM-1.2.1/modules/pam_timestamp/pam_timestamp.c
181===================================================================
182--- Linux-PAM-1.2.1.orig/modules/pam_timestamp/pam_timestamp.c
183+++ Linux-PAM-1.2.1/modules/pam_timestamp/pam_timestamp.c
184@@ -56,7 +56,7 @@
185 #include <time.h>
186 #include <sys/time.h>
187 #include <unistd.h>
188-#include <utmp.h>
189+#include <utmpx.h>
190 #include <syslog.h>
191 #include <paths.h>
192 #include "hmacsha1.h"
193@@ -197,15 +197,15 @@ timestamp_good(time_t then, time_t now,
194 static int
195 check_login_time(const char *ruser, time_t timestamp)
196 {
197- struct utmp utbuf, *ut;
198+ struct utmpx utbuf, *ut;
199 time_t oldest_login = 0;
200
201- setutent();
202+ setutxent();
203 while(
204 #ifdef HAVE_GETUTENT_R
205- !getutent_r(&utbuf, &ut)
206+ !getutxent_r(&utbuf, &ut)
207 #else
208- (ut = getutent()) != NULL
209+ (ut = getutxent()) != NULL
210 #endif
211 ) {
212 if (ut->ut_type != USER_PROCESS) {
213@@ -218,7 +218,7 @@ check_login_time(const char *ruser, time
214 oldest_login = ut->ut_tv.tv_sec;
215 }
216 }
217- endutent();
218+ endutxent();
219 if(oldest_login == 0 || timestamp < oldest_login) {
220 return PAM_AUTH_ERR;
221 }
222Index: Linux-PAM-1.2.1/modules/pam_unix/support.c
223===================================================================
224--- Linux-PAM-1.2.1.orig/modules/pam_unix/support.c
225+++ Linux-PAM-1.2.1/modules/pam_unix/support.c
226@@ -13,7 +13,6 @@
227 #include <pwd.h>
228 #include <shadow.h>
229 #include <limits.h>
230-#include <utmp.h>
231 #include <errno.h>
232 #include <signal.h>
233 #include <ctype.h>
diff --git a/meta/recipes-extended/pam/libpam_1.3.0.bb b/meta/recipes-extended/pam/libpam_1.3.0.bb
index df56d27627..8f7753d001 100644
--- a/meta/recipes-extended/pam/libpam_1.3.0.bb
+++ b/meta/recipes-extended/pam/libpam_1.3.0.bb
@@ -28,8 +28,6 @@ SRC_URI = "http://linux-pam.org/library/Linux-PAM-${PV}.tar.bz2 \
28SRC_URI[md5sum] = "da4b2289b7cfb19583d54e9eaaef1c3a" 28SRC_URI[md5sum] = "da4b2289b7cfb19583d54e9eaaef1c3a"
29SRC_URI[sha256sum] = "241aed1ef522f66ed672719ecf2205ec513fd0075ed80cda8e086a5b1a01d1bb" 29SRC_URI[sha256sum] = "241aed1ef522f66ed672719ecf2205ec513fd0075ed80cda8e086a5b1a01d1bb"
30 30
31SRC_URI_append_libc-uclibc = " file://use-utmpx.patch"
32
33SRC_URI_append_libc-musl = " file://0001-Add-support-for-defining-missing-funcitonality.patch \ 31SRC_URI_append_libc-musl = " file://0001-Add-support-for-defining-missing-funcitonality.patch \
34 file://include_paths_header.patch \ 32 file://include_paths_header.patch \
35 " 33 "
diff --git a/meta/recipes-extended/parted/parted_3.2.bb b/meta/recipes-extended/parted/parted_3.2.bb
index 73548b7792..2bfdfb5f8f 100644
--- a/meta/recipes-extended/parted/parted_3.2.bb
+++ b/meta/recipes-extended/parted/parted_3.2.bb
@@ -24,7 +24,6 @@ SRC_URI[md5sum] = "0247b6a7b314f8edeb618159fa95f9cb"
24SRC_URI[sha256sum] = "858b589c22297cacdf437f3baff6f04b333087521ab274f7ab677cb8c6bb78e4" 24SRC_URI[sha256sum] = "858b589c22297cacdf437f3baff6f04b333087521ab274f7ab677cb8c6bb78e4"
25 25
26EXTRA_OECONF = "--disable-device-mapper" 26EXTRA_OECONF = "--disable-device-mapper"
27LDFLAGS_append_libc-uclibc = " -liconv "
28 27
29inherit autotools pkgconfig gettext texinfo ptest 28inherit autotools pkgconfig gettext texinfo ptest
30 29
diff --git a/meta/recipes-extended/shadow/shadow.inc b/meta/recipes-extended/shadow/shadow.inc
index 70ff68ee87..5e6b0bd970 100644
--- a/meta/recipes-extended/shadow/shadow.inc
+++ b/meta/recipes-extended/shadow/shadow.inc
@@ -59,7 +59,6 @@ EXTRA_OECONF += "--without-audit \
59NSCDOPT = "" 59NSCDOPT = ""
60NSCDOPT_class-native = "--without-nscd" 60NSCDOPT_class-native = "--without-nscd"
61NSCDOPT_class-nativesdk = "--without-nscd" 61NSCDOPT_class-nativesdk = "--without-nscd"
62NSCDOPT_libc-uclibc = " --without-nscd"
63NSCDOPT_libc-glibc = "${@bb.utils.contains('DISTRO_FEATURES', 'libc-spawn', '--with-nscd', '--without-nscd', d)}" 62NSCDOPT_libc-glibc = "${@bb.utils.contains('DISTRO_FEATURES', 'libc-spawn', '--with-nscd', '--without-nscd', d)}"
64 63
65PAM_PLUGINS = "libpam-runtime \ 64PAM_PLUGINS = "libpam-runtime \
diff --git a/meta/recipes-extended/sysstat/sysstat.inc b/meta/recipes-extended/sysstat/sysstat.inc
index bb5629db4c..18b0861bf9 100644
--- a/meta/recipes-extended/sysstat/sysstat.inc
+++ b/meta/recipes-extended/sysstat/sysstat.inc
@@ -55,4 +55,3 @@ pkg_postinst_${PN} () {
55FILES_${PN} += "${libdir}/sa" 55FILES_${PN} += "${libdir}/sa"
56 56
57TARGET_CC_ARCH += "${LDFLAGS}" 57TARGET_CC_ARCH += "${LDFLAGS}"
58LDFLAGS_append_libc-uclibc = " -lintl"
diff --git a/meta/recipes-extended/tcp-wrappers/tcp-wrappers_7.6.bb b/meta/recipes-extended/tcp-wrappers/tcp-wrappers_7.6.bb
index 5fdbbced72..54587dc2ca 100644
--- a/meta/recipes-extended/tcp-wrappers/tcp-wrappers_7.6.bb
+++ b/meta/recipes-extended/tcp-wrappers/tcp-wrappers_7.6.bb
@@ -73,7 +73,6 @@ EXTRA_OEMAKE = "'CC=${CC}' \
73 'EXTRA_CFLAGS=${CFLAGS} -DSYS_ERRLIST_DEFINED -DHAVE_STRERROR -DHAVE_WEAKSYMS -D_REENTRANT -DINET6=1 -Dss_family=__ss_family -Dss_len=__ss_len'" 73 'EXTRA_CFLAGS=${CFLAGS} -DSYS_ERRLIST_DEFINED -DHAVE_STRERROR -DHAVE_WEAKSYMS -D_REENTRANT -DINET6=1 -Dss_family=__ss_family -Dss_len=__ss_len'"
74 74
75EXTRA_OEMAKE_NETGROUP = "-DNETGROUP -DUSE_GETDOMAIN" 75EXTRA_OEMAKE_NETGROUP = "-DNETGROUP -DUSE_GETDOMAIN"
76EXTRA_OEMAKE_NETGROUP_libc-uclibc = "-DUSE_GETDOMAIN"
77EXTRA_OEMAKE_NETGROUP_libc-musl = "-DUSE_GETDOMAIN" 76EXTRA_OEMAKE_NETGROUP_libc-musl = "-DUSE_GETDOMAIN"
78 77
79EXTRA_OEMAKE_append_libc-musl = " 'LIBS='" 78EXTRA_OEMAKE_append_libc-musl = " 'LIBS='"
diff --git a/meta/recipes-gnome/gnome/gconf_3.2.6.bb b/meta/recipes-gnome/gnome/gconf_3.2.6.bb
index 9e9f714282..f4405fe0e1 100644
--- a/meta/recipes-gnome/gnome/gconf_3.2.6.bb
+++ b/meta/recipes-gnome/gnome/gconf_3.2.6.bb
@@ -22,9 +22,8 @@ EXTRA_OECONF = "--enable-shared --disable-static \
22 22
23# Disable PolicyKit by default 23# Disable PolicyKit by default
24PACKAGECONFIG ??= "" 24PACKAGECONFIG ??= ""
25# We really don't want PolicyKit for native or uclibc 25# We really don't want PolicyKit for native
26PACKAGECONFIG_class-native = "" 26PACKAGECONFIG_class-native = ""
27PACKAGECONFIG_libc-uclibc = ""
28 27
29PACKAGECONFIG[policykit] = "--enable-defaults-service,--disable-defaults-service,polkit" 28PACKAGECONFIG[policykit] = "--enable-defaults-service,--disable-defaults-service,polkit"
30PACKAGECONFIG[debug] = "--enable-debug=yes, --enable-debug=minimum" 29PACKAGECONFIG[debug] = "--enable-debug=yes, --enable-debug=minimum"
diff --git a/meta/recipes-multimedia/alsa/alsa-lib_1.1.4.1.bb b/meta/recipes-multimedia/alsa/alsa-lib_1.1.4.1.bb
index 947f7d69e1..acdeae13f3 100644
--- a/meta/recipes-multimedia/alsa/alsa-lib_1.1.4.1.bb
+++ b/meta/recipes-multimedia/alsa/alsa-lib_1.1.4.1.bb
@@ -22,8 +22,6 @@ EXTRA_OECONF += "${@get_alsa_fpu_setting(bb, d)} "
22 22
23EXTRA_OECONF += "--disable-python" 23EXTRA_OECONF += "--disable-python"
24 24
25EXTRA_OECONF_append_libc-uclibc = " --with-versioned=no "
26
27PACKAGES =+ "alsa-server libasound alsa-conf alsa-doc" 25PACKAGES =+ "alsa-server libasound alsa-conf alsa-doc"
28FILES_libasound = "${libdir}/libasound.so.*" 26FILES_libasound = "${libdir}/libasound.so.*"
29FILES_alsa-server = "${bindir}/*" 27FILES_alsa-server = "${bindir}/*"
diff --git a/meta/recipes-multimedia/alsa/alsa-utils_1.1.4.bb b/meta/recipes-multimedia/alsa/alsa-utils_1.1.4.bb
index c749f32120..54be50ed82 100644
--- a/meta/recipes-multimedia/alsa/alsa-utils_1.1.4.bb
+++ b/meta/recipes-multimedia/alsa/alsa-utils_1.1.4.bb
@@ -32,12 +32,6 @@ SRC_URI[sha256sum] = "a7831044de92c5bf33bf3365a3f36e49397f4191e934df460ae1ca1513
32# Avoid this by disabling expicitly 32# Avoid this by disabling expicitly
33EXTRA_OECONF = "--disable-rst2man" 33EXTRA_OECONF = "--disable-rst2man"
34 34
35# lazy hack. needs proper fixing in gettext.m4, see
36# http://bugs.openembedded.org/show_bug.cgi?id=2348
37# please close bug and remove this comment when properly fixed
38#
39EXTRA_OECONF_append_libc-uclibc = " --disable-nls"
40
41inherit autotools gettext pkgconfig manpages 35inherit autotools gettext pkgconfig manpages
42 36
43# This are all packages that we need to make. Also, the now empty alsa-utils 37# This are all packages that we need to make. Also, the now empty alsa-utils
diff --git a/meta/recipes-sato/packagegroups/packagegroup-core-x11-sato.bb b/meta/recipes-sato/packagegroups/packagegroup-core-x11-sato.bb
index 6fb1b678fe..97cced7cc3 100644
--- a/meta/recipes-sato/packagegroups/packagegroup-core-x11-sato.bb
+++ b/meta/recipes-sato/packagegroups/packagegroup-core-x11-sato.bb
@@ -19,7 +19,6 @@ RDEPENDS_${PN} = "\
19 " 19 "
20 20
21NETWORK_MANAGER ?= "connman-gnome" 21NETWORK_MANAGER ?= "connman-gnome"
22NETWORK_MANAGER_libc-uclibc = ""
23 22
24SUMMARY_${PN}-base = "Sato desktop - base packages" 23SUMMARY_${PN}-base = "Sato desktop - base packages"
25RDEPENDS_${PN}-base = "\ 24RDEPENDS_${PN}-base = "\
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}"
47FILES_lib${BPN} = "${base_libdir}/lib*${SOLIBS}" 47FILES_lib${BPN} = "${base_libdir}/lib*${SOLIBS}"
48 48
49BBCLASSEXTEND = "native" 49BBCLASSEXTEND = "native"
50# Only append ldflags for target recipe and if USE_NLS is enabled
51LDFLAGS_append_libc-uclibc_class-target = "${@['', ' -lintl '][(d.getVar('USE_NLS') == 'yes')]}"
52EXTRA_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
48LDFLAGS_append_libc-musl = " -largp" 48LDFLAGS_append_libc-musl = " -largp"
49LDFLAGS_append_libc-uclibc = " -luargp -pthread"
50 49
51do_configure_prepend() { 50do_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"
13SPDX_S = "${WORKDIR}/icu" 13SPDX_S = "${WORKDIR}/icu"
14STAGING_ICU_DIR_NATIVE = "${STAGING_DATADIR_NATIVE}/${BPN}/${PV}" 14STAGING_ICU_DIR_NATIVE = "${STAGING_DATADIR_NATIVE}/${BPN}/${PV}"
15 15
16CPPFLAGS_append_libc-uclibc = " -DU_TIMEZONE=0"
17
18BINCONFIG = "${bindir}/icu-config" 16BINCONFIG = "${bindir}/icu-config"
19 17
20inherit autotools pkgconfig binconfig 18inherit 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"
15SRC_URI[sha256sum] = "1bce32e6a6c967fef6d37adaadf33df19878d69673f9ef9d3f2470e0c6ed4006" 15SRC_URI[sha256sum] = "1bce32e6a6c967fef6d37adaadf33df19878d69673f9ef9d3f2470e0c6ed4006"
16 16
17S = "${WORKDIR}/userspace-rcu-${PV}" 17S = "${WORKDIR}/userspace-rcu-${PV}"
18CFLAGS_append_libc-uclibc = " -D_GNU_SOURCE"
19inherit autotools 18inherit 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 @@
1In case of uclibc, use libuargp
2
3If we use uclibc for system libraries, select libuargp
4
5Upstream-Status: Pending
6
7Signed-off-by: Maxin B. John <maxin.john@intel.com>
8---
9diff -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
26PACKAGECONFIG = "libgcrypt" 25PACKAGECONFIG = "libgcrypt"
27PACKAGECONFIG_libc-musl = "libargp" 26PACKAGECONFIG_libc-musl = "libargp"
28PACKAGECONFIG_libc-uclibc = "libuargp"
29PACKAGECONFIG[libargp] = "--with-libargp,--without-libargp,argp-standalone," 27PACKAGECONFIG[libargp] = "--with-libargp,--without-libargp,argp-standalone,"
30PACKAGECONFIG[libuargp] = "--enable-uclibc,,,"
31PACKAGECONFIG[libgcrypt] = "--with-libgcrypt,--without-libgcrypt,libgcrypt," 28PACKAGECONFIG[libgcrypt] = "--with-libgcrypt,--without-libgcrypt,libgcrypt,"
32 29
33do_install_append() { 30do_install_append() {
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-15 07:01:22 +0000