Skip to contentSkip to conversation

package/apitrace: bump to version 10.0

PATCH New Fabrice Fontaine 2 participants 2 messages Jul 17, 2021 – Jul 18, 2021

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 package/apitrace: bump to version 10.0

- Drop all patches (already in version)
- C++17 and gcc >= 7 is required since
https://github.com/apitrace/apitrace/commit/37c36e66b8cfa534797ca565c22e8c30923f35d4
- Update indentation in hash file (two spaces)

---
 .../0001-dlsym-Fix-build-under-uClibc.patch   |  31 ------
 ...t-libc-that-don-t-have-RTLD_DEEPBIND.patch |  25 -----
 ...eLists.txt-respect-BUILD_TESTING-OFF.patch | 104 ------------------
 package/apitrace/Config.in                    |   6 +-
 package/apitrace/apitrace.hash                |   4 +-
 package/apitrace/apitrace.mk                  |   2 +-
 6 files changed, 6 insertions(+), 166 deletions(-)
 delete mode 100644 package/apitrace/0001-dlsym-Fix-build-under-uClibc.patch
 delete mode 100644 package/apitrace/0002-Support-libc-that-don-t-have-RTLD_DEEPBIND.patch
 delete mode 100644 package/apitrace/0003-CMakeLists.txt-respect-BUILD_TESTING-OFF.patch
