From patchwork Thu Feb 15 17:32:25 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: auh@yoctoproject.org X-Patchwork-Id: 39419 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id AE21DC54EBC for ; Thu, 15 Feb 2024 17:32:36 +0000 (UTC) Received: from a27-23.smtp-out.us-west-2.amazonses.com (a27-23.smtp-out.us-west-2.amazonses.com [54.240.27.23]) by mx.groups.io with SMTP id smtpd.web11.20333.1708018345287244750 for ; Thu, 15 Feb 2024 09:32:25 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@yoctoproject.org header.s=lvjh2tk576v2ro5mi6k4dt3mc6wpqbky header.b=gguuiA0k; dkim=pass header.i=@amazonses.com header.s=hsbnp7p3ensaochzwyq5wwmceodymuwv header.b=pugj4U3/; spf=pass (domain: us-west-2.amazonses.com, ip: 54.240.27.23, mailfrom: 0101018dadd3a564-4d295f2f-4f9d-4f65-91eb-e5f1a4191693-000000@us-west-2.amazonses.com) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=lvjh2tk576v2ro5mi6k4dt3mc6wpqbky; d=yoctoproject.org; t=1708018345; h=Content-Type:MIME-Version:From:To:Cc:Subject:Message-Id:Date; bh=g+Kxh3+ef16cj8uNhDeBi7tA3AOrOU6Zm7dgrSHEr5o=; b=gguuiA0ktQrhbIK4LdecZILjNh5GLTAG4pQ7sfcXz8TBag8GF4Q4kZA+c2rY5V/m m2l8L1yGZzn5YYxjElgzITbl1pgHdF9oCKFCegE6Dj1N9oZWA5w1DU/sK7g/zUatJ8L wzbkG3GKjR7Z9H5F/dSUzKbAqFV+NmMhO5UHoCbg= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=hsbnp7p3ensaochzwyq5wwmceodymuwv; d=amazonses.com; t=1708018345; h=Content-Type:MIME-Version:From:To:Cc:Subject:Message-Id:Date:Feedback-ID; bh=g+Kxh3+ef16cj8uNhDeBi7tA3AOrOU6Zm7dgrSHEr5o=; b=pugj4U3/6NJiVC2nXY4goypB8vLLF7BpIAQ9P6R4KLCfOD7kYz9y8zvUY2NGoW3q nIaFc+PWmONqiY96W7IpBpG+7zDEnvbwFHBdROxKzMXEUqDovVC7RgkDV/OWkrOjURV 0Tl3Aum66NlGdcK4ySwEHqvVJWL2piLLXvRNXMjQ= MIME-Version: 1.0 From: auh@yoctoproject.org To: Anuj Mittal Cc: openembedded-core@lists.openembedded.org Subject: [AUH] swig: upgrading to 4.2.0 SUCCEEDED Message-ID: <0101018dadd3a564-4d295f2f-4f9d-4f65-91eb-e5f1a4191693-000000@us-west-2.amazonses.com> Date: Thu, 15 Feb 2024 17:32:25 +0000 Feedback-ID: 1.us-west-2.9np3MYPs3fEaOBysGKSlUD4KtcmPijcmS9Az2Hwf7iQ=:AmazonSES X-SES-Outgoing: 2024.02.15-54.240.27.23 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 15 Feb 2024 17:32:36 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/195607 Hello, this email is a notification from the Auto Upgrade Helper that the automatic attempt to upgrade the recipe *swig* to *4.2.0* has Succeeded. Next steps: - apply the patch: git am 0001-swig-upgrade-4.1.1-4.2.0.patch - check the changes to upstream patches and summarize them in the commit message, - compile an image that contains the package - perform some basic sanity tests - amend the patch and sign it off: git commit -s --reset-author --amend - send it to the appropriate mailing list Alternatively, if you believe the recipe should not be upgraded at this time, you can fill RECIPE_NO_UPDATE_REASON in respective recipe file so that automatic upgrades would no longer be attempted. Please review the attached files for further information and build/update failures. Any problem please file a bug at https://bugzilla.yoctoproject.org/enter_bug.cgi?product=Automated%20Update%20Handler Regards, The Upgrade Helper -- >8 -- From 17814f1e6a13bd53f4363c49f9e9055ee5d43355 Mon Sep 17 00:00:00 2001 From: Upgrade Helper Date: Thu, 15 Feb 2024 11:11:14 +0000 Subject: [PATCH] swig: upgrade 4.1.1 -> 4.2.0 --- ...self-exe-for-swig-swiglib-on-non-Win32-plat.patch | 10 ++++++---- ...configure-use-pkg-config-for-pcre-detection.patch | 6 +++--- meta/recipes-devtools/swig/swig/determinism.patch | 12 +++++++++++- .../swig/{swig_4.1.1.bb => swig_4.2.0.bb} | 2 +- 4 files changed, 21 insertions(+), 9 deletions(-) rename meta/recipes-devtools/swig/{swig_4.1.1.bb => swig_4.2.0.bb} (72%) diff --git a/meta/recipes-devtools/swig/swig/0001-Use-proc-self-exe-for-swig-swiglib-on-non-Win32-plat.patch b/meta/recipes-devtools/swig/swig/0001-Use-proc-self-exe-for-swig-swiglib-on-non-Win32-plat.patch index f27f80ea18..9c6ae389be 100644 --- a/meta/recipes-devtools/swig/swig/0001-Use-proc-self-exe-for-swig-swiglib-on-non-Win32-plat.patch +++ b/meta/recipes-devtools/swig/swig/0001-Use-proc-self-exe-for-swig-swiglib-on-non-Win32-plat.patch @@ -1,4 +1,4 @@ -From a4a0440a644c6c5e5da096efe3cf05ba309a284f Mon Sep 17 00:00:00 2001 +From ab0ab5e685bd9077c44fdca5c1a27b0f477444d7 Mon Sep 17 00:00:00 2001 From: "NODA, Kai" Date: Sun, 22 Apr 2012 17:01:02 +0900 Subject: [PATCH] Use /proc/self/exe for "swig -swiglib" on non-Win32 @@ -10,9 +10,11 @@ Upstream-Status: Submitted http://sourceforge.net/mailarchive/message.php?msg_id=29179733 --- - Source/Modules/main.cxx | 24 ++++++++++++++++++++++-- + Source/Modules/main.cxx | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) +diff --git a/Source/Modules/main.cxx b/Source/Modules/main.cxx +index 8a44921..8250dee 100644 --- a/Source/Modules/main.cxx +++ b/Source/Modules/main.cxx @@ -25,6 +25,11 @@ @@ -27,7 +29,7 @@ http://sourceforge.net/mailarchive/message.php?msg_id=29179733 // Global variables -@@ -934,9 +939,9 @@ int SWIG_main(int argc, char *argv[], co +@@ -886,9 +891,9 @@ int SWIG_main(int argc, char *argv[], const TargetLanguageModule *tlm) { // Check for SWIG_LIB environment variable if ((c = getenv("SWIG_LIB")) == (char *) 0) { @@ -38,7 +40,7 @@ http://sourceforge.net/mailarchive/message.php?msg_id=29179733 if (!(GetModuleFileName(0, buf, MAX_PATH) == 0 || (p = strrchr(buf, '\\')) == 0)) { *(p + 1) = '\0'; SwigLib = NewStringf("%sLib", buf); // Native windows installation path -@@ -946,7 +951,22 @@ int SWIG_main(int argc, char *argv[], co +@@ -898,7 +903,22 @@ int SWIG_main(int argc, char *argv[], const TargetLanguageModule *tlm) { if (Len(SWIG_LIB_WIN_UNIX) > 0) SwigLibWinUnix = NewString(SWIG_LIB_WIN_UNIX); // Unix installation path using a drive letter (for msys/mingw) #else diff --git a/meta/recipes-devtools/swig/swig/0001-configure-use-pkg-config-for-pcre-detection.patch b/meta/recipes-devtools/swig/swig/0001-configure-use-pkg-config-for-pcre-detection.patch index cfcbd8c73a..9e16caecca 100644 --- a/meta/recipes-devtools/swig/swig/0001-configure-use-pkg-config-for-pcre-detection.patch +++ b/meta/recipes-devtools/swig/swig/0001-configure-use-pkg-config-for-pcre-detection.patch @@ -1,4 +1,4 @@ -From ffb785ed8d3cac3c28e014b1238d93e2bc1f0c01 Mon Sep 17 00:00:00 2001 +From 57a15651b46a0f1f84a4dd15d67d104fbfbe3f6e Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Tue, 17 Jun 2014 08:18:17 +0200 Subject: [PATCH] configure: use pkg-config for pcre detection @@ -11,10 +11,10 @@ Upstream-Status: Pending 1 file changed, 7 insertions(+), 32 deletions(-) diff --git a/configure.ac b/configure.ac -index f88004a..3a2b47c 100644 +index c060028..a330266 100644 --- a/configure.ac +++ b/configure.ac -@@ -57,39 +57,14 @@ AC_MSG_RESULT([$with_pcre]) +@@ -49,39 +49,14 @@ AC_MSG_RESULT([$with_pcre]) dnl To make configuring easier, check for a locally built PCRE using the Tools/pcre-build.sh script if test x"${with_pcre}" = xyes ; then diff --git a/meta/recipes-devtools/swig/swig/determinism.patch b/meta/recipes-devtools/swig/swig/determinism.patch index 84c399182a..417f0c4317 100644 --- a/meta/recipes-devtools/swig/swig/determinism.patch +++ b/meta/recipes-devtools/swig/swig/determinism.patch @@ -1,13 +1,23 @@ +From 25bf9893ec1f557781eb241508ea1bec959061fe Mon Sep 17 00:00:00 2001 +From: Richard Purdie +Date: Mon, 1 Mar 2021 00:11:10 +0000 +Subject: [PATCH] swig: Fix reproducibility issue + Remove the compiler commandline/platform from the compiled binary as this breaks reproducibilty. Upstream-Status: Inappropriate [OE reproducibiity fix upstream unlikely to take] RP 2021/3/1 +--- + Source/Modules/main.cxx | 1 - + 1 file changed, 1 deletion(-) +diff --git a/Source/Modules/main.cxx b/Source/Modules/main.cxx +index 8250dee..415761d 100644 --- a/Source/Modules/main.cxx +++ b/Source/Modules/main.cxx -@@ -642,7 +642,6 @@ static void getoptions(int argc, char *a +@@ -629,7 +629,6 @@ static void getoptions(int argc, char *argv[]) { } } else if (strcmp(argv[i], "-version") == 0) { fprintf(stdout, "\nSWIG Version %s\n", Swig_package_version()); diff --git a/meta/recipes-devtools/swig/swig_4.1.1.bb b/meta/recipes-devtools/swig/swig_4.2.0.bb similarity index 72% rename from meta/recipes-devtools/swig/swig_4.1.1.bb rename to meta/recipes-devtools/swig/swig_4.2.0.bb index b9e0175299..2ab4ed006c 100644 --- a/meta/recipes-devtools/swig/swig_4.1.1.bb +++ b/meta/recipes-devtools/swig/swig_4.2.0.bb @@ -4,4 +4,4 @@ SRC_URI += "file://0001-Use-proc-self-exe-for-swig-swiglib-on-non-Win32-plat.pat file://0001-configure-use-pkg-config-for-pcre-detection.patch \ file://determinism.patch \ " -SRC_URI[sha256sum] = "2af08aced8fcd65cdb5cc62426768914bedc735b1c250325203716f78e39ac9b" +SRC_URI[sha256sum] = "261ca2d7589e260762817b912c075831572b72ff2717942f75b3e51244829c97"