Skip to contentSkip to conversation

coreutils: update to 8.31

PATCH Superseded Oleksandr Kravchuk 2 participants 2 messages Apr 24, 2019

v1 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 coreutils: update to 8.31

Musl fix was suggested by:
https://www.mail-archive.com/[email protected]/msg30888.html

---
 .../coreutils/fix-minus_zero-first-defined-here.patch | 11 +++++++++++
 .../{coreutils_8.30.bb => coreutils_8.31.bb}          |  8 +++++---
 2 files changed, 16 insertions(+), 3 deletions(-)
 create mode 100644 meta/recipes-core/coreutils/coreutils/fix-minus_zero-first-defined-here.patch
 rename meta/recipes-core/coreutils/{coreutils_8.30.bb => coreutils_8.31.bb} (94%)
meta/recipes-core/coreutils/coreutils/fix-minus_zero-first-defined-here.patch new file +11 -0
new file mode 100644
index 0000000000..fa9d047d4a
@@ -0,0 +1,11 @@
+--- a/lib/strtod.c
++++ b/lib/strtod.c
+@@ -302,7 +302,7 @@ compute_minus_zero (void)
+ }
+ # define minus_zero compute_minus_zero ()
+ #else
+-DOUBLE minus_zero = -0.0;
++static DOUBLE minus_zero = -0.0;
+ #endif
+ 
+ /* Convert NPTR to a DOUBLE.  If ENDPTR is not NULL, a pointer to the
meta/recipes-core/coreutils/coreutils_8.31.bb renamed from meta/recipes-core/coreutils/coreutils_8.30.bb +5 -3
similarity index 94%
rename from meta/recipes-core/coreutils/coreutils_8.30.bb
rename to meta/recipes-core/coreutils/coreutils_8.31.bb
index 8f4ee55712..fa4c0d9007 100644
@@ -6,7 +6,7 @@ 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=dbe356a88b09c29232b083d1ff8ac82a"
+                    file://src/ls.c;beginline=1;endline=15;md5=c456f9896277a0543e3866777ccc0255"
 DEPENDS = "gmp libcap"
 DEPENDS_class-native = ""
 
@@ -20,8 +20,10 @@ SRC_URI = "${GNU_MIRROR}/coreutils/${BP}.tar.xz \
            file://0001-local.mk-fix-cross-compiling-problem.patch \
           "
 
-SRC_URI[md5sum] = "ab06d68949758971fe744db66b572816"
-SRC_URI[sha256sum] = "e831b3a86091496cdba720411f9748de81507798f6130adeaef872d206e1b057"
+SRC_URI_append_libc-musl = "file://fix-minus_zero-first-defined-here.patch"
+
+SRC_URI[md5sum] = "0009a224d8e288e8ec406ef0161f9293"
+SRC_URI[sha256sum] = "ff7a9c918edce6b4f4b2725e3f9b37b0c4d193531cac49a48b56c4d0d3a9e9fd"
 
 EXTRA_OECONF_class-native = "--without-gmp"
 EXTRA_OECONF_class-target = "--enable-install-program=arch,hostname --libexecdir=${libdir}"
Signature · 1 line
2.17.1
#1 lore raw

The new patch needs an explanation, a Upstream-Status, and your signed-off-by. Also if a musl-fixing patch doesn't hinder builds using glibc in some way then apply it always. The problem with patches-in-overrides is that they tend to not be tested enough on upgrades.

Ross

Quoted 66 lines · Oleksandr Kravchuk

Musl fix was suggested by:
https://www.mail-archive.com/[email protected]/msg30888.html

---
 .../coreutils/fix-minus_zero-first-defined-here.patch | 11 +++++++++++
 .../{coreutils_8.30.bb => coreutils_8.31.bb}          |  8 +++++---
 2 files changed, 16 insertions(+), 3 deletions(-)
 create mode 100644 meta/recipes-core/coreutils/coreutils/fix-minus_zero-first-defined-here.patch
 rename meta/recipes-core/coreutils/{coreutils_8.30.bb => coreutils_8.31.bb} (94%)
meta/recipes-core/coreutils/coreutils/fix-minus_zero-first-defined-here.patch new file +11 -0
new file mode 100644
index 0000000000..fa9d047d4a
@@ -0,0 +1,11 @@
+--- a/lib/strtod.c
++++ b/lib/strtod.c
+@@ -302,7 +302,7 @@ compute_minus_zero (void)
+ }
+ # define minus_zero compute_minus_zero ()
+ #else
+-DOUBLE minus_zero = -0.0;
++static DOUBLE minus_zero = -0.0;
+ #endif
+
+ /* Convert NPTR to a DOUBLE.  If ENDPTR is not NULL, a pointer to the
meta/recipes-core/coreutils/coreutils_8.31.bb renamed from meta/recipes-core/coreutils/coreutils_8.30.bb +5 -4
similarity index 94%
rename from meta/recipes-core/coreutils/coreutils_8.30.bb
rename to meta/recipes-core/coreutils/coreutils_8.31.bb
index 8f4ee55712..fa4c0d9007 100644
@@ -6,7 +6,7 @@ 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=dbe356a88b09c29232b083d1ff8ac82a"
+                    file://src/ls.c;beginline=1;endline=15;md5=c456f9896277a0543e3866777ccc0255"
 DEPENDS = "gmp libcap"
 DEPENDS_class-native = ""
 
@@ -20,8 +20,10 @@ SRC_URI = "${GNU_MIRROR}/coreutils/${BP}.tar.xz \
            file://0001-local.mk-fix-cross-compiling-problem.patch \
           "
 
-SRC_URI[md5sum] = "ab06d68949758971fe744db66b572816"
-SRC_URI[sha256sum] = "e831b3a86091496cdba720411f9748de81507798f6130adeaef872d206e1b057"
+SRC_URI_append_libc-musl = "file://fix-minus_zero-first-defined-here.patch"
+
+SRC_URI[md5sum] = "0009a224d8e288e8ec406ef0161f9293"
+SRC_URI[sha256sum] = "ff7a9c918edce6b4f4b2725e3f9b37b0c4d193531cac49a48b56c4d0d3a9e9fd"
 
 EXTRA_OECONF_class-native = "--without-gmp"
 EXTRA_OECONF_class-target = "--enable-install-program=arch,hostname --libexecdir=${libdir}"
--

2.17.1

--
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core