From patchwork Mon Jan 29 03:27:13 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 126138 Delivered-To: patch@linaro.org Received: by 10.46.84.92 with SMTP id y28csp2091630ljd; Sun, 28 Jan 2018 19:27:58 -0800 (PST) X-Google-Smtp-Source: AH8x227MzRsTqRyMYZkVIi2tdcO7S1TX9DRnv6AGXkMOMugloSh56b/yVE/MQpXFX+mIOshaHsxt X-Received: by 10.99.169.26 with SMTP id u26mr20257365pge.270.1517196478450; Sun, 28 Jan 2018 19:27:58 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1517196478; cv=none; d=google.com; s=arc-20160816; b=dV4cxbN6wTRaGvI2NfBJTwsQxNGzyMjFcqIBudcse8d95sbAZXKNnImRxzJGMMCXlQ OZewolfGopQlf1E3FDBFyCfNdc9LJqTV0O2RoxN7vobmKB+xBxDMQGnSpk3GN6jQDKy+ XKrnVqvoDAQKJs9yLi8LQvtSMuZooXn1swo/LMLZhDk4ciSUXxoDd14bNWgCdQPncExI aIWTyb9iWDq66b/cQo5VI5GUWufwKvl9Va+zL+yozs7PzT9DaGOOiE6BZlnmMsBAWjIh VpE+fMP21pE7jsXhqgCBkkBpwiVHrmvYuTBKJ/LRbGExDddVipHwF77dwQVWIbzcmd9V cl2w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=Z3qqVoshTAPc6ycE1ks1Her3KRBsauPzF1Se/EVA7io=; b=auM7sYA65eFfG6jA7ztduhCdRvslZxbbWLuuEH8bHw55sVZjw2MMailyZhZJkMfdC7 uzVWd6qgzVLA8ZXX1VWebJlMUrOjhVoxtV5WpUvPyecUqocv/QGGNX5jefXvM24kqkaC FxLRD0tmO40b0TufiPTFb2sWFT+SiLpM3RgqqtMsSxg4EAzwIPU+fw+1dvBd4bZR7UOT feiKyrHbEgCO9NpyPGkPi344QVMy8+QR7Vuco4KjFjb4FC6TB1o1A5LfBmuI6eHmY3oG hd7bNod/U0XLtlnpmiWrZ4h+vztTlqrhwXF4o/96h2fTmGPKfSJqX5wL7L3OkV2d836q SD9w== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=pRNwVGcA; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id o24-v6si7145397pll.716.2018.01.28.19.27.58; Sun, 28 Jan 2018 19:27:58 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=pRNwVGcA; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Received: from layers.openembedded.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id CF0CF7871D; Mon, 29 Jan 2018 03:27:53 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-pf0-f193.google.com (mail-pf0-f193.google.com [209.85.192.193]) by mail.openembedded.org (Postfix) with ESMTP id 92C3E78650 for ; Mon, 29 Jan 2018 03:27:27 +0000 (UTC) Received: by mail-pf0-f193.google.com with SMTP id y5so3723283pff.13 for ; Sun, 28 Jan 2018 19:27:29 -0800 (PST) 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=S6cudfNfJKHyv+f+9+1PHdbTY/nQE+bqcKtbunDhHF0=; b=pRNwVGcATDAFKXLkcVK37cmGzLTUIFHpznXyadAB8R64w/8efnXuR7CwA411UAxNq2 bsDrSQ3NdMXIGmJRKVpgfBfwH70HWkZjkhJ3ajVmFnFXMOemYdD+zgX9QPl7d1DcdOYx rDpaoR2bBVeVUAU/PWka4fnxs8bf8icYGnc85rporjT3x49e1omSsFkcr/vlu1km+dXh z7bjwVKIRKdiKlskcCzf9/SHsdM47FLEm3QitH8pQd9U0QKRfvqJxRIgBWSIJxZT19Tz rVJFSCTfnHaksyR1j77u1wDItXdRNrJ0ZcW6JBC29hS5A9eLHe1qxEluM/CTtKX8sHTF CL+Q== 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=S6cudfNfJKHyv+f+9+1PHdbTY/nQE+bqcKtbunDhHF0=; b=uOe8u6WEfXx5UeP80/nuWMOHdyy4yQr2eegfno1UbWh/S8LUMY7v7YvmzSf+a3kwFb rOnLPiAPHSXBSB0R9LZE4q7jIAkmHmLmq8B8S0J9naQS+ooxDjrEH2M+NAKoserBcOWS Rbhlzms6lqcdxoslYvGp1yKkt/rUuNZuT8jGH0JLtNVEy36/C5WSc9xvHSKv5SV/EEtt 1DFiNM3TtHfocKO6XixtUoUqQ/xfilSUwnL/f1NKIRS4UAG5LsL7qp7vat8h1QEqdv4v uiBLU/jqGSLJYe48vr5ZG6M1bA/jcvAo7z7uH58eV9GBnLIrX3svaoZc1Yc5l2GwkG2x +AmA== X-Gm-Message-State: AKwxyteZfVVfbCESk+4bjJyPwZB6vR5mZ6EEswiGD9HZEA1PdSIxeb9u xfkHIjY/H8J1nbuAbkXjhF0/yw== X-Received: by 10.99.105.72 with SMTP id e69mr20942733pgc.239.1517196448839; Sun, 28 Jan 2018 19:27:28 -0800 (PST) Received: from localhost.localdomain ([2601:646:8880:466c::a8d6]) by smtp.gmail.com with ESMTPSA id y5sm29184689pfd.163.2018.01.28.19.27.28 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 28 Jan 2018 19:27:28 -0800 (PST) From: Khem Raj To: openembedded-core@lists.openembedded.org Date: Sun, 28 Jan 2018 19:27:13 -0800 Message-Id: X-Mailer: git-send-email 2.16.1 In-Reply-To: References: Subject: [OE-core] [PATCH 2/8] make: Backport fixes to not assume glibc internal glob implementation X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: openembedded-core-bounces@lists.openembedded.org Errors-To: openembedded-core-bounces@lists.openembedded.org Exposed with glibc 2.27 Signed-off-by: Khem Raj --- meta/recipes-devtools/make/make.inc | 5 +- ...1-glob-Do-not-assume-glibc-glob-internals.patch | 69 ++++++++++++++++++++++ ...2-glob-Do-not-assume-glibc-glob-internals.patch | 38 ++++++++++++ 3 files changed, 111 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-devtools/make/make/0001-glob-Do-not-assume-glibc-glob-internals.patch create mode 100644 meta/recipes-devtools/make/make/0002-glob-Do-not-assume-glibc-glob-internals.patch -- 2.16.1 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core diff --git a/meta/recipes-devtools/make/make.inc b/meta/recipes-devtools/make/make.inc index 849b74299c..b8905bc6d3 100644 --- a/meta/recipes-devtools/make/make.inc +++ b/meta/recipes-devtools/make/make.inc @@ -5,7 +5,10 @@ called the makefile, which lists each of the non-source files and how to compute HOMEPAGE = "http://www.gnu.org/software/make/" SECTION = "devel" -SRC_URI = "${GNU_MIRROR}/make/make-${PV}.tar.bz2" +SRC_URI = "${GNU_MIRROR}/make/make-${PV}.tar.bz2 \ + file://0001-glob-Do-not-assume-glibc-glob-internals.patch \ + file://0002-glob-Do-not-assume-glibc-glob-internals.patch \ + " inherit autotools gettext pkgconfig texinfo diff --git a/meta/recipes-devtools/make/make/0001-glob-Do-not-assume-glibc-glob-internals.patch b/meta/recipes-devtools/make/make/0001-glob-Do-not-assume-glibc-glob-internals.patch new file mode 100644 index 0000000000..5839d2ddd1 --- /dev/null +++ b/meta/recipes-devtools/make/make/0001-glob-Do-not-assume-glibc-glob-internals.patch @@ -0,0 +1,69 @@ +From c90a7dda6c572f79b8e78da44b6ebf8704edef65 Mon Sep 17 00:00:00 2001 +From: Paul Eggert +Date: Sun, 24 Sep 2017 09:12:58 -0400 +Subject: [PATCH 1/2] glob: Do not assume glibc glob internals. + +It has been proposed that glibc glob start using gl_lstat, +which the API allows it to do. GNU 'make' should not get in +the way of this. See: +https://sourceware.org/ml/libc-alpha/2017-09/msg00409.html + +* dir.c (local_lstat): New function, like local_stat. +(dir_setup_glob): Use it to initialize gl_lstat too, as the API +requires. +--- +Upstream-Status: Backport + + dir.c | 29 +++++++++++++++++++++++++++-- + 1 file changed, 27 insertions(+), 2 deletions(-) + +diff --git a/dir.c b/dir.c +index f34bbf5..12eef30 100644 +--- a/dir.c ++++ b/dir.c +@@ -1299,15 +1299,40 @@ local_stat (const char *path, struct stat *buf) + } + #endif + ++/* Similarly for lstat. */ ++#if !defined(lstat) && !defined(WINDOWS32) || defined(VMS) ++# ifndef VMS ++# ifndef HAVE_SYS_STAT_H ++int lstat (const char *path, struct stat *sbuf); ++# endif ++# else ++ /* We are done with the fake lstat. Go back to the real lstat */ ++# ifdef lstat ++# undef lstat ++# endif ++# endif ++# define local_lstat lstat ++#elif defined(WINDOWS32) ++/* Windows doesn't support lstat(). */ ++# define local_lstat local_stat ++#else ++static int ++local_lstat (const char *path, struct stat *buf) ++{ ++ int e; ++ EINTRLOOP (e, lstat (path, buf)); ++ return e; ++} ++#endif ++ + void + dir_setup_glob (glob_t *gl) + { + gl->gl_opendir = open_dirstream; + gl->gl_readdir = read_dirstream; + gl->gl_closedir = free; ++ gl->gl_lstat = local_lstat; + gl->gl_stat = local_stat; +- /* We don't bother setting gl_lstat, since glob never calls it. +- The slot is only there for compatibility with 4.4 BSD. */ + } + + void +-- +2.16.1 + diff --git a/meta/recipes-devtools/make/make/0002-glob-Do-not-assume-glibc-glob-internals.patch b/meta/recipes-devtools/make/make/0002-glob-Do-not-assume-glibc-glob-internals.patch new file mode 100644 index 0000000000..d49acd9f6e --- /dev/null +++ b/meta/recipes-devtools/make/make/0002-glob-Do-not-assume-glibc-glob-internals.patch @@ -0,0 +1,38 @@ +From 9858702dbd1e137262c06765919937660879f63c Mon Sep 17 00:00:00 2001 +From: Paul Eggert +Date: Sun, 24 Sep 2017 09:12:58 -0400 +Subject: [PATCH 2/2] glob: Do not assume glibc glob internals. + +It has been proposed that glibc glob start using gl_lstat, +which the API allows it to do. GNU 'make' should not get in +the way of this. See: +https://sourceware.org/ml/libc-alpha/2017-09/msg00409.html + +* dir.c (local_lstat): New function, like local_stat. +(dir_setup_glob): Use it to initialize gl_lstat too, as the API +requires. +--- +Upstream-Status: Backport + + configure.ac | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 64ec870..e87901c 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -399,10 +399,9 @@ AC_CACHE_CHECK([if system libc has GNU glob], [make_cv_sys_gnu_glob], + #include + #include + +-#define GLOB_INTERFACE_VERSION 1 + #if !defined _LIBC && defined __GNU_LIBRARY__ && __GNU_LIBRARY__ > 1 + # include +-# if _GNU_GLOB_INTERFACE_VERSION == GLOB_INTERFACE_VERSION ++if _GNU_GLOB_INTERFACE_VERSION == 1 || _GNU_GLOB_INTERFACE_VERSION == 2 + gnu glob + # endif + #endif], +-- +2.16.1 +