From patchwork Thu Mar 8 18:17:29 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 131040 Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp51007lja; Thu, 8 Mar 2018 10:25:44 -0800 (PST) X-Google-Smtp-Source: AG47ELu8NRSsu2niUU6PkTWTlfdHkcTHfVwDiZxPrzi/3zxrqxX+f3dY9IBUCnV6VLEZnfqgj9Y4 X-Received: by 2002:a17:902:d807:: with SMTP id a7-v6mr24612036plz.330.1520533544150; Thu, 08 Mar 2018 10:25:44 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1520533544; cv=none; d=google.com; s=arc-20160816; b=I0zhGYzZSaESPpJHyDWwrwDsxvlwu0cnTGi25g9a1DOvqZ8dMust5OOiuihOfdod0u M0mLGmDYGtLSU5Ku96NRkh8gJVtOBNlHzVJDaC+94p6uQh4OnnVO9vSCt2GpUY+izu7F KlD14u1o6FnaV3u02R9K9H9Vn9YdW5LZarY3eo/vd5nbnJxhTejE+JlPcjXezGsfU3po /AbpVVq7AXsZWDKhqtMcmRulORP9r7bmllSQ0Yz8i4dumtxGRO4bZOnf6b89sEtDjF8R Q8EspG2SPh5hv9KY2VOdqTMb8m8GPFKNlOldT1UYBoo3ZSWf7oej9gaPaR6DfOYGQXEk /qNw== 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:delivered-to:arc-authentication-results; bh=ECLt0DuB2nmlb2u2u62HL0u1Oer35MrIZhmmTvOcubI=; b=WbSdN2x1b1EftMlaf8EOkiCfAYYXn39q1QaAV7X/5fYkw6GcyLvLz8eMKanH/TbcvA qYBrPf1diMLbI2f3IGWXKirdO4C+tR5kpFU7PXOPkf4oXlqQw0L2/5asxB/BS9V82UOK ZNiEjAiW8jNqsO+Gx1MD+3nuYL2Yrof8MUYZyyYFbvZvh7N6Bvdw8+lGMxZGYxHwZvi4 x3It6JqnA6gPgNb1dyCIG4OVvhy7CCZUCd2Dd4W8WN7EfX3S9iBzzE/7/4oxTqMMe6hv E29/kquInxWV/WLK/4AEQzer7tEqsE96b0UAwshg8oGp3bCtwkr9uw+diJ30yZtqDWeD E5ow== ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id x2si13385222pgc.260.2018.03.08.10.25.43; Thu, 08 Mar 2018 10:25:44 -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; 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 Received: from layers.openembedded.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 4240F789A0; Thu, 8 Mar 2018 18:25:12 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by mail.openembedded.org (Postfix) with ESMTP id 1B23D78973 for ; Thu, 8 Mar 2018 18:24:52 +0000 (UTC) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga103.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 08 Mar 2018 10:24:53 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.47,441,1515484800"; d="scan'208";a="24053660" Received: from kanavin-desktop.fi.intel.com ([10.237.68.161]) by orsmga006.jf.intel.com with ESMTP; 08 Mar 2018 10:24:52 -0800 From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Date: Thu, 8 Mar 2018 20:17:29 +0200 Message-Id: <20180308181804.31261-7-alexander.kanavin@linux.intel.com> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180308181804.31261-1-alexander.kanavin@linux.intel.com> References: <20180308181804.31261-1-alexander.kanavin@linux.intel.com> Subject: [OE-core] [PATCH 07/42] gmp: refresh patches 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 From: Ross Burton The patch tool will apply patches by default with "fuzz", which is where if the hunk context isn't present but what is there is close enough, it will force the patch in. Whilst this is useful when there's just whitespace changes, when applied to source it is possible for a patch applied with fuzz to produce broken code which still compiles (see #10450). This is obviously bad. We'd like to eventually have do_patch() rejecting any fuzz on these grounds. For that to be realistic the existing patches with fuzz need to be rebased and reviewed. Signed-off-by: Ross Burton Signed-off-by: Alexander Kanavin --- ...fiure.ac-Believe-the-cflags-from-environment.patch | 19 ++++++++----------- meta/recipes-support/gmp/gmp-6.1.2/amd64.patch | 10 +++++----- .../gmp/gmp-6.1.2/use-includedir.patch | 14 +++++++------- 3 files changed, 20 insertions(+), 23 deletions(-) -- 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-support/gmp/gmp-6.1.2/0001-confiure.ac-Believe-the-cflags-from-environment.patch b/meta/recipes-support/gmp/gmp-6.1.2/0001-confiure.ac-Believe-the-cflags-from-environment.patch index 665367658bc..1e47924ccc7 100644 --- a/meta/recipes-support/gmp/gmp-6.1.2/0001-confiure.ac-Believe-the-cflags-from-environment.patch +++ b/meta/recipes-support/gmp/gmp-6.1.2/0001-confiure.ac-Believe-the-cflags-from-environment.patch @@ -18,13 +18,13 @@ Upstream-Status: Inappropriate[OE-Specific] configure.ac | 11 ----------- 1 file changed, 11 deletions(-) -diff --git a/configure.ac b/configure.ac -index 857ea3b..359e919 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -607,15 +607,6 @@ case $host in - GMP_INCLUDE_MPN(arm/arm-defs.m4) - CALLING_CONVENTIONS_OBJS='arm32call.lo arm32check.lo' +Index: gmp-6.1.2/configure.ac +=================================================================== +--- gmp-6.1.2.orig/configure.ac ++++ gmp-6.1.2/configure.ac +@@ -604,15 +604,6 @@ case $host in + any_32_testlist="sizeof-long-4" + any_64_testlist="sizeof-long-8" - # This is needed for clang, which is not content with flags like -mfpu=neon - # alone. @@ -38,7 +38,7 @@ index 857ea3b..359e919 100644 # FIXME: We make mandatory compiler options optional here. We should # either enforce them, or organise to strip paths as the corresponding # options fail. -@@ -686,8 +677,6 @@ case $host in +@@ -746,8 +737,6 @@ case $host in ;; *) path="arm" @@ -47,6 +47,3 @@ index 857ea3b..359e919 100644 ;; esac ;; --- -1.9.1 - diff --git a/meta/recipes-support/gmp/gmp-6.1.2/amd64.patch b/meta/recipes-support/gmp/gmp-6.1.2/amd64.patch index 564d12d42b9..3935589f8b2 100644 --- a/meta/recipes-support/gmp/gmp-6.1.2/amd64.patch +++ b/meta/recipes-support/gmp/gmp-6.1.2/amd64.patch @@ -1,10 +1,10 @@ Upstream-Status: Pending -Index: gmp-5.0.3/longlong.h +Index: gmp-6.1.2/longlong.h =================================================================== ---- gmp-5.0.3.orig/longlong.h -+++ gmp-5.0.3/longlong.h -@@ -994,8 +994,10 @@ extern UWtype __MPN(udiv_qrnnd) _PROTO ( +--- gmp-6.1.2.orig/longlong.h ++++ gmp-6.1.2/longlong.h +@@ -1036,8 +1036,10 @@ extern UWtype __MPN(udiv_qrnnd) (UWtype count is only an int. */ #define count_trailing_zeros(count, x) \ do { \ @@ -14,5 +14,5 @@ Index: gmp-5.0.3/longlong.h + __asm__ ("bsfq %1,%0" : "=r" (__cbtmp) : "rm" ((UDItype)(x))); \ + (count) = __cbtmp; \ } while (0) - #endif /* x86_64 */ + #endif /* __amd64__ */ diff --git a/meta/recipes-support/gmp/gmp-6.1.2/use-includedir.patch b/meta/recipes-support/gmp/gmp-6.1.2/use-includedir.patch index 74904a25302..6b089cf39c2 100644 --- a/meta/recipes-support/gmp/gmp-6.1.2/use-includedir.patch +++ b/meta/recipes-support/gmp/gmp-6.1.2/use-includedir.patch @@ -1,15 +1,15 @@ Upstream-Status: Pending -Index: gmp-4.2.4/Makefile.am +Index: gmp-6.1.2/Makefile.am =================================================================== ---- gmp-4.2.4.orig/Makefile.am 2008-09-10 19:31:27.000000000 +0000 -+++ gmp-4.2.4/Makefile.am 2009-07-06 20:19:19.000000000 +0000 -@@ -106,7 +106,7 @@ - # but anyone knowledgable enough to be playing with exec_prefix will be able +--- gmp-6.1.2.orig/Makefile.am ++++ gmp-6.1.2/Makefile.am +@@ -130,7 +130,7 @@ EXTRA_DIST += gmpxx.h + # but anyone knowledgeable enough to be playing with exec_prefix will be able # to address that. # -includeexecdir = $(exec_prefix)/include +includeexecdir = $(includedir) include_HEADERS = $(GMPXX_HEADERS_OPTION) - nodist_includeexec_HEADERS = gmp.h $(MPBSD_HEADERS_OPTION) - lib_LTLIBRARIES = libgmp.la $(GMPXX_LTLIBRARIES_OPTION) $(MPBSD_LTLIBRARIES_OPTION) + nodist_includeexec_HEADERS = gmp.h + lib_LTLIBRARIES = libgmp.la $(GMPXX_LTLIBRARIES_OPTION)