On 1/10/19 9:49 PM, Marek Vasut wrote:
> On 1/10/19 9:48 PM, akuster808 wrote:
>>
>>
>> On 1/10/19 8:23 AM, Ferry Toth wrote:
>>> After a new checkout I am experiencing multiple errors building Sumo
>>> that might be related:
>>> bison-3.0.4
>>>
>>> cross-localedef-native_2.27
>>>
>>> coreutils-8.29
>>>
>>> On another machine with slightly out-of-date Sumo these problems do
>>> not occur.
>>>
>>>
>>> Detail below.
>>>
>>>
>>> Any ideas how to fix?
>> Can you provide how you are building this ie, local.conf, MACHINE and host
>>
>> What are your before and after commit hashes used?
>>
>> - armin
>>>
>>> Ferry
>>>
>>>
>>> virtual:native:/home/ferry/Develop/tmp/out/linux64/poky/meta/recipes-devtools/bison/bison_3.0.4.bb:do_compile
>>>
>>>
>>> | ../bison-3.0.4/lib/fseterr.c: In function 'fseterr':
>>> | ../bison-3.0.4/lib/fseterr.c:77:3: error: #error "Please port gnulib
>>> fseterr.c to your platform! Look at the definitions of ferror and
>>> clearerr on your system, then report this to bug-gnulib."
>>> | #error "Please port gnulib fseterr.c to your platform! Look at the
>>> definitions of ferror and clearerr on your system, then report this to
>>> bug-gnulib."
>>> | ^~~~~
>>>
>>>
>>> /home/ferry/Develop/tmp/out/linux64/poky/meta/recipes-core/glibc/cross-localedef-native_2.27.bb:do_compile
>>>
>>>
>>> | /home/ferry/Develop/tmp/out/linux64/build/tmp/hosttools/ld:
>>> argp-fmtstream.c:(.text+0x525): undefined reference to `_IO_fwide'
>>> | /home/ferry/Develop/tmp/out/linux64/build/tmp/hosttools/ld:
>>> argp-help.o: in function `argp_failure':
>>> | argp-help.c:(.text+0x20b3): undefined reference to `_IO_fwide'
>>> | collect2: error: ld returned 1 exit status
>>>
>>>
>>> virtual:native:/home/ferry/Develop/tmp/out/linux64/poky/meta/recipes-core/coreutils/coreutils_8.29.bb:do_compile
>>>
>>>
>>> | ../coreutils-8.29/lib/freadseek.c: In function 'freadptrinc':
>>> | ../coreutils-8.29/lib/freadseek.c:68:3: error: #error "Please port
>>> gnulib freadseek.c to your platform! Look at the definition of getc,
>>> getc_unlocked on your system, then report this to bug-gnulib."
>>> | #error "Please port gnulib freadseek.c to your platform! Look at the
>>> definition of getc, getc_unlocked on your system, then report this to
>>> bug-gnulib."
>>> | ^~~~~
>
> Sounds like one of those glibc-2.28 problems ?
Oh, in fact, I have this fixed locally, didn't get to sending the
patches out, see the two attached patches. One is backport from
oe-core/master , the other is something I grab'd from who knows where,
feel free to tweak the patches and post them.
--
Best regards,
Marek Vasut
>From 0c01a1dc3bc821acffb0e00d4831ed3cb94b685d Mon Sep 17 00:00:00 2001
From: Marek Vasut <ma...@denx.de>
Date: Thu, 20 Dec 2018 17:10:54 +0100
Subject: [PATCH] cross-localedef
Signed-off-by: Marek Vasut <ma...@denx.de>
---
.../glibc/cross-localedef-native_2.27.bb | 1 +
...ll-_IO_fwide-if-_LIBC-is-not-defined.patch | 72 +++++++++++++++++++
2 files changed, 73 insertions(+)
create mode 100644 meta/recipes-core/glibc/glibc/0001-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 5e92eb71d5..e270675651 100644
--- a/meta/recipes-core/glibc/cross-localedef-native_2.27.bb
+++ b/meta/recipes-core/glibc/cross-localedef-native_2.27.bb
@@ -36,6 +36,7 @@ SRC_URI = "${GLIBC_GIT_URI};branch=${SRCBRANCH};name=glibc \
file://0022-eglibc-Forward-port-cross-locale-generation-support.patch \
file://0023-Define-DUMMY_LOCALE_T-if-not-defined.patch \
file://archive-path.patch \
+ file://0001-argp-do-not-call-_IO_fwide-if-_LIBC-is-not-defined.patch \
"
# Makes for a rather long rev (22 characters), but...
#
diff --git a/meta/recipes-core/glibc/glibc/0001-argp-do-not-call-_IO_fwide-if-_LIBC-is-not-defined.patch b/meta/recipes-core/glibc/glibc/0001-argp-do-not-call-_IO_fwide-if-_LIBC-is-not-defined.patch
new file mode 100644
index 0000000000..2dac4865cc
--- /dev/null
+++ b/meta/recipes-core/glibc/glibc/0001-argp-do-not-call-_IO_fwide-if-_LIBC-is-not-defined.patch
@@ -0,0 +1,72 @@
+From 3a67e81d7527363a96af095a5af03b6201b82e9d Mon Sep 17 00:00:00 2001
+From: Charles-Antoine Couret <charles-antoine.cou...@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.
+---
+ 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.19.2
+
--
2.20.1
>From 5c0b240f6c18f14a1793b231f5cdedb417563ea2 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.k...@gmail.com>
Date: Mon, 6 Aug 2018 15:57:04 -0700
Subject: [PATCH] bison: Fix build break with glibc 2.28
(From OE-Core rev: 741415c58b3565764000028c26efd081212eb989)
Signed-off-by: Khem Raj <raj.k...@gmail.com>
Signed-off-by: Richard Purdie <richard.pur...@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 0000000000..7eaf0ce0fa
--- /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.k...@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 58728f5021..cc155f0fbe 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.20.1
--
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
