{"id":809145,"url":"http://patchwork.ozlabs.org/api/1.0/patches/809145/?format=json","project":{"id":27,"url":"http://patchwork.ozlabs.org/api/1.0/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":""},"msgid":"<20170902205423.21288-9-romain.naour@gmail.com>","date":"2017-09-02T20:54:20","name":"[v2,08/11] package/diffutils: fix build with glibc 2.26","commit_ref":null,"pull_url":null,"state":"awaiting-upstream","archived":false,"hash":"80bbe57fe459c46cf8ef54b1bfa7835d0cbd441e","submitter":{"id":67942,"url":"http://patchwork.ozlabs.org/api/1.0/people/67942/?format=json","name":"Romain Naour","email":"romain.naour@gmail.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/buildroot/patch/20170902205423.21288-9-romain.naour@gmail.com/mbox/","series":[{"id":1178,"url":"http://patchwork.ozlabs.org/api/1.0/series/1178/?format=json","date":"2017-09-02T20:54:12","name":"glibc: bump to 2.26","version":2,"mbox":"http://patchwork.ozlabs.org/series/1178/mbox/"}],"check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/809145/checks/","tags":{},"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.137; helo=fraxinus.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=\"qrde8N1R\"; dkim-atps=neutral"],"Received":["from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137])\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 3xl7f01cwTz9sRW\n\tfor ;\n\tSun, 3 Sep 2017 06:54:48 +1000 (AEST)","from localhost (localhost [127.0.0.1])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id 645BF81E69;\n\tSat, 2 Sep 2017 20:54:44 +0000 (UTC)","from fraxinus.osuosl.org ([127.0.0.1])\n\tby localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024)\n\twith ESMTP id YV4xPt8QwACv; Sat, 2 Sep 2017 20:54:43 +0000 (UTC)","from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id AC16382058;\n\tSat, 2 Sep 2017 20:54:43 +0000 (UTC)","from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137])\n\tby ash.osuosl.org (Postfix) with ESMTP id A5C711C121F\n\tfor ;\n\tSat, 2 Sep 2017 20:54:39 +0000 (UTC)","from localhost (localhost [127.0.0.1])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id 5434E834B0\n\tfor ;\n\tSat, 2 Sep 2017 20:54:39 +0000 (UTC)","from fraxinus.osuosl.org ([127.0.0.1])\n\tby localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024)\n\twith ESMTP id MBWVuSy7awhy for ;\n\tSat, 2 Sep 2017 20:54:38 +0000 (UTC)","from mail-wr0-f194.google.com (mail-wr0-f194.google.com\n\t[209.85.128.194])\n\tby fraxinus.osuosl.org (Postfix) with ESMTPS id C2B0682028\n\tfor ; Sat, 2 Sep 2017 20:54:37 +0000 (UTC)","by mail-wr0-f194.google.com with SMTP id k94so1589134wrc.0\n\tfor ; Sat, 02 Sep 2017 13:54:37 -0700 (PDT)","from localhost.localdomain\n\t([2a01:e35:1391:67d0:e6f9:2d2f:1a1e:79bf])\n\tby smtp.gmail.com with ESMTPSA id\n\t52sm2295647wru.59.2017.09.02.13.54.34\n\t(version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);\n\tSat, 02 Sep 2017 13:54:35 -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=qrde8N1RGK2zeNRpMC08QsshoYZ3NY5ogQ8B0s+h7qjFr6ArM+S1WHj5dWX9Jj/a8M\n\tUWXlHw+eof35XabtHMpv+/pbsfA/3VWM+dULyREbUeG/xEmerzYZanNdSfmXYlzT+1A2\n\tV6+WYvrH1S3PByEOEcxgkLwpLvBFLja9qL8CHnL2N35G+W8MHSFaTY0DuyNS/R4Bxoib\n\thU9tfYFacq/RNnKjkKH0dzRvWBbdCn5hPZWSDCcZB0FU8yWFLke8npjDwiwbAfNT/+V3\n\txyavJVNXo7JfemyDImYE3z0aPJDscTtY/babnUDCtGWAggwFM3nz9xQ49MQ/YxA40esM\n\teUCw==","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=hezRJfEyRIFc1c/NrrUGiGuqkdgoXIdF3Nl2CIEAlAoQLywioAjSQSGYTew7NdApLA\n\tbHlljA/CRe96mlI5gdNP6HS/AOlU9JdFHhgmw/1y6gVKBetifDETdONBNM66K8MdrmCn\n\tPrLsrt2han9k8fh++p3qzWwLuAExbnvXKX5clCN9975oIaNlQXwbe/+bbCQ5uYd8nidY\n\t3aarTbpc6Jkdf/tcL23WwNPWSeHeURpAlCxTNLIvlhCP2cWFNTooIMT3YRwMdVoY/YMv\n\tjYJBUHTdi2o48mQqk/2SqLcMlX+rFtNfHONMw2yUtEA3dlpV/PUDNtTFPqejhvZNR+ER\n\tUYYQ==","X-Gm-Message-State":"AHPjjUh808FZoTgngXCzW49oW54VPLIaKFIsC/jpDA4qehr3xwIpylXt\n\t8UzSs7q+L840qQada3c=","X-Google-Smtp-Source":"ADKCNb4VMMpkERXM/JeexyaCDl9MHEdWGWmcW+KCfp6XO/Z/WDmSHRkGK3Rl8Kys2X+FIpEUyzKshA==","X-Received":"by 10.223.154.226 with SMTP id a89mr662208wrc.192.1504385676067; \n\tSat, 02 Sep 2017 13:54:36 -0700 (PDT)","From":"Romain Naour ","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 ","Subject":"[Buildroot] [PATCH v2 08/11] package/diffutils: fix build with\n\tglibc 2.26","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":["v2","08/11"]}