diff options
Diffstat (limited to 'recipes-core')
4 files changed, 67 insertions, 31 deletions
diff --git a/recipes-core/coreutils/coreutils-6.9/0001-sort.c-Reorder-includes-for-glibc-2.34-portability.patch b/recipes-core/coreutils/coreutils-6.9/0001-sort.c-Reorder-includes-for-glibc-2.34-portability.patch new file mode 100644 index 0000000..f37cb47 --- /dev/null +++ b/recipes-core/coreutils/coreutils-6.9/0001-sort.c-Reorder-includes-for-glibc-2.34-portability.patch @@ -0,0 +1,35 @@ +From e241a55767c4eaac7d14c412d880037cb6d2ee33 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Tue, 29 Jun 2021 22:43:16 -0700 +Subject: [PATCH] sort.c: Reorder includes for glibc 2.34 portability + +With glibc 2.34 config.h will include stdlib.h and that would disable +sys/wait.h to include needed definitions from bits/waitflags.h since +_STDLIB_H would have been defined already and sys/wait.h would think +these paths are included already, this is fixed with newer gnulib and +configure so this is to get this old version to compile with latest +glibc headers + +Upstream-Status: Inappropriate [OE-Specific] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/sort.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +--- a/src/sort.c ++++ b/src/sort.c +@@ -21,12 +21,12 @@ + + Ørn E. Hansen added NLS support in 1997. */ + ++#include <sys/types.h> ++#include <sys/wait.h> + #include <config.h> + + #include <assert.h> + #include <getopt.h> +-#include <sys/types.h> +-#include <sys/wait.h> + #include <signal.h> + #if HAVE_WCHAR_H + # include <wchar.h> diff --git a/recipes-core/coreutils/coreutils_6.9.bb b/recipes-core/coreutils/coreutils_6.9.bb index 080100d..cc00de0 100644 --- a/recipes-core/coreutils/coreutils_6.9.bb +++ b/recipes-core/coreutils/coreutils_6.9.bb @@ -5,7 +5,7 @@ every system." HOMEPAGE = "http://www.gnu.org/software/coreutils/" BUGTRACKER = "http://debbugs.gnu.org/coreutils" -LICENSE = "GPLv2+" +LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \ file://src/ls.c;beginline=4;endline=16;md5=15ed60f67b1db5fedd5dbc37cf8a9543" PR = "r5" @@ -27,13 +27,22 @@ SRC_URI = "${GNU_MIRROR}/coreutils/${BP}.tar.bz2 \ file://no-man.patch \ file://build-don-t-need-charset.alias-when-building-for-mus.patch \ file://no-su.patch \ + file://0001-sort.c-Reorder-includes-for-glibc-2.34-portability.patch \ " SRC_URI[md5sum] = "c9607d8495f16e98906e7ed2d9751a06" SRC_URI[sha256sum] = "89c2895ad157de50e53298b22d91db116ee4e1dd3fdf4019260254e2e31497b0" -EXTRA_OECONF += "ac_cv_func_getgroups_works=yes \ - ac_cv_func_strcoll_works=yes" +CACHED_CONFIGUREVARS = "ac_cv_func_getgroups_works=yes \ + ac_cv_func_strcoll_works=yes \ + ac_cv_func_working_mktime=yes \ + jm_ac_cv_func_link_follows_symlink=no \ + jm_cv_func_unlink_busy_text=yes \ + jm_cv_have_proc_uptime=yes \ + gl_cv_func_mkdir_trailing_slash_bug=no \ + gl_cv_func_rename_trailing_slash_bug=no \ + gl_cv_func_rename_trailing_dest_slash_bug=no \ + " # acl is not a default feature # @@ -83,7 +92,7 @@ inherit update-alternatives ALTERNATIVE_PRIORITY = "100" -ALTERNATIVE_${PN} = "lbracket ${bindir_progs} ${base_bindir_progs} ${sbindir_progs}" +ALTERNATIVE:${PN} = "lbracket ${bindir_progs} ${base_bindir_progs} ${sbindir_progs}" ALTERNATIVE_PRIORITY[uptime] = "10" ALTERNATIVE_PRIORITY[hostname] = "10" diff --git a/recipes-core/gettext/gettext_0.16.1.bb b/recipes-core/gettext/gettext_0.16.1.bb index dacdfd3..cd632ba 100644 --- a/recipes-core/gettext/gettext_0.16.1.bb +++ b/recipes-core/gettext/gettext_0.16.1.bb @@ -2,14 +2,14 @@ SUMMARY = "Utilities and libraries for producing multi-lingual messages" DESCRIPTION = "GNU gettext is a set of tools that provides a framework to help other programs produce multi-lingual messages. These tools include a set of conventions about how programs should be written to support message catalogs, a directory and file naming organization for the message catalogs themselves, a runtime library supporting the retrieval of translated messages, and a few stand-alone programs to massage in various ways the sets of translatable and already translated strings." HOMEPAGE = "http://www.gnu.org/software/gettext/gettext.html" SECTION = "libs" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=9ea3144f04c41cd2eada5d3f472e6ea5" PR = "r6" DEPENDS = "virtual/libiconv" -DEPENDS_class-native = "" +DEPENDS:class-native = "" PROVIDES = "virtual/libintl virtual/gettext" -PROVIDES_class-native = "virtual/gettext-native" +PROVIDES:class-native = "virtual/gettext-native" SRC_URI = "${GNU_MIRROR}/gettext/gettext-${PV}.tar.gz \ file://gettext-vpath.patch \ @@ -27,8 +27,6 @@ SRC_URI[sha256sum] = "0bf850d1a079fb5a61f0a47b1a9efd35eb44032255375e1cedb0253bc2 PARALLEL_MAKE = "" -LDFLAGS_prepend_libc-uclibc = " -lrt -lpthread " - inherit autotools texinfo EXTRA_OECONF += "--without-lispdir \ @@ -39,7 +37,7 @@ EXTRA_OECONF += "--without-lispdir \ --disable-openmp \ --without-emacs \ " -EXTRA_OECONF_append_libc-musl = "\ +EXTRA_OECONF:append:libc-musl = "\ gt_cv_func_gnugettext1_libc=yes \ gt_cv_func_gnugettext2_libc=yes \ " @@ -48,11 +46,11 @@ acpaths = '-I ${S}/autoconf-lib-link/m4/ \ -I ${S}/gettext-runtime/m4 \ -I ${S}/gettext-tools/m4' -do_configure_prepend() { +do_configure:prepend() { rm -f ${S}/config/m4/libtool.m4 } -do_install_append_libc-musl () { +do_install:append:libc-musl () { rm -f ${D}${libdir}/charset.alias } @@ -67,30 +65,24 @@ do_install_append_libc-musl () { # 4 KiB /ep93xx/libgcc-s-dev_4.2.2-r2_ep93xx.ipk PACKAGES =+ "libgettextlib libgettextsrc" -FILES_libgettextlib = "${libdir}/libgettextlib-*.so*" -FILES_libgettextsrc = "${libdir}/libgettextsrc-*.so*" +FILES:libgettextlib = "${libdir}/libgettextlib-*.so*" +FILES:libgettextsrc = "${libdir}/libgettextsrc-*.so*" PACKAGES =+ "gettext-runtime gettext-runtime-dev gettext-runtime-staticdev gettext-runtime-doc" -FILES_${PN} += "${libdir}/${BPN}/*" +FILES:${PN} += "${libdir}/${BPN}/*" -FILES_gettext-runtime = "${bindir}/gettext \ +FILES:gettext-runtime = "${bindir}/gettext \ ${bindir}/ngettext \ ${bindir}/envsubst \ ${bindir}/gettext.sh \ ${libdir}/libasprintf${SODEV} \ ${libdir}/GNU.Gettext.dll \ " -FILES_gettext-runtime_append_libc-uclibc = " ${libdir}/libintl.so.* \ - ${libdir}/charset.alias \ - " -FILES_gettext-runtime-staticdev += "${libdir}/libasprintf.a" -FILES_gettext-runtime-dev += "${includedir}/autosprintf.h \ +FILES:gettext-runtime-staticdev += "${libdir}/libasprintf.a" +FILES:gettext-runtime-dev += "${includedir}/autosprintf.h \ ${libdir}/libasprintf${SOLIBDEV}" -FILES_gettext-runtime-dev_append_libc-uclibc = " ${libdir}/libintl.so \ - ${includedir}/libintl.h \ - " -FILES_gettext-runtime-doc = "${mandir}/man1/gettext.* \ +FILES:gettext-runtime-doc = "${mandir}/man1/gettext.* \ ${mandir}/man1/ngettext.* \ ${mandir}/man1/envsubst.* \ ${mandir}/man1/.* \ @@ -105,11 +97,11 @@ FILES_gettext-runtime-doc = "${mandir}/man1/gettext.* \ ${infodir}/autosprintf.info \ " -do_install_append() { +do_install:append() { rm -f ${D}${libdir}/preloadable_libintl.so } -do_install_append_class-native () { +do_install:append:class-native () { rm ${D}${datadir}/aclocal/* rm ${D}${datadir}/gettext/config.rpath rm ${D}${datadir}/gettext/po/Makefile.in.in @@ -120,6 +112,6 @@ do_install_append_class-native () { # available, and we don't want to use older macros from the target gettext in # a non-gplv3 build, so kill them and let dependent recipes rely on # gettext-native. -SYSROOT_DIRS_BLACKLIST += "${datadir}/aclocal" +SYSROOT_DIRS_IGNORE += "${datadir}/aclocal" BBCLASSEXTEND = "native nativesdk" diff --git a/recipes-core/readline/readline_5.2.bb b/recipes-core/readline/readline_5.2.bb index c1007a2..d42ce8b 100644 --- a/recipes-core/readline/readline_5.2.bb +++ b/recipes-core/readline/readline_5.2.bb @@ -5,7 +5,7 @@ additional functions to maintain a list of previously-entered command lines, to lines, and perform csh-like history expansion on previous commands." SECTION = "libs" -LICENSE = "GPLv2+" +LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=03b36fdd84f74b8d8189a202b980b67f" DEPENDS += "ncurses" @@ -69,13 +69,13 @@ EXTRA_AUTORECONF += "--exclude=autoheader" LEAD_SONAME = "libreadline.so" -do_configure_prepend () { +do_configure:prepend () { if [ ! -e ${S}/acinclude.m4 ]; then cat ${S}/aclocal.m4 > ${S}/acinclude.m4 fi } -do_install_append () { +do_install:append () { # Make install doesn't properly install these oe_libinstall -so -C shlib libhistory ${D}${libdir} oe_libinstall -so -C shlib libreadline ${D}${libdir} |