summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta-oe/recipes-devtools/apitrace/apitrace/0001-Workaround-glibc-2.34-build-failure-by-disabling-dls.patch28
-rw-r--r--meta-oe/recipes-devtools/apitrace/apitrace_10.0.bb3
2 files changed, 1 insertions, 30 deletions
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
deleted file mode 100644
index 92edc4404c..0000000000
--- a/meta-oe/recipes-devtools/apitrace/apitrace/0001-Workaround-glibc-2.34-build-failure-by-disabling-dls.patch
+++ /dev/null
@@ -1,28 +0,0 @@
1From 1926700b367745e976dae9d9dc2236da21f4435b Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Wed, 1 Sep 2021 10:07:48 -0700
4Subject: [PATCH] Workaround glibc 2.34 build failure by disabling dlsym
5 wrapper
6
7Upstream-Status: Pending
8Signed-off-by: Khem Raj <raj.khem@gmail.com>
9---
10 wrappers/dlsym.cpp | 2 +-
11 1 file changed, 1 insertion(+), 1 deletion(-)
12
13diff --git a/wrappers/dlsym.cpp b/wrappers/dlsym.cpp
14index 5ab8465b..d353bbf7 100644
15--- a/wrappers/dlsym.cpp
16+++ b/wrappers/dlsym.cpp
17@@ -34,7 +34,7 @@
18 #include "os.hpp"
19
20
21-#if defined(__GLIBC__) && !defined(__UCLIBC__)
22+#if defined(__GLIBC__) && !defined(__UCLIBC__) && !(__GLIBC__ == 2 && __GLIBC_MINOR__ >= 34)
23
24
25 #include <dlfcn.h>
26--
272.33.0
28
diff --git a/meta-oe/recipes-devtools/apitrace/apitrace_10.0.bb b/meta-oe/recipes-devtools/apitrace/apitrace_10.0.bb
index ca828b0b44..57ec1f8e01 100644
--- a/meta-oe/recipes-devtools/apitrace/apitrace_10.0.bb
+++ b/meta-oe/recipes-devtools/apitrace/apitrace_10.0.bb
@@ -5,10 +5,9 @@ LICENSE = "MIT & BSD-3-Clause"
5LIC_FILES_CHKSUM = "file://LICENSE;md5=aeb969185a143c3c25130bc2c3ef9a50 \ 5LIC_FILES_CHKSUM = "file://LICENSE;md5=aeb969185a143c3c25130bc2c3ef9a50 \
6 file://thirdparty/snappy/COPYING;md5=f62f3080324a97b3159a7a7e61812d0c" 6 file://thirdparty/snappy/COPYING;md5=f62f3080324a97b3159a7a7e61812d0c"
7 7
8SRCREV = "9d42f667e2a36a6624d92b9bd697de097cc4e619" 8SRCREV = "d28a980802ad48568c87da02d630c8babfe163bb"
9PV .= "+10.0.1+git${SRCPV}" 9PV .= "+10.0.1+git${SRCPV}"
10SRC_URI = "gitsm://github.com/${BPN}/${BPN}.git \ 10SRC_URI = "gitsm://github.com/${BPN}/${BPN}.git \
11 file://0001-Workaround-glibc-2.34-build-failure-by-disabling-dls.patch \
12 " 11 "
13 12
14S = "${WORKDIR}/git" 13S = "${WORKDIR}/git"