From: "Alexander Kanavin" <alex.kanavin@gmail.com>
To: openembedded-core@lists.openembedded.org
Cc: Alexander Kanavin <alex.kanavin@gmail.com>
Subject: [PATCH 14/17] coreutils: update to 8.32
Date: Thu, 30 Apr 2020 11:58:12 +0200 [thread overview]
Message-ID: <20200430095815.2824-14-alex.kanavin@gmail.com> (raw)
In-Reply-To: <20200430095815.2824-1-alex.kanavin@gmail.com>
License-Update: copyright years, http changed to https
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
.../coreutils/fix-selinux-flask.patch | 13 ++++-------
.../remove-usr-local-lib-from-m4.patch | 23 ++++++++++++++-----
.../strtod_fix_clash_with_strtold.patch | 10 +++-----
.../{coreutils_8.31.bb => coreutils_8.32.bb} | 11 +++++----
4 files changed, 31 insertions(+), 26 deletions(-)
rename meta/recipes-core/coreutils/{coreutils_8.31.bb => coreutils_8.32.bb} (95%)
diff --git a/meta/recipes-core/coreutils/coreutils/fix-selinux-flask.patch b/meta/recipes-core/coreutils/coreutils/fix-selinux-flask.patch
index 9d1ae55d47..173a57925b 100644
--- a/meta/recipes-core/coreutils/coreutils/fix-selinux-flask.patch
+++ b/meta/recipes-core/coreutils/coreutils/fix-selinux-flask.patch
@@ -1,4 +1,4 @@
-From a1d360509fa3a4aff57eedcd528cc0347a87531d Mon Sep 17 00:00:00 2001
+From 7e20a7242ba2657f73311bbf5278093da67f0721 Mon Sep 17 00:00:00 2001
From: Robert Yang <liezhi.yang@windriver.com>
Date: Tue, 16 Sep 2014 01:59:08 -0700
Subject: [PATCH] gnulib-comp.m4: selinux/flask.h should respect to
@@ -13,20 +13,20 @@ compilation terminated.
Upstream-Status: Pending
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
+
---
- m4/gnulib-comp.m4 | 2 +-
+ m4/gnulib-comp.m4 | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/m4/gnulib-comp.m4 b/m4/gnulib-comp.m4
-index 472d3a0..5f09734 100644
+index dead90e..0abf0bd 100644
--- a/m4/gnulib-comp.m4
+++ b/m4/gnulib-comp.m4
-@@ -1730,11 +1730,11 @@ AC_DEFUN([gl_INIT],
+@@ -1860,10 +1860,10 @@ AC_DEFUN([gl_INIT],
AC_LIBOBJ([select])
fi
gl_SYS_SELECT_MODULE_INDICATOR([select])
- AC_CHECK_HEADERS([selinux/flask.h])
- AC_LIBOBJ([selinux-at])
gl_HEADERS_SELINUX_SELINUX_H
gl_HEADERS_SELINUX_CONTEXT_H
if test "$with_selinux" != no && test "$ac_cv_header_selinux_selinux_h" = yes; then
@@ -34,6 +34,3 @@ index 472d3a0..5f09734 100644
AC_LIBOBJ([getfilecon])
fi
gl_SERVENT
---
-1.7.9.5
-
diff --git a/meta/recipes-core/coreutils/coreutils/remove-usr-local-lib-from-m4.patch b/meta/recipes-core/coreutils/coreutils/remove-usr-local-lib-from-m4.patch
index 2ef8a548ac..1a8a9b9983 100644
--- a/meta/recipes-core/coreutils/coreutils/remove-usr-local-lib-from-m4.patch
+++ b/meta/recipes-core/coreutils/coreutils/remove-usr-local-lib-from-m4.patch
@@ -1,3 +1,8 @@
+From a26530083a29eeee910bfd606ecc621acecd547a Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Wed, 3 Aug 2011 14:12:30 -0700
+Subject: [PATCH] coreutils: Fix build on uclibc
+
We have problem using hardcoded directories like /usr/local here
which will be checked for cross builds. This is a special case which
is valid for AIX only. We do not have AIX as one of our supported
@@ -8,11 +13,15 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
Upstream-Status: Inappropriate [Upstream does care for AIX while we may not]
-Index: coreutils-8.14/m4/getloadavg.m4
-===================================================================
---- coreutils-8.14.orig/m4/getloadavg.m4 2011-09-19 08:09:24.000000000 -0700
-+++ coreutils-8.14/m4/getloadavg.m4 2011-10-19 21:42:00.385533357 -0700
-@@ -41,16 +41,6 @@
+---
+ m4/getloadavg.m4 | 12 ------------
+ 1 file changed, 12 deletions(-)
+
+diff --git a/m4/getloadavg.m4 b/m4/getloadavg.m4
+index 8e96965..63782a2 100644
+--- a/m4/getloadavg.m4
++++ b/m4/getloadavg.m4
+@@ -41,18 +41,6 @@ AC_CHECK_FUNC([getloadavg], [],
[LIBS="-lutil $LIBS" gl_func_getloadavg_done=yes])
fi
@@ -20,7 +29,9 @@ Index: coreutils-8.14/m4/getloadavg.m4
- # There is a commonly available library for RS/6000 AIX.
- # Since it is not a standard part of AIX, it might be installed locally.
- gl_getloadavg_LIBS=$LIBS
-- LIBS="-L/usr/local/lib $LIBS"
+- if test $cross_compiling != yes; then
+- LIBS="-L/usr/local/lib $LIBS"
+- fi
- AC_CHECK_LIB([getloadavg], [getloadavg],
- [LIBS="-lgetloadavg $LIBS" gl_func_getloadavg_done=yes],
- [LIBS=$gl_getloadavg_LIBS])
diff --git a/meta/recipes-core/coreutils/coreutils/strtod_fix_clash_with_strtold.patch b/meta/recipes-core/coreutils/coreutils/strtod_fix_clash_with_strtold.patch
index 77770093cd..fd629a5d2a 100644
--- a/meta/recipes-core/coreutils/coreutils/strtod_fix_clash_with_strtold.patch
+++ b/meta/recipes-core/coreutils/coreutils/strtod_fix_clash_with_strtold.patch
@@ -1,4 +1,4 @@
-From 0562b040fa17f1722ba2b3096067b45d0582ca53 Mon Sep 17 00:00:00 2001
+From 134137671bd771bf0205b87a735c545dbcdbb4b3 Mon Sep 17 00:00:00 2001
From: Paul Eggert <eggert@cs.ucla.edu>
Date: Mon, 11 Mar 2019 16:40:29 -0700
Subject: [PATCH] strtod: fix clash with strtold
@@ -14,12 +14,11 @@ Upstream-Status: Backport [rhel5]
Signed-off-by: Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com>
---
- ChangeLog | 9 +++++++++
lib/strtod.c | 11 +++++------
- 2 files changed, 14 insertions(+), 6 deletions(-)
+ 1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/lib/strtod.c b/lib/strtod.c
-index b9eaa51b4..69b1564e1 100644
+index b9eaa51..69b1564 100644
--- a/lib/strtod.c
+++ b/lib/strtod.c
@@ -294,16 +294,15 @@ parse_number (const char *nptr,
@@ -51,6 +50,3 @@ index b9eaa51b4..69b1564e1 100644
+ return minus_zero ();
return negative ? -num : num;
}
---
-2.20.1
-
diff --git a/meta/recipes-core/coreutils/coreutils_8.31.bb b/meta/recipes-core/coreutils/coreutils_8.32.bb
similarity index 95%
rename from meta/recipes-core/coreutils/coreutils_8.31.bb
rename to meta/recipes-core/coreutils/coreutils_8.32.bb
index 2b196b7512..70d02bbb07 100644
--- a/meta/recipes-core/coreutils/coreutils_8.31.bb
+++ b/meta/recipes-core/coreutils/coreutils_8.32.bb
@@ -5,8 +5,9 @@ every system."
HOMEPAGE = "http://www.gnu.org/software/coreutils/"
BUGTRACKER = "http://debbugs.gnu.org/coreutils"
LICENSE = "GPLv3+"
-LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504\
- file://src/ls.c;beginline=1;endline=15;md5=c456f9896277a0543e3866777ccc0255"
+LIC_FILES_CHKSUM = "file://COPYING;md5=1ebbd3e34237af26da5dc08a4e440464 \
+ file://src/ls.c;beginline=1;endline=15;md5=b7d80abf5b279320fb0e4b1007ed108b \
+ "
DEPENDS = "gmp libcap"
DEPENDS_class-native = ""
@@ -19,12 +20,12 @@ SRC_URI = "${GNU_MIRROR}/coreutils/${BP}.tar.xz \
file://disable-ls-output-quoting.patch \
file://0001-local.mk-fix-cross-compiling-problem.patch \
file://run-ptest \
- "
+ "
SRC_URI_append_libc-musl = "file://strtod_fix_clash_with_strtold.patch"
-SRC_URI[md5sum] = "0009a224d8e288e8ec406ef0161f9293"
-SRC_URI[sha256sum] = "ff7a9c918edce6b4f4b2725e3f9b37b0c4d193531cac49a48b56c4d0d3a9e9fd"
+SRC_URI[md5sum] = "022042695b7d5bcf1a93559a9735e668"
+SRC_URI[sha256sum] = "4458d8de7849df44ccab15e16b1548b285224dbba5f08fac070c1c0e0bcc4cfa"
EXTRA_OECONF_class-native = "--without-gmp"
EXTRA_OECONF_class-target = "--enable-install-program=arch,hostname --libexecdir=${libdir}"
--
2.26.1
next prev parent reply other threads:[~2020-04-30 9:58 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-30 9:57 [PATCH 01/17] libinput: add ptest Alexander Kanavin
2020-04-30 9:58 ` [PATCH 02/17] libinput: update 1.15.2 -> 1.15.5 Alexander Kanavin
2020-04-30 9:58 ` [PATCH 03/17] logrotate: update to 3.16.0 Alexander Kanavin
2020-04-30 9:58 ` [PATCH 04/17] rt-tests: further exclusion of development versions Alexander Kanavin
2020-04-30 9:58 ` [PATCH 05/17] kmscube: update to latest commit Alexander Kanavin
2020-04-30 15:46 ` [OE-core] " Khem Raj
2020-04-30 16:33 ` Alexander Kanavin
2020-04-30 17:33 ` Khem Raj
2020-04-30 20:05 ` Andre McCurdy
2020-04-30 20:17 ` Alexander Kanavin
2020-04-30 20:29 ` Khem Raj
2020-04-30 20:45 ` Andre McCurdy
2020-04-30 21:01 ` Alexander Kanavin
2020-04-30 9:58 ` [PATCH 06/17] xcb-proto: update to 1.14 Alexander Kanavin
2020-04-30 9:58 ` [PATCH 07/17] libxcb: " Alexander Kanavin
2020-04-30 9:58 ` [PATCH 08/17] mc: update to 4.8.24 Alexander Kanavin
2020-05-02 14:55 ` [OE-core] " Richard Purdie
2020-04-30 9:58 ` [PATCH 09/17] ghostscript: do not hardcode version in SRC_URI Alexander Kanavin
2020-04-30 9:58 ` [PATCH 10/17] ghostscript: update 9.50 -> 9.52 Alexander Kanavin
2020-04-30 15:48 ` [OE-core] " Khem Raj
2020-04-30 17:02 ` Alexander Kanavin
2020-04-30 17:35 ` Khem Raj
2020-04-30 9:58 ` [PATCH 11/17] webkitgtk: update to 2.28.2 Alexander Kanavin
2020-04-30 9:58 ` [PATCH 12/17] python3-gitdb: update to 4.0.4 Alexander Kanavin
2020-04-30 9:58 ` [PATCH 13/17] libevdev: update to 1.9.0 Alexander Kanavin
2020-04-30 9:58 ` Alexander Kanavin [this message]
2020-05-02 14:54 ` [OE-core] [PATCH 14/17] coreutils: update to 8.32 Richard Purdie
2020-05-02 14:56 ` Richard Purdie
2020-04-30 9:58 ` [PATCH 15/17] python3-dbusmock: add recipe from meta-oe Alexander Kanavin
2020-04-30 9:58 ` [PATCH 16/17] glib-2.0: update 2.62.4 -> 2.64.2 Alexander Kanavin
2020-05-02 15:00 ` [OE-core] " Richard Purdie
2020-05-02 18:16 ` Alexander Kanavin
2020-05-02 19:55 ` Alexander Kanavin
2020-04-30 9:58 ` [PATCH 17/17] glib-networking: update to 2.64.2 Alexander Kanavin
2020-05-02 22:20 ` [OE-core] [PATCH 01/17] libinput: add ptest Richard Purdie
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200430095815.2824-14-alex.kanavin@gmail.com \
--to=alex.kanavin@gmail.com \
--cc=openembedded-core@lists.openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox