Buildroot Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Romain Naour <romain.naour@gmail.com>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH v2 08/11] package/diffutils: fix build with glibc 2.26
Date: Sat,  2 Sep 2017 22:54:20 +0200	[thread overview]
Message-ID: <20170902205423.21288-9-romain.naour@gmail.com> (raw)
In-Reply-To: <20170902205423.21288-1-romain.naour@gmail.com>

Since glibc >= 2.26, don't try to use getopt_long replacement bundled
with diffutils. It will conflict with the one from glibc.
The getopt copy bundled in glibc has been updated with the one from gnulib.

After a lot of warnings...
Fixes:
xstrtol-error.c: In function 'xstrtol_error':
xstrtol-error.c:84:26: error: invalid use of undefined type 'struct rpl_option'
     option = long_options[opt_idx].name;
                          ^
xstrtol-error.c:84:26: error: dereferencing pointer to incomplete type 'const struct rpl_option'

[...]

xstrtol-error.c:92:1: error: conflicting types for 'xstrtol_fatal'
 xstrtol_fatal (enum strtol_error err,
 ^~~~~~~~~~~~~
In file included from xstrtol-error.c:20:0:
xstrtol.h:69:16: note: previous declaration of 'xstrtol_fatal' was here
 _Noreturn void xstrtol_fatal (enum strtol_error,
                ^~~~~~~~~~~~~

Signed-off-by: Romain Naour <romain.naour@gmail.com>
---
 package/diffutils/diffutils.mk | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/package/diffutils/diffutils.mk b/package/diffutils/diffutils.mk
index 6e5b9b6..79785d6 100644
--- a/package/diffutils/diffutils.mk
+++ b/package/diffutils/diffutils.mk
@@ -11,6 +11,12 @@ DIFFUTILS_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES)
 DIFFUTILS_LICENSE = GPL-3.0+
 DIFFUTILS_LICENSE_FILES = COPYING
 
+# Since glibc >= 2.26, don't try to use getopt_long replacement bundled
+# with diffutils. It will conflict with the one from glibc.
+ifeq ($(BR2_TOOLCHAIN_USES_GLIBC),y)
+DIFFUTILS_CONF_ENV += gl_cv_func_getopt_gnu=yes
+endif
+
 ifeq ($(BR2_PACKAGE_BUSYBOX),y)
 DIFFUTILS_DEPENDENCIES += busybox
 endif
-- 
2.9.5

  parent reply	other threads:[~2017-09-02 20:54 UTC|newest]

Thread overview: 34+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-09-02 20:54 [Buildroot] [PATCH v2 00/11] glibc: bump to 2.26 Romain Naour
2017-09-02 20:54 ` [Buildroot] [PATCH v2 01/11] package/gcc: fix build issue with glibc 2.26 Romain Naour
2017-09-17 16:08   ` Yann E. MORIN
2017-09-17 16:13     ` Yann E. MORIN
2017-09-02 20:54 ` [Buildroot] [PATCH v2 02/11] " Romain Naour
2017-09-17 16:17   ` Yann E. MORIN
2017-09-02 20:54 ` [Buildroot] [PATCH v2 03/11] package/mesa3d: fix build issue with glibc >= 2.26 Romain Naour
2017-09-19  7:54   ` Bernd Kuhls
2017-09-02 20:54 ` [Buildroot] [PATCH v2 04/11] package/jsoncpp: fix build " Romain Naour
2017-09-02 20:54 ` [Buildroot] [PATCH v2 05/11] package/glibc: needs kernel headers >= 3.10 on powerpc64le Romain Naour
2017-09-10 10:30   ` Yann E. MORIN
2017-09-11 23:05     ` Arnout Vandecappelle
2017-09-11 23:37       ` Thomas Petazzoni
2017-09-12  6:04         ` Yann E. MORIN
2017-09-12  7:47           ` Arnout Vandecappelle
2017-09-02 20:54 ` [Buildroot] [PATCH v2 06/11] package/gcc: enable float128 on powerpc64le with glibc >= 2.26 toolchains Romain Naour
2017-09-02 20:54 ` [Buildroot] [PATCH v2 07/11] package/flex: disable reallocarray Romain Naour
2017-09-02 21:12   ` Thomas Petazzoni
2017-09-02 22:23     ` Romain Naour
2017-09-03  7:14       ` Thomas Petazzoni
2017-09-07 21:32         ` Romain Naour
2017-09-13 18:53           ` Jörg Krause
2017-09-13 19:54             ` Romain Naour
2017-09-14  8:25               ` Adrian Perez de Castro
2017-09-14 10:51                 ` Jörg Krause
2017-09-02 20:54 ` Romain Naour [this message]
2017-09-02 20:54 ` [Buildroot] [PATCH v2 09/11] package/kodi: fix build with glibc 2.26 Romain Naour
2017-09-19  7:51   ` Bernd Kuhls
2017-09-02 20:54 ` [Buildroot] [PATCH v2 10/11] package/glibc: bump to 2.26 Romain Naour
2017-09-19  7:50   ` Bernd Kuhls
2017-09-19 10:43     ` Romain Naour
2017-09-02 20:54 ` [Buildroot] [PATCH v2 11/11] package/glibc: backport fixes for glibc bug 21930 Romain Naour
2017-09-21 10:45 ` [Buildroot] [PATCH v2 00/11] glibc: bump to 2.26 Arnout Vandecappelle
2017-09-21 20:54   ` Romain Naour

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=20170902205423.21288-9-romain.naour@gmail.com \
    --to=romain.naour@gmail.com \
    --cc=buildroot@busybox.net \
    /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