Message ID | 20170902205423.21288-9-romain.naour@gmail.com |
---|---|
State | Awaiting Upstream |
Headers | show
Return-Path: <buildroot-bounces@busybox.net> X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.137; helo=fraxinus.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=<UNKNOWN>) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="qrde8N1R"; dkim-atps=neutral Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3xl7f01cwTz9sRW for <incoming@patchwork.ozlabs.org>; Sun, 3 Sep 2017 06:54:48 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 645BF81E69; Sat, 2 Sep 2017 20:54:44 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id YV4xPt8QwACv; Sat, 2 Sep 2017 20:54:43 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id AC16382058; Sat, 2 Sep 2017 20:54:43 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id A5C711C121F for <buildroot@lists.busybox.net>; Sat, 2 Sep 2017 20:54:39 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 5434E834B0 for <buildroot@lists.busybox.net>; Sat, 2 Sep 2017 20:54:39 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id MBWVuSy7awhy for <buildroot@lists.busybox.net>; Sat, 2 Sep 2017 20:54:38 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr0-f194.google.com (mail-wr0-f194.google.com [209.85.128.194]) by fraxinus.osuosl.org (Postfix) with ESMTPS id C2B0682028 for <buildroot@buildroot.org>; Sat, 2 Sep 2017 20:54:37 +0000 (UTC) Received: by mail-wr0-f194.google.com with SMTP id k94so1589134wrc.0 for <buildroot@buildroot.org>; Sat, 02 Sep 2017 13:54:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=iVwmTTBWzwOEOyml2eyxeoVJfDJ6oHjIxWHVTG7zg+k=; b=qrde8N1RGK2zeNRpMC08QsshoYZ3NY5ogQ8B0s+h7qjFr6ArM+S1WHj5dWX9Jj/a8M UWXlHw+eof35XabtHMpv+/pbsfA/3VWM+dULyREbUeG/xEmerzYZanNdSfmXYlzT+1A2 V6+WYvrH1S3PByEOEcxgkLwpLvBFLja9qL8CHnL2N35G+W8MHSFaTY0DuyNS/R4Bxoib hU9tfYFacq/RNnKjkKH0dzRvWBbdCn5hPZWSDCcZB0FU8yWFLke8npjDwiwbAfNT/+V3 xyavJVNXo7JfemyDImYE3z0aPJDscTtY/babnUDCtGWAggwFM3nz9xQ49MQ/YxA40esM eUCw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=iVwmTTBWzwOEOyml2eyxeoVJfDJ6oHjIxWHVTG7zg+k=; b=hezRJfEyRIFc1c/NrrUGiGuqkdgoXIdF3Nl2CIEAlAoQLywioAjSQSGYTew7NdApLA bHlljA/CRe96mlI5gdNP6HS/AOlU9JdFHhgmw/1y6gVKBetifDETdONBNM66K8MdrmCn PrLsrt2han9k8fh++p3qzWwLuAExbnvXKX5clCN9975oIaNlQXwbe/+bbCQ5uYd8nidY 3aarTbpc6Jkdf/tcL23WwNPWSeHeURpAlCxTNLIvlhCP2cWFNTooIMT3YRwMdVoY/YMv jYJBUHTdi2o48mQqk/2SqLcMlX+rFtNfHONMw2yUtEA3dlpV/PUDNtTFPqejhvZNR+ER UYYQ== X-Gm-Message-State: AHPjjUh808FZoTgngXCzW49oW54VPLIaKFIsC/jpDA4qehr3xwIpylXt 8UzSs7q+L840qQada3c= X-Google-Smtp-Source: ADKCNb4VMMpkERXM/JeexyaCDl9MHEdWGWmcW+KCfp6XO/Z/WDmSHRkGK3Rl8Kys2X+FIpEUyzKshA== X-Received: by 10.223.154.226 with SMTP id a89mr662208wrc.192.1504385676067; Sat, 02 Sep 2017 13:54:36 -0700 (PDT) Received: from localhost.localdomain ([2a01:e35:1391:67d0:e6f9:2d2f:1a1e:79bf]) by smtp.gmail.com with ESMTPSA id 52sm2295647wru.59.2017.09.02.13.54.34 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 02 Sep 2017 13:54:35 -0700 (PDT) From: Romain Naour <romain.naour@gmail.com> To: buildroot@buildroot.org Date: Sat, 2 Sep 2017 22:54:20 +0200 Message-Id: <20170902205423.21288-9-romain.naour@gmail.com> X-Mailer: git-send-email 2.9.5 In-Reply-To: <20170902205423.21288-1-romain.naour@gmail.com> References: <20170902205423.21288-1-romain.naour@gmail.com> Cc: Romain Naour <romain.naour@gmail.com> Subject: [Buildroot] [PATCH v2 08/11] package/diffutils: fix build with glibc 2.26 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Discussion and development of buildroot <buildroot.busybox.net> List-Unsubscribe: <http://lists.busybox.net/mailman/options/buildroot>, <mailto:buildroot-request@busybox.net?subject=unsubscribe> List-Archive: <http://lists.busybox.net/pipermail/buildroot/> List-Post: <mailto:buildroot@busybox.net> List-Help: <mailto:buildroot-request@busybox.net?subject=help> List-Subscribe: <http://lists.busybox.net/mailman/listinfo/buildroot>, <mailto:buildroot-request@busybox.net?subject=subscribe> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" <buildroot-bounces@busybox.net> |
Series |
glibc: bump to 2.26
|
expand
|
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
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(+)