package/apitrace/0001-dlsym-Fix-build-under-uClibc.patch deleted +0 -31
deleted file mode 100644
index bf47bba931..0000000000
@@ -1,31 +0,0 @@
-From 189a3b8397c61ba262a2221885e38dc514c59d94 Mon Sep 17 00:00:00 2001
-From: Paul Cercueil <[email protected]>
-Date: Sat, 7 Dec 2019 00:00:57 +0100
-Subject: [PATCH] dlsym: Fix build under uClibc
-
-uClibc defines the __GLIBC__ macro too (I know, right?), so verify that
-__UCLIBC__ is not defined before we can use glibc-specific internal
-functions.
-
-Signed-off-by: Paul Cercueil <[email protected]>
-Upstream: https://github.com/apitrace/apitrace/commit/189a3b8397c61ba262a2221885e38dc514c59d94
----
- wrappers/dlsym.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/wrappers/dlsym.cpp b/wrappers/dlsym.cpp
-index 2eda082a..5ab8465b 100644
---- a/wrappers/dlsym.cpp
-+++ b/wrappers/dlsym.cpp
-@@ -34,7 +34,7 @@
- #include "os.hpp"
- 
- 
--#ifdef __GLIBC__
-+#if defined(__GLIBC__) && !defined(__UCLIBC__)
- 
- 
- #include <dlfcn.h>
--- 
-2.24.0
-
package/apitrace/0002-Support-libc-that-don-t-have-RTLD_DEEPBIND.patch deleted +0 -25
deleted file mode 100644
index e34357428a..0000000000
@@ -1,25 +0,0 @@
-From d495d15e20bf655afa3be62ada792e8dfc8d29b6 Mon Sep 17 00:00:00 2001
-From: Gleb Mazovetskiy <[email protected]>
-Date: Fri, 13 Dec 2019 13:39:19 +0000
-Subject: [PATCH] Support libc that don't have RTLD_DEEPBIND
-
-[Retrieved from: https://github.com/apitrace/apitrace/pull/646]
-Signed-off-by: Fabrice Fontaine <[email protected]>
----
- dispatch/glproc_gl.cpp | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/dispatch/glproc_gl.cpp b/dispatch/glproc_gl.cpp
-index 5d7903a0c..456fcc42e 100644
---- a/dispatch/glproc_gl.cpp
-+++ b/dispatch/glproc_gl.cpp
-@@ -148,6 +148,9 @@ _getPrivateProcAddress(const char *procName)
- 
- #else
- 
-+#ifndef RTLD_DEEPBIND
-+#define RTLD_DEEPBIND 0
-+#endif
- 
- static inline void
- logSymbol(const char *name, void *ptr) {
package/apitrace/0003-CMakeLists.txt-respect-BUILD_TESTING-OFF.patch deleted +0 -104

104 lines not on this page · raw message

package/apitrace/Config.in +3 -3
index 263eec5e7d..44bd696431 100644
@@ -1,8 +1,8 @@
-comment "apitrace needs a toolchain w/ C++, wchar, dynamic library, threads, gcc >= 4.9"
+comment "apitrace needs a toolchain w/ C++, wchar, dynamic library, threads, gcc >= 7"
 	depends on BR2_USE_MMU
 	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \
 		BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS || \
-		!BR2_TOOLCHAIN_GCC_AT_LEAST_4_9
+		!BR2_TOOLCHAIN_GCC_AT_LEAST_7
 
 config BR2_PACKAGE_APITRACE
 	bool "apitrace"
@@ -10,7 +10,7 @@ config BR2_PACKAGE_APITRACE
 	depends on BR2_USE_WCHAR
 	depends on BR2_INSTALL_LIBSTDCPP
 	depends on !BR2_STATIC_LIBS # dlfcn.h
-	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9
+	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 # C++17
 	depends on BR2_TOOLCHAIN_HAS_THREADS
 	select BR2_PACKAGE_XLIB_LIBX11 if BR2_PACKAGE_XORG7
 	select BR2_PACKAGE_LIBPNG
package/apitrace/apitrace.hash +2 -2
index 9479f06425..7ccf6cfbe1 100644
@@ -1,3 +1,3 @@
 # Locally calculated
-sha256 0eec81ba7d3799622336319785465a2982a0621898842517a07894d7e2aa18eb  apitrace-9.0.tar.gz
-sha256 7066bb1b787519c42f8278b77757c21de522cd97755cb30a22759ac401c62260  LICENSE
+sha256  2e57d37af39369d7ce78666acb8afb1a49ec758f683a21077ec39eb0befae4ad  apitrace-10.0.tar.gz
+sha256  7066bb1b787519c42f8278b77757c21de522cd97755cb30a22759ac401c62260  LICENSE
package/apitrace/apitrace.mk +1 -1
index b962ac01d3..3656a5722b 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-APITRACE_VERSION = 9.0
+APITRACE_VERSION = 10.0
 APITRACE_SITE = $(call github,apitrace,apitrace,$(APITRACE_VERSION))
 APITRACE_LICENSE = MIT
 APITRACE_LICENSE_FILES = LICENSE
Signature · 1 line
2.30.2
#1 lore raw

PATCH 1/1 package/apitrace: bump to version 10.0

Quoted 6 lines · On Sat, 17 Jul 2021 16:50:37 +0200 Fabrice Fontaine…

- Drop all patches (already in version)
- C++17 and gcc >= 7 is required since
https://github.com/apitrace/apitrace/commit/37c36e66b8cfa534797ca565c22e8c30923f35d4
- Update indentation in hash file (two spaces)

Quoted 11 lines
---
 .../0001-dlsym-Fix-build-under-uClibc.patch   |  31 ------
 ...t-libc-that-don-t-have-RTLD_DEEPBIND.patch |  25 -----
 ...eLists.txt-respect-BUILD_TESTING-OFF.patch | 104 ------------------
 package/apitrace/Config.in                    |   6 +-
 package/apitrace/apitrace.hash                |   4 +-
 package/apitrace/apitrace.mk                  |   2 +-
 6 files changed, 6 insertions(+), 166 deletions(-)
 delete mode 100644 package/apitrace/0001-dlsym-Fix-build-under-uClibc.patch
 delete mode 100644 package/apitrace/0002-Support-libc-that-don-t-have-RTLD_DEEPBIND.patch
 delete mode 100644 package/apitrace/0003-CMakeLists.txt-respect-BUILD_TESTING-OFF.patch

Applied to master, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com