From patchwork Tue Jun 13 13:39:14 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 105330 Delivered-To: patch@linaro.org Received: by 10.140.91.77 with SMTP id y71csp410596qgd; Tue, 13 Jun 2017 06:39:28 -0700 (PDT) X-Received: by 10.98.88.196 with SMTP id m187mr45294014pfb.87.1497361168822; Tue, 13 Jun 2017 06:39:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1497361168; cv=none; d=google.com; s=arc-20160816; b=PQ0bdfobNx+y6kNlkrsnN6r0lA4/Qd7UDyZ+5jldvjwgZtXiVy0FBpK1PzcguWvjsN sjWIFb3hPvidUOff8NQ9n60kuZ0lv53CKdhn2lG7lCpz9hCDyzcaIDqzPCURo2YqafLD 9F51DZYI0gU7LK9nBr0mMqoZWdE4Cjb9j/dJn/J/Ts7APtMPMViyASqEf32QaFXVzdZl ZKr0RdciYcRPH+3q4UY6i0hs4qG04f2EQBngWAme4PZHoqKmoFx9HIhiZL/ErItoQrx8 t9e3zyEB6CLc5hhK2iuM9OHIbTKrFyXAvW44NtBZI5B1fPRkrpDQYHrNcZOSFw+JrdsA dBzg== 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:cc:message-id:date:to:from :dkim-signature:delivered-to:arc-authentication-results; bh=kNeimZoMGcZWgGhk1vISLkrd2NSFPssKUBBXCA9q6uE=; b=IqVXv+JnwNxN6ohcg+QqQ7kC+KzQCJBA3C0a1I6bbXXFRZxQ2TXMM1Wa2t32BO72Ez /8bKrUO3qzg7nmp2n15uL/AagqbsfhmcMpbC977FDFlPnLRBfs4qe4Vdb9fZvlTtqxWP CvQgWeOJby+6OIQoAFQGyc7sZOhFWuO7qlOqBBARlxp3XFF5XqPiCd4cAoag+ChtVOcc AYVpiG/bOegYknEHy8E2LOfY0C4BW2Jhq0KuJLP5kKYzNBIWfzw8tCorcMCGRt2SgR9Z 4Uv3iIjpmFCFo23u10wIwAbQc9fj5o8HMx5ohIdYMU5WM35Y6+bS+du8Xv6BnmATXeht ToTA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel-com.20150623.gappssmtp.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 s61si9696469plb.32.2017.06.13.06.39.28; Tue, 13 Jun 2017 06:39:28 -0700 (PDT) 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=@intel-com.20150623.gappssmtp.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 review.yoctoproject.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id C7EBD782F2; Tue, 13 Jun 2017 13:39:20 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-wr0-f179.google.com (mail-wr0-f179.google.com [209.85.128.179]) by mail.openembedded.org (Postfix) with ESMTP id DDC196FEFE for ; Tue, 13 Jun 2017 13:39:18 +0000 (UTC) Received: by mail-wr0-f179.google.com with SMTP id q97so144089745wrb.2 for ; Tue, 13 Jun 2017 06:39:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=intel-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id; bh=Mt2tDM8KGGMnjKxYbCIAON/MjxJrVoZ8PrzAgYlX7vg=; b=ThJUyVIh5R3J8j7FDK6ZlkAkMCvN5EcHPsM/IbPHHFeY66/P6wdtvjZXi+5luou82b hSmtOi61kLbxlKZnBc7PzMmUnd2Fvdld1bXSFd0d+755wIk8C4IsFDEOGCdSD5vadiTz pP7sh/nIZiefcVZirQVSeO/Cd71D4iDAX1vCsbz2Gr0S7S9m3gj3ThB39bJ+75/awP/F KeBR2H3i5vuXs9Ycwep31UXVND5LwcnYbSaohrQMsFDsrlSgtg5coi3FeBoD4F2UmKoZ E8mFHGjhwPzYY9UL5Vo+yjHOoNLX8H5gs3d2DR43CJgNxDKE+gRC4hx9Ueo54THToiNM 4IHw== 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; bh=Mt2tDM8KGGMnjKxYbCIAON/MjxJrVoZ8PrzAgYlX7vg=; b=aPtbCUAw0PUcnBYTdisd04C5QEFCdZulSx+Bx74V3karaeqn30PahQkK4f8PvzD/Rp MhVMcErm4MBqH4lWoH0uugNhKzlAYI/58Zg0ENkp1WIAW6teeaW5ufQYIaN2Po2Hy6vD QDdNPng+0wpEHEMmMrb9NYrO75TMi8+f1D6uSOBbN+K+4fLWTwV8uPEKeMxzni5sCiB7 R8keAAP87qRx0X5IkA8VuKmKhNnu/gJAIJJPHQ1zoCGWUOXcZclCdQmdU7rbOddBbbLR Rdb160stUVyZpPEEaewPDgBUjG7cEBFjZ6B2NKWFS+RW1ZNbIAICV2ExFvM+x7AxlmR5 B7Mg== X-Gm-Message-State: AKS2vOx1pzsFnL10T4md7i64gIcL4zdSwcU86cqv3eJRcYp8i2UjvVio B5ZFwqc97iIPCCCKk48= X-Received: by 10.223.161.89 with SMTP id r25mr3202926wrr.153.1497361159383; Tue, 13 Jun 2017 06:39:19 -0700 (PDT) Received: from flashheart.burtonini.com (home.burtonini.com. [81.2.106.35]) by smtp.gmail.com with ESMTPSA id m191sm15408643wmg.30.2017.06.13.06.39.18 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 13 Jun 2017 06:39:18 -0700 (PDT) From: Ross Burton To: openembedded-core@lists.openembedded.org Date: Tue, 13 Jun 2017 14:39:14 +0100 Message-Id: <1497361154-13077-1-git-send-email-ross.burton@intel.com> X-Mailer: git-send-email 2.8.1 Cc: Marek Vasut Subject: [OE-core] [PATCH][pyro] automake: Backport perl 5.22 fix 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: Marek Vasut Backport 13f00eb4493c "automake: port to Perl 5.22 and later" from automake upstream to fix build with perl 5.22 . Signed-off-by: Marek Vasut Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- ...0001-automake-port-to-Perl-5.22-and-later.patch | 32 ++++++++++++++++++++++ meta/recipes-devtools/automake/automake_1.15.bb | 1 + 2 files changed, 33 insertions(+) create mode 100644 meta/recipes-devtools/automake/automake/0001-automake-port-to-Perl-5.22-and-later.patch -- 2.8.1 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core diff --git a/meta/recipes-devtools/automake/automake/0001-automake-port-to-Perl-5.22-and-later.patch b/meta/recipes-devtools/automake/automake/0001-automake-port-to-Perl-5.22-and-later.patch new file mode 100644 index 0000000..0e6895f --- /dev/null +++ b/meta/recipes-devtools/automake/automake/0001-automake-port-to-Perl-5.22-and-later.patch @@ -0,0 +1,32 @@ +From 13f00eb4493c217269b76614759e452d8302955e Mon Sep 17 00:00:00 2001 +From: Paul Eggert +Date: Thu, 31 Mar 2016 16:35:29 -0700 +Subject: [PATCH] automake: port to Perl 5.22 and later + +Without this change, Perl 5.22 complains "Unescaped left brace in +regex is deprecated" and this is planned to become a hard error in +Perl 5.26. See: +http://search.cpan.org/dist/perl-5.22.0/pod/perldelta.pod#A_literal_%22{%22_should_now_be_escaped_in_a_pattern +* bin/automake.in (substitute_ac_subst_variables): Escape left brace. + +Upstream-Status: Backport [13f00eb4493c217269b76614759e452d8302955e] +--- + bin/automake.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/bin/automake.in b/bin/automake.in +index a3a0aa318..2c8f31e14 100644 +--- a/bin/automake.in ++++ b/bin/automake.in +@@ -3878,7 +3878,7 @@ sub substitute_ac_subst_variables_worker + sub substitute_ac_subst_variables + { + my ($text) = @_; +- $text =~ s/\${([^ \t=:+{}]+)}/substitute_ac_subst_variables_worker ($1)/ge; ++ $text =~ s/\$[{]([^ \t=:+{}]+)}/substitute_ac_subst_variables_worker ($1)/ge; + return $text; + } + +-- +2.11.0 + diff --git a/meta/recipes-devtools/automake/automake_1.15.bb b/meta/recipes-devtools/automake/automake_1.15.bb index a6904c8..902dd63 100644 --- a/meta/recipes-devtools/automake/automake_1.15.bb +++ b/meta/recipes-devtools/automake/automake_1.15.bb @@ -24,6 +24,7 @@ SRC_URI += "file://python-libdir.patch \ file://performance.patch \ file://new_rt_path_for_test-driver.patch \ file://automake-replace-w-option-in-shebangs-with-modern-use-warnings.patch \ + file://0001-automake-port-to-Perl-5.22-and-later.patch \ " SRC_URI[md5sum] = "716946a105ca228ab545fc37a70df3a3"