From patchwork Thu Mar 8 18:17:27 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 131038 Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp50762lja; Thu, 8 Mar 2018 10:25:28 -0800 (PST) X-Google-Smtp-Source: AG47ELuiyPNMv9Fk34loqyfw4qSkeqB4eP3pI9FRhWk/dpSVVBIMMfuHsc88IAoKm8/vlgbLi7/P X-Received: by 10.99.180.3 with SMTP id s3mr21706597pgf.258.1520533528485; Thu, 08 Mar 2018 10:25:28 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1520533528; cv=none; d=google.com; s=arc-20160816; b=CUhwewBIBh5pWLOZJLRTwVSQWxD2LYJw+D5APL1CnTMAmCXpiksgRtc2nMtHXuYEMr xnJHTAEYL6qGso/x7q+gW9IoCErI9jofj7iqt6Pvz4BYMURXP0AHRcstTtorj/6YyRlx 6u42jVqnPG2LpphTyjmKd67HlY2B48NaCzRiTGxPb4jkgNotvR+b7XWIfJvk0g2m1ZgO H/UeLSxaXX7Wv6SJaQSUmndEkpDNsQcX1BPJyXwvcpV4w2z6tX26HD02/kFuO2QSg82n wmCw65XExTxgvyo8GPszy9c8xzdRW7hc4b1w21JWFKc+08w4sefVu7e+/XG0bHTOm4ZI R7/w== 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=9lCZo8JXrEOEYAI2JbwipZBNSzoEcL/QbUtGZiTUsao=; b=EogJuDi+WIYgA+Hpe75T2eLZLLkxOFeyWYe5TGetC0fDv5Hg7z/RdLXqyPs96Rlm5t +Zn4mNFYAjw5HXgRr8rfBsqTwCzIkJa/sCruVbrWt1++FFpqAOdCCGffcT/bdTRdEi8t IjujaI/ajJH5H9NOLHKPAXj/QyHTgub2+VR3RfTfhVY/C3Ig3AYE/+O25TV1rHYyIfN7 geIHc72gqpGynZ+YF9O/BlcoWnycH9I00LKmqrr4uZ04p74joa807B6gkZ2XU06Ywc9p dPCXZmmiK+rmASwZ/JmmgSEMuCgw9P+ivFn7FozarxM7aT1iSh8po53CdUCJvIWJTYxs Uyug== 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 q15-v6si8025789plk.518.2018.03.08.10.25.28; Thu, 08 Mar 2018 10:25:28 -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 2BA1F789A4; Thu, 8 Mar 2018 18:25:10 +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 12DE478973 for ; Thu, 8 Mar 2018 18:24:49 +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:50 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.47,441,1515484800"; d="scan'208";a="24053640" Received: from kanavin-desktop.fi.intel.com ([10.237.68.161]) by orsmga006.jf.intel.com with ESMTP; 08 Mar 2018 10:24:49 -0800 From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Date: Thu, 8 Mar 2018 20:17:27 +0200 Message-Id: <20180308181804.31261-5-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 05/42] nspr: 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 --- meta/recipes-support/nspr/nspr/fix-build-on-x86_64.patch | 2 +- meta/recipes-support/nspr/nspr/remove-rpath-from-tests.patch | 10 +++++----- 2 files changed, 6 insertions(+), 6 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/nspr/nspr/fix-build-on-x86_64.patch b/meta/recipes-support/nspr/nspr/fix-build-on-x86_64.patch index c2b7258e50e..f12acc85480 100644 --- a/meta/recipes-support/nspr/nspr/fix-build-on-x86_64.patch +++ b/meta/recipes-support/nspr/nspr/fix-build-on-x86_64.patch @@ -49,4 +49,4 @@ Index: nspr/configure.in - PR_MD_ASFILES=os_Linux_ppc.s fi ;; - m68k) + esac diff --git a/meta/recipes-support/nspr/nspr/remove-rpath-from-tests.patch b/meta/recipes-support/nspr/nspr/remove-rpath-from-tests.patch index a7e7853de1a..ecc6d31874a 100644 --- a/meta/recipes-support/nspr/nspr/remove-rpath-from-tests.patch +++ b/meta/recipes-support/nspr/nspr/remove-rpath-from-tests.patch @@ -11,12 +11,12 @@ in file {builddir}/tmp/work/armv5te-poky-linux-gnueabi/nspr-4.8.9-r1/packages-sp Signed-off-by: Andrei Gherzan Upstream-Status: Pending -Index: nspr-4.8.9/mozilla/nsprpub/pr/tests/Makefile.in +Index: nspr/pr/tests/Makefile.in =================================================================== ---- nsprpub.orig/pr/tests/Makefile.in 2012-02-11 00:01:10.476220505 +0200 -+++ nsprpub/pr/tests/Makefile.in 2012-02-10 23:57:40.000000000 +0200 -@@ -379,7 +379,7 @@ - endif +--- nspr.orig/pr/tests/Makefile.in ++++ nspr/pr/tests/Makefile.in +@@ -315,7 +315,7 @@ ifeq ($(OS_ARCH), SunOS) + endif # SunOS ifeq (,$(filter-out Linux GNU GNU_%,$(OS_ARCH))) - LDOPTS += -Xlinker -rpath $(ABSOLUTE_LIB_DIR)