From patchwork Tue Jan 30 04:31:50 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 126196 Delivered-To: patch@linaro.org Received: by 10.46.84.92 with SMTP id y28csp3021533ljd; Mon, 29 Jan 2018 20:32:15 -0800 (PST) X-Google-Smtp-Source: AH8x226ciVQhLLAo2siWkWKRLNsKQC9KptMc/eVpTqWCkgaWsV3+JywK1FNg6BsjjZNXuy5XYtSp X-Received: by 2002:a17:902:7889:: with SMTP id q9-v6mr3584334pll.114.1517286735364; Mon, 29 Jan 2018 20:32:15 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1517286735; cv=none; d=google.com; s=arc-20160816; b=TDLrFnsUUXR2DiuLo2u3VAlEq4mmxmrMVRI8HvyDw5pGkcC4Fusdf1mtDlyBORQwrg a/qt+mOk4hAi2WqU/VYfQMnI0hU8WL0MUgsXZSN+j7Lkozm/lyxng/vgLjqn2nQXphtH 4qKcjUFfD+H2JDsXLyUu9uEMxqR0Tj7sJ9KT4U2XpfaJ4U3RIcQOIA1jQ2QfQsbN3iuc WQEzPzV53ymlFQkDaTvnhfJmL8mlWWjasu5CyBhYBTl6bWjMkmA/2SgTJ0LKJRkeoW8+ 3m7RjeFS6Jh8YuH7cgerTCuqrbC98GSrooWcVFRxHIyhKVgAw66SMo9hFcQfiCGCt7Rg kHhA== 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=97h0/KMYuw8tBiyEPHjs/jiv7owfmAQldoJJ7Ng6mws=; b=GgwVaHQAhSKwzyrLv8L6/udap0CMxk4wcZ8Fs0upfm+uE+td8jupf5R+3OvVqySHvc WeaQUr00IbOC2SUXHwm6LlbrtTTDxXXRJY/zeb/PJNywtbeDc/aetXlPuePBsB1Wiarq LAnFCToIHvJhBw9i/u3XViazEfGslm4vqcgNyPpqrgAClcMRkkwZh1lh7w8Ouwj1SIlL 2r02IfanB+izr8h2+qpOqSV3sw0vRICVRGtpJeGEU7niOnmNmn+RN8mfngB+rXQ+d4UO btwp0IhAA2BK6qWeIuEEEkfLt8CFxwVhZewO+RSVIZYWtvbCDM7z5Z8JHqjPCbMhjogy LQig== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=tAGHhS2X; 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 g3-v6si1489020plb.331.2018.01.29.20.32.15; Mon, 29 Jan 2018 20:32:15 -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=tAGHhS2X; 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 2FEE978892; Tue, 30 Jan 2018 04:32:08 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-pg0-f66.google.com (mail-pg0-f66.google.com [74.125.83.66]) by mail.openembedded.org (Postfix) with ESMTP id 080F278876 for ; Tue, 30 Jan 2018 04:32:05 +0000 (UTC) Received: by mail-pg0-f66.google.com with SMTP id r19so6271241pgn.1 for ; Mon, 29 Jan 2018 20:32:07 -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=Stbyk86x1RKqufvYD2JmiSod/PfkZ/qnL/gXKBKmkaY=; b=tAGHhS2XeKGgGvc5ULVOd4HQndotSeTEIFXgD0ie7ZhWNCDx0JXXxTan7NDG7mL++E bVNF9HP2EzJ8JvcfHfCOEf7HfnoW1dwgx7cxBXxNp3fsTf7Cix9POfZLSVW4iB2amPkO JEcy7bQNqotDbAcFB0czNZ4Su9UtD2yqpPksrPc4QIujPKd8Jqh7x2cslY+3gbk09JuG +aff6YM6m2uto34U1YQ/hSMWYGxELHsmPpLn2p+X9JN25AMykSPJhdLmUP6/S31LEjHU RIhTurdFQ4ahJBYUeBzlUUKrDk9uAYR8Ikz5B7SFyVDM+3p2HBR1ybR4CB/aM8VvXxr3 1GeQ== 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=Stbyk86x1RKqufvYD2JmiSod/PfkZ/qnL/gXKBKmkaY=; b=PwEF2cypeiOiOwz9O/LzCwbz8Zk/4oaQld6NxXDGpT2IfgyIRM5zfSiZf5B2fhZ4OR 4FCjd4flrA+plK/gU5wp5tNrPGxjGul5Fb43xwuzhWNM9TgUedfXVlR3c310H2P8zyrB NdXItOQfh9YqmNqiPOPbFR+hqbf+rLwCOwtKKWPwLYttPdhIPX0VVms6F4LT7ZtL3J4n CxBK/YpBix3xWBo4KuPBQgwuz38pVz3pSrMWECFLWYn+3N/wi7n1tzGiZ5XWLEi+9DIb Ba/TRZdkTHxDx+gswrAhAEufIroY+JoszOEr7RP/K8ZoFfwddJSMOaSlDRDY6YIQC71I OtKA== X-Gm-Message-State: AKwxytc99b8XWChxRjIxPcfDRt83uzWcDX+W4Y/lbczySyRMc7bU35Rg u9IZbmoDznYj9sIMp0E2qzJrrQ== X-Received: by 2002:a17:902:7d96:: with SMTP id a22-v6mr14575111plm.296.1517286726970; Mon, 29 Jan 2018 20:32:06 -0800 (PST) Received: from localhost.localdomain ([2601:646:8880:466c::a8d6]) by smtp.gmail.com with ESMTPSA id u67sm1134233pfd.169.2018.01.29.20.32.05 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 29 Jan 2018 20:32:05 -0800 (PST) From: Khem Raj To: openembedded-core@lists.openembedded.org Date: Mon, 29 Jan 2018 20:31:50 -0800 Message-Id: <92a10eebd7525de6eeaa80701f4ae256500836b2.1517286478.git.raj.khem@gmail.com> X-Mailer: git-send-email 2.16.1 In-Reply-To: References: Subject: [OE-core] [PATCH V2 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 | 70 ++++++++++++++++++++++ ...2-glob-Do-not-assume-glibc-glob-internals.patch | 38 ++++++++++++ 3 files changed, 112 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..2b6e4d40c3 --- /dev/null +++ b/meta/recipes-devtools/make/make/0001-glob-Do-not-assume-glibc-glob-internals.patch @@ -0,0 +1,70 @@ +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 +Signed-off-by: Khem Raj + + 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 +