{"id":817836,"url":"http://patchwork.ozlabs.org/api/patches/817836/?format=json","web_url":"http://patchwork.ozlabs.org/project/buildroot/patch/20170923212414.16744-6-romain.naour@gmail.com/","project":{"id":27,"url":"http://patchwork.ozlabs.org/api/projects/27/?format=json","name":"Buildroot development","link_name":"buildroot","list_id":"buildroot.buildroot.org","list_email":"buildroot@buildroot.org","web_url":"","scm_url":"","webscm_url":"","list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20170923212414.16744-6-romain.naour@gmail.com>","list_archive_url":null,"date":"2017-09-23T21:24:04","name":"[v3,5/7] package/diffutils: disable getopt_long replacement with glibc","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"80bbe57fe459c46cf8ef54b1bfa7835d0cbd441e","submitter":{"id":67942,"url":"http://patchwork.ozlabs.org/api/people/67942/?format=json","name":"Romain Naour","email":"romain.naour@gmail.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/buildroot/patch/20170923212414.16744-6-romain.naour@gmail.com/mbox/","series":[{"id":4786,"url":"http://patchwork.ozlabs.org/api/series/4786/?format=json","web_url":"http://patchwork.ozlabs.org/project/buildroot/list/?series=4786","date":"2017-09-23T21:23:59","name":"glibc: bump to 2.26","version":3,"mbox":"http://patchwork.ozlabs.org/series/4786/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/817836/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/817836/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":["incoming@patchwork.ozlabs.org","buildroot@lists.busybox.net"],"Delivered-To":["patchwork-incoming@bilbo.ozlabs.org","buildroot@osuosl.org"],"Authentication-Results":["ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=busybox.net\n\t(client-ip=140.211.166.136; helo=silver.osuosl.org;\n\tenvelope-from=buildroot-bounces@busybox.net;\n\treceiver=)","ozlabs.org;\n\tdkim=fail reason=\"signature verification failed\" (2048-bit key;\n\tunprotected) header.d=gmail.com header.i=@gmail.com\n\theader.b=\"W8MIZAH7\"; dkim-atps=neutral"],"Received":["from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136])\n\t(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3y03Jm3MHpz9t4P\n\tfor ;\n\tSun, 24 Sep 2017 07:24:40 +1000 (AEST)","from localhost (localhost [127.0.0.1])\n\tby silver.osuosl.org (Postfix) with ESMTP id CB38C2CAB5;\n\tSat, 23 Sep 2017 21:24:38 +0000 (UTC)","from silver.osuosl.org ([127.0.0.1])\n\tby localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024)\n\twith ESMTP id 8evSy3QAiy5e; Sat, 23 Sep 2017 21:24:36 +0000 (UTC)","from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby silver.osuosl.org (Postfix) with ESMTP id E1A592594A;\n\tSat, 23 Sep 2017 21:24:35 +0000 (UTC)","from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138])\n\tby ash.osuosl.org (Postfix) with ESMTP id D085D1C0060\n\tfor ;\n\tSat, 23 Sep 2017 21:24:26 +0000 (UTC)","from localhost (localhost [127.0.0.1])\n\tby whitealder.osuosl.org (Postfix) with ESMTP id C4A3C88EEA\n\tfor ;\n\tSat, 23 Sep 2017 21:24:26 +0000 (UTC)","from whitealder.osuosl.org ([127.0.0.1])\n\tby localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024)\n\twith ESMTP id JjAj0fjxG0bf for ;\n\tSat, 23 Sep 2017 21:24:26 +0000 (UTC)","from mail-wm0-f65.google.com (mail-wm0-f65.google.com\n\t[74.125.82.65])\n\tby whitealder.osuosl.org (Postfix) with ESMTPS id 0AED888F0E\n\tfor ; Sat, 23 Sep 2017 21:24:26 +0000 (UTC)","by mail-wm0-f65.google.com with SMTP id x17so4044032wmd.5\n\tfor ; Sat, 23 Sep 2017 14:24:25 -0700 (PDT)","from localhost.localdomain\n\t([2a01:e35:1391:67d0:e6f9:2d2f:1a1e:79bf])\n\tby smtp.gmail.com with ESMTPSA id\n\tf89sm1253848wmh.18.2017.09.23.14.24.23\n\t(version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);\n\tSat, 23 Sep 2017 14:24:23 -0700 (PDT)"],"X-Virus-Scanned":["amavisd-new at osuosl.org","amavisd-new at osuosl.org"],"X-Greylist":"domain auto-whitelisted by SQLgrey-1.7.6","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025;\n\th=from:to:cc:subject:date:message-id:in-reply-to:references;\n\tbh=iVwmTTBWzwOEOyml2eyxeoVJfDJ6oHjIxWHVTG7zg+k=;\n\tb=W8MIZAH7I0Pyh7yFgu75IYRVxOAotper5tb/NWgjkurhgGSSEiZZ6ZNdJbi4QciaDP\n\t0BtotqvkeFESBuROgrc2gcVj7x17J6hLkdPf3sTHGfZmbeMKI3Vg/PFreBteSPLSu8mz\n\tvsfikDRpQXhBPI0n+V1UN0PRzYoIqJrzj8y/qQ8trPthcsxlJLCmZvw6h6B1KUsZ6Hif\n\tRHO2PejiSnYqN9/gQHh2lAqyEtN39Tqt+hYEQy/eib9nf7VOx4INcehw9E0OBX11oDC9\n\tE9s+WLmU9lpnrYB/3E4rsPgbJGC/mdFtcrzkvUkVgDOo7hMKUpZMbRw2qMnm2DG5zhti\n\tUXbg==","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to\n\t:references;\n\tbh=iVwmTTBWzwOEOyml2eyxeoVJfDJ6oHjIxWHVTG7zg+k=;\n\tb=mjxbd4kxheX/vuACrJFyS+fxoJNJv8VrEV1z26HvFXvTMvg1pxp9N7yMHl8oDQOZWt\n\tJv9Jmgc0JZgQm03N/CkTZQtB88xHji/40zkoHYC+yhKicETcCno+ykwmZJjpFvnL5nww\n\t/7XG+9MxYRqZTnbyuc9UGZGQ+Xman5nvvU0PwLfNcMr5uAcsdGF2sXm6LooOwuA/5pqk\n\t6oFhQv+XgpnifBa+isKPRXqhRTzWTqa7A0CcXQVgnJeQHcb5P/73h5R44uEBa+0xDwir\n\tJqJzrhmh1m2ctQSbYlHtWuJruHCNnuVsHAX/R/fWWTlYAKzXaJlCVB/Q5wHNP2TVlA9d\n\tcF8w==","X-Gm-Message-State":"AHPjjUhvtD/fOvY1XL29nhmJ9b7pUtHBLTtC7P9KQHygkzmOLPmS4DlI\n\tCHCxdRjUn7QjX9DAniMyh9BzOAmo","X-Google-Smtp-Source":"AOwi7QDPdJ5WtzsC98cfXzwTR9nZwh5XfNQodwGabRb10O6QZs6SqwqqCvN8/bLbzODeWznQ3/A99g==","X-Received":"by 10.28.111.71 with SMTP id k68mr7008584wmc.64.1506201864308;\n\tSat, 23 Sep 2017 14:24:24 -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\n\treplacement 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":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","MIME-Version":"1.0","Content-Type":"text/plain; charset=\"us-ascii\"","Content-Transfer-Encoding":"7bit","Errors-To":"buildroot-bounces@busybox.net","Sender":"\"buildroot\" "},"content":"Since glibc >= 2.26, don't try to use getopt_long replacement bundled\nwith diffutils. It will conflict with the one from glibc.\nThe getopt copy bundled in glibc has been updated with the one from gnulib.\n\nAfter a lot of warnings...\nFixes:\nxstrtol-error.c: In function 'xstrtol_error':\nxstrtol-error.c:84:26: error: invalid use of undefined type 'struct rpl_option'\n option = long_options[opt_idx].name;\n ^\nxstrtol-error.c:84:26: error: dereferencing pointer to incomplete type 'const struct rpl_option'\n\n[...]\n\nxstrtol-error.c:92:1: error: conflicting types for 'xstrtol_fatal'\n xstrtol_fatal (enum strtol_error err,\n ^~~~~~~~~~~~~\nIn file included from xstrtol-error.c:20:0:\nxstrtol.h:69:16: note: previous declaration of 'xstrtol_fatal' was here\n _Noreturn void xstrtol_fatal (enum strtol_error,\n ^~~~~~~~~~~~~\n\nSigned-off-by: Romain Naour \n---\n package/diffutils/diffutils.mk | 6 ++++++\n 1 file changed, 6 insertions(+)","diff":"diff --git a/package/diffutils/diffutils.mk b/package/diffutils/diffutils.mk\nindex 6e5b9b6..79785d6 100644\n--- a/package/diffutils/diffutils.mk\n+++ b/package/diffutils/diffutils.mk\n@@ -11,6 +11,12 @@ DIFFUTILS_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES)\n DIFFUTILS_LICENSE = GPL-3.0+\n DIFFUTILS_LICENSE_FILES = COPYING\n \n+# Since glibc >= 2.26, don't try to use getopt_long replacement bundled\n+# with diffutils. It will conflict with the one from glibc.\n+ifeq ($(BR2_TOOLCHAIN_USES_GLIBC),y)\n+DIFFUTILS_CONF_ENV += gl_cv_func_getopt_gnu=yes\n+endif\n+\n ifeq ($(BR2_PACKAGE_BUSYBOX),y)\n DIFFUTILS_DEPENDENCIES += busybox\n endif\n","prefixes":["v3","5/7"]}