From 9fdc7960bafe32e762b76a2d88fdaf75b9146597 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Wed, 1 Sep 2021 10:11:22 -0700 Subject: apitrace: Enable on glibc >= 2.34 Drop unused patch Signed-off-by: Khem Raj --- ...glibc-2.34-build-failure-by-disabling-dls.patch | 28 ++++++++++++++++++ .../0001-libbacktrace-include-config.h.patch | 33 ---------------------- meta-oe/recipes-devtools/apitrace/apitrace_10.0.bb | 4 +-- 3 files changed, 29 insertions(+), 36 deletions(-) create mode 100644 meta-oe/recipes-devtools/apitrace/apitrace/0001-Workaround-glibc-2.34-build-failure-by-disabling-dls.patch delete mode 100644 meta-oe/recipes-devtools/apitrace/apitrace/0001-libbacktrace-include-config.h.patch (limited to 'meta-oe/recipes-devtools') diff --git a/meta-oe/recipes-devtools/apitrace/apitrace/0001-Workaround-glibc-2.34-build-failure-by-disabling-dls.patch b/meta-oe/recipes-devtools/apitrace/apitrace/0001-Workaround-glibc-2.34-build-failure-by-disabling-dls.patch new file mode 100644 index 0000000000..92edc4404c --- /dev/null +++ b/meta-oe/recipes-devtools/apitrace/apitrace/0001-Workaround-glibc-2.34-build-failure-by-disabling-dls.patch @@ -0,0 +1,28 @@ +From 1926700b367745e976dae9d9dc2236da21f4435b Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Wed, 1 Sep 2021 10:07:48 -0700 +Subject: [PATCH] Workaround glibc 2.34 build failure by disabling dlsym + wrapper + +Upstream-Status: Pending +Signed-off-by: Khem Raj +--- + wrappers/dlsym.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/wrappers/dlsym.cpp b/wrappers/dlsym.cpp +index 5ab8465b..d353bbf7 100644 +--- a/wrappers/dlsym.cpp ++++ b/wrappers/dlsym.cpp +@@ -34,7 +34,7 @@ + #include "os.hpp" + + +-#if defined(__GLIBC__) && !defined(__UCLIBC__) ++#if defined(__GLIBC__) && !defined(__UCLIBC__) && !(__GLIBC__ == 2 && __GLIBC_MINOR__ >= 34) + + + #include +-- +2.33.0 + diff --git a/meta-oe/recipes-devtools/apitrace/apitrace/0001-libbacktrace-include-config.h.patch b/meta-oe/recipes-devtools/apitrace/apitrace/0001-libbacktrace-include-config.h.patch deleted file mode 100644 index 87fb4992d4..0000000000 --- a/meta-oe/recipes-devtools/apitrace/apitrace/0001-libbacktrace-include-config.h.patch +++ /dev/null @@ -1,33 +0,0 @@ -From bdd5f0834d95a9598b0d87a18e7e96afade9d418 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Mon, 10 May 2021 15:28:05 -0700 -Subject: [PATCH] libbacktrace: include config.h - -Fixes -thirdparty/libbacktrace/backtrace.h:53:10: fatal error: gstdint.h: No such file or directory - 53 | #include "gstdint.h" - | ^~~~~~~~~~~ -compilation terminated. - -Upstream-Status: Pending - -Signed-off-by: Khem Raj ---- - thirdparty/libbacktrace/backtrace.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/thirdparty/libbacktrace/backtrace.h b/thirdparty/libbacktrace/backtrace.h -index 2814763f..802cf989 100644 ---- a/thirdparty/libbacktrace/backtrace.h -+++ b/thirdparty/libbacktrace/backtrace.h -@@ -33,6 +33,7 @@ POSSIBILITY OF SUCH DAMAGE. */ - #ifndef BACKTRACE_H - #define BACKTRACE_H - -+#include - #include - #include - --- -2.31.1 - diff --git a/meta-oe/recipes-devtools/apitrace/apitrace_10.0.bb b/meta-oe/recipes-devtools/apitrace/apitrace_10.0.bb index 872aeb824a..ca828b0b44 100644 --- a/meta-oe/recipes-devtools/apitrace/apitrace_10.0.bb +++ b/meta-oe/recipes-devtools/apitrace/apitrace_10.0.bb @@ -8,6 +8,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=aeb969185a143c3c25130bc2c3ef9a50 \ SRCREV = "9d42f667e2a36a6624d92b9bd697de097cc4e619" PV .= "+10.0.1+git${SRCPV}" SRC_URI = "gitsm://github.com/${BPN}/${BPN}.git \ + file://0001-Workaround-glibc-2.34-build-failure-by-disabling-dls.patch \ " S = "${WORKDIR}/git" @@ -30,6 +31,3 @@ EXTRA_OECMAKE += "\ " SECURITY_CFLAGS:toolchain-clang = "" - -# see https://github.com/apitrace/apitrace/issues/756 -PNBLACKLIST[apitrace] ?= "Needs porting to glibc 2.34+" -- cgit 1.2.3-korg