From patchwork Sat Sep 23 21:24:04 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Romain Naour X-Patchwork-Id: 817836 Return-Path: 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.136; helo=silver.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="W8MIZAH7"; dkim-atps=neutral Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3y03Jm3MHpz9t4P for ; Sun, 24 Sep 2017 07:24:40 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id CB38C2CAB5; Sat, 23 Sep 2017 21:24:38 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 8evSy3QAiy5e; Sat, 23 Sep 2017 21:24:36 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id E1A592594A; Sat, 23 Sep 2017 21:24:35 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id D085D1C0060 for ; Sat, 23 Sep 2017 21:24:26 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id C4A3C88EEA for ; Sat, 23 Sep 2017 21:24:26 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id JjAj0fjxG0bf for ; Sat, 23 Sep 2017 21:24:26 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm0-f65.google.com (mail-wm0-f65.google.com [74.125.82.65]) by whitealder.osuosl.org (Postfix) with ESMTPS id 0AED888F0E for ; Sat, 23 Sep 2017 21:24:26 +0000 (UTC) Received: by mail-wm0-f65.google.com with SMTP id x17so4044032wmd.5 for ; Sat, 23 Sep 2017 14:24:25 -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=W8MIZAH7I0Pyh7yFgu75IYRVxOAotper5tb/NWgjkurhgGSSEiZZ6ZNdJbi4QciaDP 0BtotqvkeFESBuROgrc2gcVj7x17J6hLkdPf3sTHGfZmbeMKI3Vg/PFreBteSPLSu8mz vsfikDRpQXhBPI0n+V1UN0PRzYoIqJrzj8y/qQ8trPthcsxlJLCmZvw6h6B1KUsZ6Hif RHO2PejiSnYqN9/gQHh2lAqyEtN39Tqt+hYEQy/eib9nf7VOx4INcehw9E0OBX11oDC9 E9s+WLmU9lpnrYB/3E4rsPgbJGC/mdFtcrzkvUkVgDOo7hMKUpZMbRw2qMnm2DG5zhti UXbg== 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=mjxbd4kxheX/vuACrJFyS+fxoJNJv8VrEV1z26HvFXvTMvg1pxp9N7yMHl8oDQOZWt Jv9Jmgc0JZgQm03N/CkTZQtB88xHji/40zkoHYC+yhKicETcCno+ykwmZJjpFvnL5nww /7XG+9MxYRqZTnbyuc9UGZGQ+Xman5nvvU0PwLfNcMr5uAcsdGF2sXm6LooOwuA/5pqk 6oFhQv+XgpnifBa+isKPRXqhRTzWTqa7A0CcXQVgnJeQHcb5P/73h5R44uEBa+0xDwir JqJzrhmh1m2ctQSbYlHtWuJruHCNnuVsHAX/R/fWWTlYAKzXaJlCVB/Q5wHNP2TVlA9d cF8w== X-Gm-Message-State: AHPjjUhvtD/fOvY1XL29nhmJ9b7pUtHBLTtC7P9KQHygkzmOLPmS4DlI CHCxdRjUn7QjX9DAniMyh9BzOAmo X-Google-Smtp-Source: AOwi7QDPdJ5WtzsC98cfXzwTR9nZwh5XfNQodwGabRb10O6QZs6SqwqqCvN8/bLbzODeWznQ3/A99g== X-Received: by 10.28.111.71 with SMTP id k68mr7008584wmc.64.1506201864308; Sat, 23 Sep 2017 14:24:24 -0700 (PDT) Received: from localhost.localdomain ([2a01:e35:1391:67d0:e6f9:2d2f:1a1e:79bf]) by smtp.gmail.com with ESMTPSA id f89sm1253848wmh.18.2017.09.23.14.24.23 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 23 Sep 2017 14:24:23 -0700 (PDT) From: Romain Naour To: buildroot@buildroot.org Date: Sat, 23 Sep 2017 23:24:04 +0200 Message-Id: <20170923212414.16744-6-romain.naour@gmail.com> X-Mailer: git-send-email 2.9.5 In-Reply-To: <20170923212414.16744-1-romain.naour@gmail.com> References: <20170923212414.16744-1-romain.naour@gmail.com> Cc: Romain Naour Subject: [Buildroot] [PATCH v3 5/7] package/diffutils: disable getopt_long replacement with glibc X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" 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 Reviewed-by: "Yann E. MORIN" --- 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