* [sumo][PATCH 1/4] elfutils(-native): Add backported patch to fix build with host gcc9
2019-09-24 10:59 [sumo][PATCH 0/4] Fix build with host gcc9 / latest glibc Andreas Müller
@ 2019-09-24 10:59 ` Andreas Müller
2019-09-24 10:59 ` [sumo][PATCH 2/4] bison: Fix build break with glibc 2.28 Andreas Müller
` (3 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Andreas Müller @ 2019-09-24 10:59 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
.../elfutils/elfutils_0.170.bb | 1 +
...-fsize-and-msize-with-const-attribut.patch | 42 +++++++++++++++++++
2 files changed, 43 insertions(+)
create mode 100644 meta/recipes-devtools/elfutils/files/0009-libelf-Mark-both-fsize-and-msize-with-const-attribut.patch
diff --git a/meta/recipes-devtools/elfutils/elfutils_0.170.bb b/meta/recipes-devtools/elfutils/elfutils_0.170.bb
index 14ac22ee643..48f14286203 100644
--- a/meta/recipes-devtools/elfutils/elfutils_0.170.bb
+++ b/meta/recipes-devtools/elfutils/elfutils_0.170.bb
@@ -25,6 +25,7 @@ SRC_URI = "https://sourceware.org/elfutils/ftp/${PV}/${BP}.tar.bz2 \
file://debian/0003-Add-mips-n64-relocation-format-hack.patch \
file://0001-Use-fallthrough-attribute.patch \
file://0001-Ensure-that-packed-structs-follow-the-gcc-memory-lay.patch \
+ file://0009-libelf-Mark-both-fsize-and-msize-with-const-attribut.patch \
"
SRC_URI_append_libc-musl = " file://0008-build-Provide-alternatives-for-glibc-assumptions-hel.patch"
SRC_URI[md5sum] = "03599aee98c9b726c7a732a2dd0245d5"
diff --git a/meta/recipes-devtools/elfutils/files/0009-libelf-Mark-both-fsize-and-msize-with-const-attribut.patch b/meta/recipes-devtools/elfutils/files/0009-libelf-Mark-both-fsize-and-msize-with-const-attribut.patch
new file mode 100644
index 00000000000..b5f8fd417aa
--- /dev/null
+++ b/meta/recipes-devtools/elfutils/files/0009-libelf-Mark-both-fsize-and-msize-with-const-attribut.patch
@@ -0,0 +1,42 @@
+From a01938d584b91e747167bb4b3f30ec300c4d6e43 Mon Sep 17 00:00:00 2001
+From: Mark Wielaard <mark@klomp.org>
+Date: Fri, 16 Nov 2018 09:27:00 +0100
+Subject: [PATCH] libelf: Mark both fsize and msize with const attribute.
+
+GCC9 -Wmissing-attributes pointed out that although we alias the fsize
+and msize functions only fsize was marked as const. Fix by also marking
+the msize definition as const.
+
+https://sourceware.org/bugzilla/show_bug.cgi?id=23884
+
+Signed-off-by: Mark Wielaard <mark@klomp.org>
+
+Upstream-Status: Backport [1]
+
+[1] https://sourceware.org/git/?p=elfutils.git;a=commit;h=a01938d584b91e747167bb4b3f30ec300c4d6e43
+
+Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
+---
+ libelf/ChangeLog | 5 +++++
+ libelf/libelfP.h | 4 ++--
+ 2 files changed, 7 insertions(+), 2 deletions(-)
+
+diff --git a/libelf/libelfP.h b/libelf/libelfP.h
+index fa6d55d8..9f3e8e9d 100644
+--- a/libelf/libelfP.h
++++ b/libelf/libelfP.h
+@@ -461,9 +461,9 @@ extern Elf_Type __libelf_data_type (Elf *elf, int sh_type, GElf_Xword align)
+ These functions cannot be marked internal since they are aliases
+ of the export elfXX_fsize functions.*/
+ extern size_t __elf32_msize (Elf_Type __type, size_t __count,
+- unsigned int __version);
++ unsigned int __version) __const_attribute__;
+ extern size_t __elf64_msize (Elf_Type __type, size_t __count,
+- unsigned int __version);
++ unsigned int __version) __const_attribute__;
+
+
+ /* Create Elf descriptor from memory image. */
+--
+2.21.0
+
--
2.21.0
^ permalink raw reply related [flat|nested] 6+ messages in thread* [sumo][PATCH 2/4] bison: Fix build break with glibc 2.28
2019-09-24 10:59 [sumo][PATCH 0/4] Fix build with host gcc9 / latest glibc Andreas Müller
2019-09-24 10:59 ` [sumo][PATCH 1/4] elfutils(-native): Add backported patch to fix build with host gcc9 Andreas Müller
@ 2019-09-24 10:59 ` Andreas Müller
2019-09-24 10:59 ` [sumo][PATCH 3/4] glib-2.0: Add patch from upstream to fix build with host gcc9 Andreas Müller
` (2 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Andreas Müller @ 2019-09-24 10:59 UTC (permalink / raw)
To: openembedded-core
From: Khem Raj <raj.khem@gmail.com>
(From OE-Core rev: 741415c58b3565764000028c26efd081212eb989)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
.../recipes-devtools/bison/bison/gnulib.patch | 21 +++++++++++++++++++
meta/recipes-devtools/bison/bison_3.0.4.bb | 1 +
2 files changed, 22 insertions(+)
create mode 100644 meta/recipes-devtools/bison/bison/gnulib.patch
diff --git a/meta/recipes-devtools/bison/bison/gnulib.patch b/meta/recipes-devtools/bison/bison/gnulib.patch
new file mode 100644
index 00000000000..7eaf0ce0fa9
--- /dev/null
+++ b/meta/recipes-devtools/bison/bison/gnulib.patch
@@ -0,0 +1,21 @@
+Fix gnulib issues found with glibc 2.28 libio.h removal
+
+see
+https://lists.gnu.org/r/bug-gnulib/2018-03/msg00000.html
+
+Upstream-Status: Pending
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+
+Index: bison-3.0.4/lib/fseterr.c
+===================================================================
+--- bison-3.0.4.orig/lib/fseterr.c
++++ bison-3.0.4/lib/fseterr.c
+@@ -29,7 +29,7 @@ fseterr (FILE *fp)
+ /* Most systems provide FILE as a struct and the necessary bitmask in
+ <stdio.h>, because they need it for implementing getc() and putc() as
+ fast macros. */
+-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
++#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
+ fp->_flags |= _IO_ERR_SEEN;
+ #elif defined __sferror || defined __DragonFly__ /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin */
+ fp_->_flags |= __SERR;
diff --git a/meta/recipes-devtools/bison/bison_3.0.4.bb b/meta/recipes-devtools/bison/bison_3.0.4.bb
index 58728f5021f..cc155f0fbe3 100644
--- a/meta/recipes-devtools/bison/bison_3.0.4.bb
+++ b/meta/recipes-devtools/bison/bison_3.0.4.bb
@@ -14,6 +14,7 @@ SRC_URI = "${GNU_MIRROR}/bison/bison-${PV}.tar.xz \
file://dont-depend-on-help2man.patch.patch \
file://0001-src-local.mk-fix-parallel-issue.patch \
file://add-with-bisonlocaledir.patch \
+ file://gnulib.patch \
"
# No point in hardcoding path to m4, just use PATH
--
2.21.0
^ permalink raw reply related [flat|nested] 6+ messages in thread* [sumo][PATCH 3/4] glib-2.0: Add patch from upstream to fix build with host gcc9
2019-09-24 10:59 [sumo][PATCH 0/4] Fix build with host gcc9 / latest glibc Andreas Müller
2019-09-24 10:59 ` [sumo][PATCH 1/4] elfutils(-native): Add backported patch to fix build with host gcc9 Andreas Müller
2019-09-24 10:59 ` [sumo][PATCH 2/4] bison: Fix build break with glibc 2.28 Andreas Müller
@ 2019-09-24 10:59 ` Andreas Müller
2019-09-24 10:59 ` [sumo][PATCH 4/4] cross-localedef-native: Fix build for hosts with recent glibc Andreas Müller
2019-09-24 11:32 ` ✗ patchtest: failure for Fix build with host gcc9 / latest glibc Patchwork
4 siblings, 0 replies; 6+ messages in thread
From: Andreas Müller @ 2019-09-24 10:59 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
...11-gdbus-Avoid-printing-null-strings.patch | 77 +++++++++++++++++++
meta/recipes-core/glib-2.0/glib-2.0_2.54.3.bb | 1 +
2 files changed, 78 insertions(+)
create mode 100644 meta/recipes-core/glib-2.0/glib-2.0/0011-gdbus-Avoid-printing-null-strings.patch
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/0011-gdbus-Avoid-printing-null-strings.patch b/meta/recipes-core/glib-2.0/glib-2.0/0011-gdbus-Avoid-printing-null-strings.patch
new file mode 100644
index 00000000000..043879c85e0
--- /dev/null
+++ b/meta/recipes-core/glib-2.0/glib-2.0/0011-gdbus-Avoid-printing-null-strings.patch
@@ -0,0 +1,77 @@
+From 566e1d61a500267c7849ad0b2552feec9c9a29a6 Mon Sep 17 00:00:00 2001
+From: Ernestas Kulik <ekulik@redhat.com>
+Date: Tue, 29 Jan 2019 09:50:46 +0100
+Subject: [PATCH] gdbus: Avoid printing null strings
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This mostly affects the 2.56 branch, but, given that GCC 9 is being
+stricter about passing null string pointers to printf-like functions, it
+might make sense to proactively fix such calls.
+
+gdbusauth.c: In function '_g_dbus_auth_run_server':
+gdbusauth.c:1302:11: error: '%s' directive argument is null
+[-Werror=format-overflow=]
+ 1302 | debug_print ("SERVER: WaitingForBegin, read '%s'",
+ line);
+ |
+
+gdbusmessage.c: In function ‘g_dbus_message_to_blob’:
+gdbusmessage.c:2730:30: error: ‘%s’ directive argument is null [-Werror=format-overflow=]
+ 2730 | tupled_signature_str = g_strdup_printf ("(%s)", signature_str);
+ |
+
+Upstream-Status: Applied [1]
+
+[1] https://gitlab.gnome.org/GNOME/glib/commit/566e1d61a500267c7849ad0b2552feec9c9a29a6
+
+Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
+---
+ gio/gdbusauth.c | 2 +-
+ gio/gdbusmessage.c | 5 ++---
+ 2 files changed, 3 insertions(+), 4 deletions(-)
+
+diff --git a/gio/gdbusauth.c b/gio/gdbusauth.c
+index 1f8ea8057..752ec23fc 100644
+--- a/gio/gdbusauth.c
++++ b/gio/gdbusauth.c
+@@ -1272,9 +1272,9 @@ _g_dbus_auth_run_server (GDBusAuth *auth,
+ &line_length,
+ cancellable,
+ error);
+- debug_print ("SERVER: WaitingForBegin, read '%s'", line);
+ if (line == NULL)
+ goto out;
++ debug_print ("SERVER: WaitingForBegin, read '%s'", line);
+ if (g_strcmp0 (line, "BEGIN") == 0)
+ {
+ /* YAY, done! */
+diff --git a/gio/gdbusmessage.c b/gio/gdbusmessage.c
+index 3221b925d..3a1a1f9e9 100644
+--- a/gio/gdbusmessage.c
++++ b/gio/gdbusmessage.c
+@@ -2731,7 +2731,6 @@ g_dbus_message_to_blob (GDBusMessage *message,
+ if (message->body != NULL)
+ {
+ gchar *tupled_signature_str;
+- tupled_signature_str = g_strdup_printf ("(%s)", signature_str);
+ if (signature == NULL)
+ {
+ g_set_error (error,
+@@ -2739,10 +2738,10 @@ g_dbus_message_to_blob (GDBusMessage *message,
+ G_IO_ERROR_INVALID_ARGUMENT,
+ _("Message body has signature “%s” but there is no signature header"),
+ signature_str);
+- g_free (tupled_signature_str);
+ goto out;
+ }
+- else if (g_strcmp0 (tupled_signature_str, g_variant_get_type_string (message->body)) != 0)
++ tupled_signature_str = g_strdup_printf ("(%s)", signature_str);
++ if (g_strcmp0 (tupled_signature_str, g_variant_get_type_string (message->body)) != 0)
+ {
+ g_set_error (error,
+ G_IO_ERROR,
+--
+2.21.0
+
diff --git a/meta/recipes-core/glib-2.0/glib-2.0_2.54.3.bb b/meta/recipes-core/glib-2.0/glib-2.0_2.54.3.bb
index faf594569d6..35fd86819bf 100644
--- a/meta/recipes-core/glib-2.0/glib-2.0_2.54.3.bb
+++ b/meta/recipes-core/glib-2.0/glib-2.0_2.54.3.bb
@@ -16,6 +16,7 @@ SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz \
file://0001-Do-not-ignore-return-value-of-write.patch \
file://0001-Test-for-pthread_getname_np-before-using-it.patch \
file://0010-Do-not-hardcode-python-path-into-various-tools.patch \
+ file://0011-gdbus-Avoid-printing-null-strings.patch \
"
SRC_URI_append_class-native = " file://relocate-modules.patch"
--
2.21.0
^ permalink raw reply related [flat|nested] 6+ messages in thread* [sumo][PATCH 4/4] cross-localedef-native: Fix build for hosts with recent glibc
2019-09-24 10:59 [sumo][PATCH 0/4] Fix build with host gcc9 / latest glibc Andreas Müller
` (2 preceding siblings ...)
2019-09-24 10:59 ` [sumo][PATCH 3/4] glib-2.0: Add patch from upstream to fix build with host gcc9 Andreas Müller
@ 2019-09-24 10:59 ` Andreas Müller
2019-09-24 11:32 ` ✗ patchtest: failure for Fix build with host gcc9 / latest glibc Patchwork
4 siblings, 0 replies; 6+ messages in thread
From: Andreas Müller @ 2019-09-24 10:59 UTC (permalink / raw)
To: openembedded-core
Fixes:
| argp-help.c:(.text+0x1f51): undefined reference to `_IO_fwide'
| collect2: error: ld returned 1 exit status
| make: *** [Makefile:60: localedef] Error 1
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
.../glibc/cross-localedef-native_2.27.bb | 1 +
...ll-_IO_fwide-if-_LIBC-is-not-defined.patch | 78 +++++++++++++++++++
2 files changed, 79 insertions(+)
create mode 100644 meta/recipes-core/glibc/glibc/0032-argp-do-not-call-_IO_fwide-if-_LIBC-is-not-defined.patch
diff --git a/meta/recipes-core/glibc/cross-localedef-native_2.27.bb b/meta/recipes-core/glibc/cross-localedef-native_2.27.bb
index 5e92eb71d55..a999d35201a 100644
--- a/meta/recipes-core/glibc/cross-localedef-native_2.27.bb
+++ b/meta/recipes-core/glibc/cross-localedef-native_2.27.bb
@@ -35,6 +35,7 @@ SRC_URI = "${GLIBC_GIT_URI};branch=${SRCBRANCH};name=glibc \
file://0021-eglibc-Install-PIC-archives.patch \
file://0022-eglibc-Forward-port-cross-locale-generation-support.patch \
file://0023-Define-DUMMY_LOCALE_T-if-not-defined.patch \
+ file://0032-argp-do-not-call-_IO_fwide-if-_LIBC-is-not-defined.patch \
file://archive-path.patch \
"
# Makes for a rather long rev (22 characters), but...
diff --git a/meta/recipes-core/glibc/glibc/0032-argp-do-not-call-_IO_fwide-if-_LIBC-is-not-defined.patch b/meta/recipes-core/glibc/glibc/0032-argp-do-not-call-_IO_fwide-if-_LIBC-is-not-defined.patch
new file mode 100644
index 00000000000..edeb27da0c1
--- /dev/null
+++ b/meta/recipes-core/glibc/glibc/0032-argp-do-not-call-_IO_fwide-if-_LIBC-is-not-defined.patch
@@ -0,0 +1,78 @@
+From 3a67e81d7527363a96af095a5af03b6201b82e9d Mon Sep 17 00:00:00 2001
+From: Charles-Antoine Couret <charles-antoine.couret@essensium.com>
+Date: Thu, 29 Nov 2018 17:56:55 +0000
+Subject: [PATCH] argp: do not call _IO_fwide() if _LIBC is not defined
+
+_IO_fwide() is defined in libio.h file. This file is included only
+when _LIBC is defined.
+
+So, in case of compilation of these files without _LIBC definition,
+the compilation failed due to this unknown function.
+
+Now this function is called when libio.h file is included.
+
+(Change merged from gnulib. Tested on x86_64.)
+
+ * argp/argp-fmtstream.c (__argp_fmtstream_update): Use [_LIBC]
+ conditional on calls to _IO_fwide and putwc_unlocked. (Merge from
+ gnulib.)
+ * argp/argp-help.c (__argp_failure): Likewise.
+
+Upstream-Status: Backport [1]
+
+[1] https://sourceware.org/git/?p=glibc.git;a=commit;h=3a67e81d7527363a96af095a5af03b6201b82e9d
+
+Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
+---
+ ChangeLog | 7 +++++++
+ argp/argp-fmtstream.c | 4 ++++
+ argp/argp-help.c | 2 ++
+ 3 files changed, 13 insertions(+)
+
+diff --git a/argp/argp-fmtstream.c b/argp/argp-fmtstream.c
+index e43a0c7cf1..e9e4c0e5cc 100644
+--- a/argp/argp-fmtstream.c
++++ b/argp/argp-fmtstream.c
+@@ -149,9 +149,11 @@ __argp_fmtstream_update (argp_fmtstream_t fs)
+ size_t i;
+ for (i = 0; i < pad; i++)
+ {
++#ifdef _LIBC
+ if (_IO_fwide (fs->stream, 0) > 0)
+ putwc_unlocked (L' ', fs->stream);
+ else
++#endif
+ putc_unlocked (' ', fs->stream);
+ }
+ }
+@@ -312,9 +314,11 @@ __argp_fmtstream_update (argp_fmtstream_t fs)
+ *nl++ = ' ';
+ else
+ for (i = 0; i < fs->wmargin; ++i)
++#ifdef _LIBC
+ if (_IO_fwide (fs->stream, 0) > 0)
+ putwc_unlocked (L' ', fs->stream);
+ else
++#endif
+ putc_unlocked (' ', fs->stream);
+
+ /* Copy the tail of the original buffer into the current buffer
+diff --git a/argp/argp-help.c b/argp/argp-help.c
+index 2b6b0775d6..a17260378c 100644
+--- a/argp/argp-help.c
++++ b/argp/argp-help.c
+@@ -1873,9 +1873,11 @@ __argp_failure (const struct argp_state *state, int status, int errnum,
+ #endif
+ }
+
++#ifdef _LIBC
+ if (_IO_fwide (stream, 0) > 0)
+ putwc_unlocked (L'\n', stream);
+ else
++#endif
+ putc_unlocked ('\n', stream);
+
+ #if _LIBC || (HAVE_FLOCKFILE && HAVE_FUNLOCKFILE)
+--
+2.21.0
+
--
2.21.0
^ permalink raw reply related [flat|nested] 6+ messages in thread* ✗ patchtest: failure for Fix build with host gcc9 / latest glibc
2019-09-24 10:59 [sumo][PATCH 0/4] Fix build with host gcc9 / latest glibc Andreas Müller
` (3 preceding siblings ...)
2019-09-24 10:59 ` [sumo][PATCH 4/4] cross-localedef-native: Fix build for hosts with recent glibc Andreas Müller
@ 2019-09-24 11:32 ` Patchwork
4 siblings, 0 replies; 6+ messages in thread
From: Patchwork @ 2019-09-24 11:32 UTC (permalink / raw)
To: Andreas Müller; +Cc: openembedded-core
== Series Details ==
Series: Fix build with host gcc9 / latest glibc
Revision: 1
URL : https://patchwork.openembedded.org/series/20136/
State : failure
== Summary ==
Thank you for submitting this patch series to OpenEmbedded Core. This is
an automated response. Several tests have been executed on the proposed
series by patchtest resulting in the following failures:
* Issue Upstream-Status is in incorrect format [test_upstream_status_presence_format]
Suggested fix Fix Upstream-Status format in 0011-gdbus-Avoid-printing-null-strings.patch
Current Upstream-Status: Applied [1]
Standard format Upstream-Status: <Valid status>
Valid status Pending, Accepted, Backport, Denied, Inappropriate [reason], Submitted [where]
If you believe any of these test results are incorrect, please reply to the
mailing list (openembedded-core@lists.openembedded.org) raising your concerns.
Otherwise we would appreciate you correcting the issues and submitting a new
version of the patchset if applicable. Please ensure you add/increment the
version number when sending the new version (i.e. [PATCH] -> [PATCH v2] ->
[PATCH v3] -> ...).
---
Guidelines: https://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines
Test framework: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest
Test suite: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest-oe
^ permalink raw reply [flat|nested] 6+ messages in thread