diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-03-01 00:11:10 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-03-01 11:12:16 +0000 |
| commit | abfe88ca97878d6a5a363b53443392f23c0a1069 (patch) | |
| tree | 22de4dc925e10fd6b1d880212214f3907d438d41 | |
| parent | ab9e43134b839218c9b057c743719dfbaced4296 (diff) | |
| download | poky-abfe88ca97878d6a5a363b53443392f23c0a1069.tar.gz poky-abfe88ca97878d6a5a363b53443392f23c0a1069.tar.bz2 poky-abfe88ca97878d6a5a363b53443392f23c0a1069.zip | |
swig: Fix reproducibility issue
Remove hardcoding the build configuration into the help/version output
from swig to make the binaries reproducible.
(From OE-Core rev: 7ed28ae9717ea9dad4e131012186d5f08e8f0bec)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/lib/oeqa/selftest/cases/reproducible.py | 1 | ||||
| -rw-r--r-- | meta/recipes-devtools/swig/swig/determinism.patch | 19 | ||||
| -rw-r--r-- | meta/recipes-devtools/swig/swig_3.0.12.bb | 1 |
3 files changed, 20 insertions, 1 deletions
diff --git a/meta/lib/oeqa/selftest/cases/reproducible.py b/meta/lib/oeqa/selftest/cases/reproducible.py index e9c6a222dc..e8ef7d93f8 100644 --- a/meta/lib/oeqa/selftest/cases/reproducible.py +++ b/meta/lib/oeqa/selftest/cases/reproducible.py @@ -44,7 +44,6 @@ exclude_packages = [ 'python3-cython', 'qemu', 'ruby-ri-docs', - 'swig', 'systemd-bootchart' ] diff --git a/meta/recipes-devtools/swig/swig/determinism.patch b/meta/recipes-devtools/swig/swig/determinism.patch new file mode 100644 index 0000000000..8ffb4bce8e --- /dev/null +++ b/meta/recipes-devtools/swig/swig/determinism.patch @@ -0,0 +1,19 @@ +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 + + +Index: swig-3.0.12/Source/Modules/main.cxx +=================================================================== +--- swig-3.0.12.orig/Source/Modules/main.cxx ++++ swig-3.0.12/Source/Modules/main.cxx +@@ -636,7 +636,6 @@ void SWIG_getoptions(int argc, char *arg + } + } else if (strcmp(argv[i], "-version") == 0) { + fprintf(stdout, "\nSWIG Version %s\n", Swig_package_version()); +- fprintf(stdout, "\nCompiled with %s [%s]\n", SWIG_CXX, SWIG_PLATFORM); + fprintf(stdout, "\nConfigured options: %cpcre\n", + #ifdef HAVE_PCRE + '+' diff --git a/meta/recipes-devtools/swig/swig_3.0.12.bb b/meta/recipes-devtools/swig/swig_3.0.12.bb index 45026c9700..090aaa8112 100644 --- a/meta/recipes-devtools/swig/swig_3.0.12.bb +++ b/meta/recipes-devtools/swig/swig_3.0.12.bb @@ -6,6 +6,7 @@ SRC_URI += "file://0001-Use-proc-self-exe-for-swig-swiglib-on-non-Win32-plat.pat file://swig-3.0.12-Coverity-fix-issue-reported-for-SWIG_Python_FixMetho.patch \ file://Python-Fix-new-GCC8-warnings-in-generated-code.patch \ file://0001-Fix-generated-code-for-constant-expressions-containi.patch \ + file://determinism.patch \ " SRC_URI[md5sum] = "82133dfa7bba75ff9ad98a7046be687c" SRC_URI[sha256sum] = "7cf9f447ae7ed1c51722efc45e7f14418d15d7a1e143ac9f09a668999f4fc94d" |