* removed all backported patches * fixed patch fuzz issue
Signed-off-by: Victor Kamensky <[email protected]> --- ...ython-modules-to-correct-library-dir.patch | 11 ++-- ...gcc-version-compatibility-hack-redux.patch | 32 ------------ ...e.cxx-gcc-version-compatibility-hack.patch | 52 ------------------- .../systemtap/systemtap_git.inc | 6 +-- 4 files changed, 6 insertions(+), 95 deletions(-) delete mode 100644 meta/recipes-kernel/systemtap/systemtap/0001-elaborate.cxx-gcc-version-compatibility-hack-redux.patch delete mode 100644 meta/recipes-kernel/systemtap/systemtap/0001-elaborate.cxx-gcc-version-compatibility-hack.patch diff --git a/meta/recipes-kernel/systemtap/systemtap/0001-Install-python-modules-to-correct-library-dir.patch b/meta/recipes-kernel/systemtap/systemtap/0001-Install-python-modules-to-correct-library-dir.patch index 48cf4aee85..ee9baedcda 100644 --- a/meta/recipes-kernel/systemtap/systemtap/0001-Install-python-modules-to-correct-library-dir.patch +++ b/meta/recipes-kernel/systemtap/systemtap/0001-Install-python-modules-to-correct-library-dir.patch @@ -1,4 +1,4 @@ -From 2ada22f05460223924efe54080cb4419e2b4c276 Mon Sep 17 00:00:00 2001 +From 18d088d10c1a0885fa25ac40591e38c8aa545c81 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <[email protected]> Date: Fri, 24 Feb 2017 17:53:02 +0200 Subject: [PATCH] Install python modules to correct library dir. @@ -19,7 +19,7 @@ Signed-off-by: Hongxu Jia <[email protected]> 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/python/Makefile.am b/python/Makefile.am -index a254480..578602f 100644 +index 13618dc2f..9d5cb7bcb 100644 --- a/python/Makefile.am +++ b/python/Makefile.am @@ -8,6 +8,10 @@ AUTOMAKE_OPTIONS = subdir-objects @@ -35,7 +35,7 @@ index a254480..578602f 100644 pkglibexecpython_PYTHON = @@ -47,7 +51,7 @@ install-exec-local: if HAVE_PYTHON2_PROBES - (cd $(srcdir); CFLAGS="$(AM_CPPFLAGS)" $(PYTHON) setup.py build \ + (cd $(srcdir); CFLAGS="$(CFLAGS) $(AM_CPPFLAGS)" $(PYTHON) setup.py build \ --build-base $(shell readlink -f $(builddir))/py2build \ - install --prefix $(DESTDIR)$(prefix) \ + install --root $(DESTDIR) --prefix $(prefix) --prefix $(prefix) --install-lib=${pythondir} \ @@ -44,13 +44,10 @@ index a254480..578602f 100644 --verbose) @@ -55,7 +59,7 @@ endif if HAVE_PYTHON3_PROBES - (cd $(srcdir); CFLAGS="$(AM_CPPFLAGS)" $(PYTHON3) setup.py build \ + (cd $(srcdir); CFLAGS="$(CFLAGS) $(AM_CPPFLAGS)" $(PYTHON3) setup.py build \ --build-base $(shell readlink -f $(builddir))/py3build \ - install --prefix $(DESTDIR)$(prefix) \ + install --root $(DESTDIR) --prefix $(prefix) --install-lib=${python3dir} \ --single-version-externally-managed \ --record $(shell readlink -f $(builddir))/py3build/install_files.txt \ --verbose) --- -2.7.4 - diff --git a/meta/recipes-kernel/systemtap/systemtap/0001-elaborate.cxx-gcc-version-compatibility-hack-redux.patch b/meta/recipes-kernel/systemtap/systemtap/0001-elaborate.cxx-gcc-version-compatibility-hack-redux.patch deleted file mode 100644 index 0c2888400d..0000000000 --- a/meta/recipes-kernel/systemtap/systemtap/0001-elaborate.cxx-gcc-version-compatibility-hack-redux.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 91caf37e4dfe862f9b68447b1597c0d0f31523c3 Mon Sep 17 00:00:00 2001 -From: "Frank Ch. Eigler" <[email protected]> -Date: Tue, 7 May 2024 15:04:04 -0400 -Subject: [PATCH] elaborate.cxx: gcc version compatibility hack redux - -Note __GNUC__ >= 14 for this diagnostic. - -Upstream-Status: Backport [https://sourceware.org/git/?p=systemtap.git;a=commit;h=91caf37e4dfe862f9b68447b1597c0d0f31523c3] -Signed-off-by: Victor Kamensky <[email protected]> ---- - elaborate.cxx | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/elaborate.cxx b/elaborate.cxx -index 88505559b..c08023f1d 100644 ---- a/elaborate.cxx -+++ b/elaborate.cxx -@@ -2656,9 +2656,11 @@ symresolution_info::symresolution_info (systemtap_session& s, bool omniscient_un - session (s), unmangled_p(omniscient_unmangled), current_function (0), current_probe (0) - { - #pragma GCC diagnostic push -+ #if __GNUC__ >= 14 - // c10s early snapshot GCC complains about this construct, which is - // made safe via our dtor usage - #pragma GCC diagnostic ignored "-Wdangling-pointer" -+ #endif - saved_session_symbol_resolver = s.symbol_resolver; - s.symbol_resolver = this; // save resolver for early PR25841 function resolution - #pragma GCC diagnostic pop --- -2.45.2 - diff --git a/meta/recipes-kernel/systemtap/systemtap/0001-elaborate.cxx-gcc-version-compatibility-hack.patch b/meta/recipes-kernel/systemtap/systemtap/0001-elaborate.cxx-gcc-version-compatibility-hack.patch deleted file mode 100644 index 7cdcc93f14..0000000000 --- a/meta/recipes-kernel/systemtap/systemtap/0001-elaborate.cxx-gcc-version-compatibility-hack.patch +++ /dev/null @@ -1,52 +0,0 @@ -From d11241bdd05bc4c745c8aef53a2725331e1a93b4 Mon Sep 17 00:00:00 2001 -From: "Frank Ch. Eigler" <[email protected]> -Date: Tue, 7 May 2024 14:25:12 -0400 -Subject: [PATCH] elaborate.cxx: gcc version compatibility hack -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Suppress -Wdangling-pointer for a construct that appears valid, but -one particular GCC snapshot version complains about. - -In constructor ‘symresolution_info::symresolution_info(systemtap_session&, bool)’, -inlined from ‘int semantic_pass_symbols(systemtap_session&)’ at ../systemtap/elaborate.cxx:1872:28: -../systemtap/elaborate.cxx:2659:21: error: storing the address of local variable ‘sym’ in ‘*s.systemtap_session::symbol_resolver’ [-Werror=dangling-pointer=] - 2659 | s.symbol_resolver = this; // save resolver for early PR25841 function resolution - | ~~~~~~~~~~~~~~~~~~^~~~~~ -../systemtap/elaborate.cxx: In function ‘int semantic_pass_symbols(systemtap_session&)’: -../systemtap/elaborate.cxx:1872:22: note: ‘sym’ declared here - 1872 | symresolution_info sym (s); - | ^~~ -../systemtap/elaborate.cxx:1870:43: note: ‘s’ declared here - 1870 | semantic_pass_symbols (systemtap_session& s) - | ~~~~~~~~~~~~~~~~~~~^ -cc1plus: all warnings being treated as errors - -Upstream-Status: Backport [https://sourceware.org/git/?p=systemtap.git;a=commit;h=d11241bdd05bc4c745c8aef53a2725331e1a93b4] -Signed-off-by: Victor Kamensky <[email protected]> ---- - elaborate.cxx | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/elaborate.cxx b/elaborate.cxx -index 8bf9e6c06..88505559b 100644 ---- a/elaborate.cxx -+++ b/elaborate.cxx -@@ -2655,8 +2655,13 @@ semantic_pass (systemtap_session& s) - symresolution_info::symresolution_info (systemtap_session& s, bool omniscient_unmangled): - session (s), unmangled_p(omniscient_unmangled), current_function (0), current_probe (0) - { -+ #pragma GCC diagnostic push -+ // c10s early snapshot GCC complains about this construct, which is -+ // made safe via our dtor usage -+ #pragma GCC diagnostic ignored "-Wdangling-pointer" - saved_session_symbol_resolver = s.symbol_resolver; - s.symbol_resolver = this; // save resolver for early PR25841 function resolution -+ #pragma GCC diagnostic pop - } - - --- -2.45.2 - diff --git a/meta/recipes-kernel/systemtap/systemtap_git.inc b/meta/recipes-kernel/systemtap/systemtap_git.inc index 80945ad7f8..bbb2105b5a 100644 --- a/meta/recipes-kernel/systemtap/systemtap_git.inc +++ b/meta/recipes-kernel/systemtap/systemtap_git.inc @@ -1,14 +1,12 @@ LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" -SRCREV = "3a0c9c15163520dd0d9ab07177da62ce9cc2332f" -PV = "5.1" +SRCREV = "3a92ffe673c1621309a0b60892114495b651c9de" +PV = "5.2" SRC_URI = "git://sourceware.org/git/systemtap.git;branch=master;protocol=https \ file://0001-Do-not-let-configure-write-a-python-location-into-th.patch \ file://0001-Install-python-modules-to-correct-library-dir.patch \ file://0001-staprun-stapbpf-don-t-support-installing-a-non-root.patch \ - file://0001-elaborate.cxx-gcc-version-compatibility-hack.patch \ - file://0001-elaborate.cxx-gcc-version-compatibility-hack-redux.patch \ " COMPATIBLE_HOST = '(x86_64|i.86|powerpc|arm|aarch64|microblazeel|mips|riscv64).*-linux' -- 2.45.0
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#207376): https://lists.openembedded.org/g/openembedded-core/message/207376 Mute This Topic: https://lists.openembedded.org/mt/109659957/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
