* [OE-core] [PATCH] swig: upgrade 4.1.1 -> 4.2.0
@ 2024-01-15 9:27 wangmy
2024-01-17 14:53 ` Alexandre Belloni
0 siblings, 1 reply; 3+ messages in thread
From: wangmy @ 2024-01-15 9:27 UTC (permalink / raw)
To: openembedded-core; +Cc: Wang Mingyu
From: Wang Mingyu <wangmy@fujitsu.com>
0001-Use-proc-self-exe-for-swig-swiglib-on-non-Win32-plat.patch
0001-configure-use-pkg-config-for-pcre-detection.patch
determinism.patch
refreshed for 4.2.0
Changelog:
============
-Various template wrapping improvements: template template parameters,
variadic templates, partially specialized templates, const template
parameters and improved error checking instantiating templates.
-Improved decltype() support for expressions.
-C++14 auto without trailing return type and C++11 auto variables.
-Numerous C++ using declarations improvements.
-Numerous fixes for constructors, destructors and assignment operators:
implicit, default and deleted and related non-assignable variable
wrappers.
-STL: std::array and std::map improvements, std::string_view support
added.
-Various C preprocessor improvements.
-Various issues fixed to do with architecture specific long type.
-Various Doxygen improvements.
-D1/Tango support removed. D2/Phobos is now the supported D version
and SWIG now generates code which works with recent D2 releases.
-New Javascript generator targeting Node.js binary stable ABI Node-API.
-Octave 8.1 support added.
-PHP7 support removed, PHP8 is now the supported PHP version.
-Python STL container wrappers now use the Python Iterator Protocol.
-Python stable ABI support added.
-Python 3.12 support added.
-Ruby 3.2 and 3.3 support.
-Scilab 2023.* support added.
-Various minor enhancements for C#, Go, Guile, Javascript, Lua, Ocaml,
Perl, PHP, R, Racket, Ruby, Scilab and Tcl.
-A number of deprecated features have been removed.
Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
---
...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..3f9c298430 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 ca02368e2fcb469649534e00eeb21a3c86300f1e Mon Sep 17 00:00:00 2001
From: "NODA, Kai" <nodakai@gmail.com>
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..40e98af77c 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 94f53f3f6629c2b7ffcffe0dd6ff4b5874271d26 Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen.kooi@linaro.org>
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..8e6b01deb3 100644
--- a/meta/recipes-devtools/swig/swig/determinism.patch
+++ b/meta/recipes-devtools/swig/swig/determinism.patch
@@ -1,13 +1,23 @@
+From 2a106412fa86e57b6c069a6498fa6181ec5f983e Mon Sep 17 00:00:00 2001
+From: Richard Purdie <richard.purdie@linuxfoundation.org>
+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"
--
2.34.1
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [OE-core] [PATCH] swig: upgrade 4.1.1 -> 4.2.0
2024-01-15 9:27 [OE-core] [PATCH] swig: upgrade 4.1.1 -> 4.2.0 wangmy
@ 2024-01-17 14:53 ` Alexandre Belloni
2024-01-17 16:02 ` Khem Raj
0 siblings, 1 reply; 3+ messages in thread
From: Alexandre Belloni @ 2024-01-17 14:53 UTC (permalink / raw)
To: wangmy; +Cc: openembedded-core
Hello,
This causes failures on the autobuilders:
https://autobuilder.yoctoproject.org/typhoon/#/builders/117/builds/4241/steps/12/logs/stdio
https://autobuilder.yoctoproject.org/typhoon/#/builders/64/builds/8438/steps/11/logs/stdio
https://autobuilder.yoctoproject.org/typhoon/#/builders/45/builds/8470/steps/11/logs/stdio
https://autobuilder.yoctoproject.org/typhoon/#/builders/40/builds/8446/steps/11/logs/stdio
https://autobuilder.yoctoproject.org/typhoon/#/builders/52/builds/8314/steps/12/logs/stdio
https://autobuilder.yoctoproject.org/typhoon/#/builders/108/builds/5592/steps/11/logs/stdio
On 15/01/2024 17:27:54+0800, wangmy wrote:
> From: Wang Mingyu <wangmy@fujitsu.com>
>
> 0001-Use-proc-self-exe-for-swig-swiglib-on-non-Win32-plat.patch
> 0001-configure-use-pkg-config-for-pcre-detection.patch
> determinism.patch
> refreshed for 4.2.0
>
> Changelog:
> ============
> -Various template wrapping improvements: template template parameters,
> variadic templates, partially specialized templates, const template
> parameters and improved error checking instantiating templates.
> -Improved decltype() support for expressions.
> -C++14 auto without trailing return type and C++11 auto variables.
> -Numerous C++ using declarations improvements.
> -Numerous fixes for constructors, destructors and assignment operators:
> implicit, default and deleted and related non-assignable variable
> wrappers.
> -STL: std::array and std::map improvements, std::string_view support
> added.
> -Various C preprocessor improvements.
> -Various issues fixed to do with architecture specific long type.
> -Various Doxygen improvements.
> -D1/Tango support removed. D2/Phobos is now the supported D version
> and SWIG now generates code which works with recent D2 releases.
> -New Javascript generator targeting Node.js binary stable ABI Node-API.
> -Octave 8.1 support added.
> -PHP7 support removed, PHP8 is now the supported PHP version.
> -Python STL container wrappers now use the Python Iterator Protocol.
> -Python stable ABI support added.
> -Python 3.12 support added.
> -Ruby 3.2 and 3.3 support.
> -Scilab 2023.* support added.
> -Various minor enhancements for C#, Go, Guile, Javascript, Lua, Ocaml,
> Perl, PHP, R, Racket, Ruby, Scilab and Tcl.
> -A number of deprecated features have been removed.
>
> Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
> ---
> ...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..3f9c298430 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 ca02368e2fcb469649534e00eeb21a3c86300f1e Mon Sep 17 00:00:00 2001
> From: "NODA, Kai" <nodakai@gmail.com>
> 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..40e98af77c 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 94f53f3f6629c2b7ffcffe0dd6ff4b5874271d26 Mon Sep 17 00:00:00 2001
> From: Koen Kooi <koen.kooi@linaro.org>
> 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..8e6b01deb3 100644
> --- a/meta/recipes-devtools/swig/swig/determinism.patch
> +++ b/meta/recipes-devtools/swig/swig/determinism.patch
> @@ -1,13 +1,23 @@
> +From 2a106412fa86e57b6c069a6498fa6181ec5f983e Mon Sep 17 00:00:00 2001
> +From: Richard Purdie <richard.purdie@linuxfoundation.org>
> +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"
> --
> 2.34.1
>
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#193664): https://lists.openembedded.org/g/openembedded-core/message/193664
> Mute This Topic: https://lists.openembedded.org/mt/103735728/3617179
> Group Owner: openembedded-core+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [alexandre.belloni@bootlin.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
--
Alexandre Belloni, co-owner and COO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [OE-core] [PATCH] swig: upgrade 4.1.1 -> 4.2.0
2024-01-17 14:53 ` Alexandre Belloni
@ 2024-01-17 16:02 ` Khem Raj
0 siblings, 0 replies; 3+ messages in thread
From: Khem Raj @ 2024-01-17 16:02 UTC (permalink / raw)
To: alexandre.belloni; +Cc: wangmy, openembedded-core
On Wed, Jan 17, 2024 at 6:54 AM Alexandre Belloni via
lists.openembedded.org
<alexandre.belloni=bootlin.com@lists.openembedded.org> wrote:
>
> Hello,
>
> This causes failures on the autobuilders:
> https://autobuilder.yoctoproject.org/typhoon/#/builders/117/builds/4241/steps/12/logs/stdio
> https://autobuilder.yoctoproject.org/typhoon/#/builders/64/builds/8438/steps/11/logs/stdio
> https://autobuilder.yoctoproject.org/typhoon/#/builders/45/builds/8470/steps/11/logs/stdio
> https://autobuilder.yoctoproject.org/typhoon/#/builders/40/builds/8446/steps/11/logs/stdio
> https://autobuilder.yoctoproject.org/typhoon/#/builders/52/builds/8314/steps/12/logs/stdio
> https://autobuilder.yoctoproject.org/typhoon/#/builders/108/builds/5592/steps/11/logs/stdio
>
yes I also see this
bindings/python3/../src/capng_swig.i:33: Error: Unknown directive '%except'.
compiling libcap-ng-python which is related to this.
>
> On 15/01/2024 17:27:54+0800, wangmy wrote:
> > From: Wang Mingyu <wangmy@fujitsu.com>
> >
> > 0001-Use-proc-self-exe-for-swig-swiglib-on-non-Win32-plat.patch
> > 0001-configure-use-pkg-config-for-pcre-detection.patch
> > determinism.patch
> > refreshed for 4.2.0
> >
> > Changelog:
> > ============
> > -Various template wrapping improvements: template template parameters,
> > variadic templates, partially specialized templates, const template
> > parameters and improved error checking instantiating templates.
> > -Improved decltype() support for expressions.
> > -C++14 auto without trailing return type and C++11 auto variables.
> > -Numerous C++ using declarations improvements.
> > -Numerous fixes for constructors, destructors and assignment operators:
> > implicit, default and deleted and related non-assignable variable
> > wrappers.
> > -STL: std::array and std::map improvements, std::string_view support
> > added.
> > -Various C preprocessor improvements.
> > -Various issues fixed to do with architecture specific long type.
> > -Various Doxygen improvements.
> > -D1/Tango support removed. D2/Phobos is now the supported D version
> > and SWIG now generates code which works with recent D2 releases.
> > -New Javascript generator targeting Node.js binary stable ABI Node-API.
> > -Octave 8.1 support added.
> > -PHP7 support removed, PHP8 is now the supported PHP version.
> > -Python STL container wrappers now use the Python Iterator Protocol.
> > -Python stable ABI support added.
> > -Python 3.12 support added.
> > -Ruby 3.2 and 3.3 support.
> > -Scilab 2023.* support added.
> > -Various minor enhancements for C#, Go, Guile, Javascript, Lua, Ocaml,
> > Perl, PHP, R, Racket, Ruby, Scilab and Tcl.
> > -A number of deprecated features have been removed.
> >
> > Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
> > ---
> > ...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..3f9c298430 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 ca02368e2fcb469649534e00eeb21a3c86300f1e Mon Sep 17 00:00:00 2001
> > From: "NODA, Kai" <nodakai@gmail.com>
> > 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..40e98af77c 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 94f53f3f6629c2b7ffcffe0dd6ff4b5874271d26 Mon Sep 17 00:00:00 2001
> > From: Koen Kooi <koen.kooi@linaro.org>
> > 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..8e6b01deb3 100644
> > --- a/meta/recipes-devtools/swig/swig/determinism.patch
> > +++ b/meta/recipes-devtools/swig/swig/determinism.patch
> > @@ -1,13 +1,23 @@
> > +From 2a106412fa86e57b6c069a6498fa6181ec5f983e Mon Sep 17 00:00:00 2001
> > +From: Richard Purdie <richard.purdie@linuxfoundation.org>
> > +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"
> > --
> > 2.34.1
> >
>
> >
> >
> >
>
>
> --
> Alexandre Belloni, co-owner and COO, Bootlin
> Embedded Linux and Kernel engineering
> https://bootlin.com
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#193916): https://lists.openembedded.org/g/openembedded-core/message/193916
> Mute This Topic: https://lists.openembedded.org/mt/103735728/1997914
> Group Owner: openembedded-core+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [raj.khem@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2024-01-17 16:02 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-01-15 9:27 [OE-core] [PATCH] swig: upgrade 4.1.1 -> 4.2.0 wangmy
2024-01-17 14:53 ` Alexandre Belloni
2024-01-17 16:02 ` Khem Raj
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.