Skip to contentSkip to conversation

package/apitrace: needs host-python3

PATCH New Fabrice Fontaine 2 participants 4 messages Dec 14, 2019 – Dec 16, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 package/apitrace: needs host-python3

apitrace needs host-python3 since version 9.0 and
https://github.com/apitrace/apitrace/commit/78078e9025efa898f6e5402e306abdd205c7b2c0

Fixes:
- http://autobuild.buildroot.org/results/5f27556ccc9daec578fe1bf2ed516ca9921ed474

---
 package/apitrace/apitrace.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
package/apitrace/apitrace.mk +1 -1
index f9886d33c1..e6f8a2b1c5 100644
@@ -9,7 +9,7 @@ APITRACE_SITE = $(call github,apitrace,apitrace,$(APITRACE_VERSION))
 APITRACE_LICENSE = MIT
 APITRACE_LICENSE_FILES = LICENSE
 
-APITRACE_DEPENDENCIES = host-python libpng
+APITRACE_DEPENDENCIES = host-python3 libpng
 
 ifeq ($(BR2_PACKAGE_XORG7),y)
 APITRACE_DEPENDENCIES += xlib_libX11
Signature · 1 line
2.24.0
#1 lore raw

PATCH 2/2 package/apitrace: needs wchar

apitrace uses its own version of gtest which depends on wchar since version 8.0 and
https://github.com/apitrace/apitrace/commit/85cf7c8b86129699246574dfeec846e88a3f88a2

Moreover, apitrace also uses wcslen in trace_writer.cpp since at least version 8.0 and
https://github.com/apitrace/apitrace/commit/5e9a2b11b248aaa2f6f353bbcf9f600d65bcaf51

Fixes:
- http://autobuild.buildroot.org/results/5f27556ccc9daec578fe1bf2ed516ca9921ed474

---
 package/apitrace/Config.in | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
package/apitrace/Config.in +4 -2
index 45b4c307bb..08313c4891 100644
@@ -1,8 +1,10 @@
-comment "apitrace needs a toolchain w/ C++, gcc >= 4.9"
-	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9
+comment "apitrace needs a toolchain w/ C++, wchar, gcc >= 4.9"
+	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \
+		!BR2_TOOLCHAIN_GCC_AT_LEAST_4_9
 
 config BR2_PACKAGE_APITRACE
 	bool "apitrace"
+	depends on BR2_USE_WCHAR
 	depends on BR2_INSTALL_LIBSTDCPP
 	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9
 	select BR2_PACKAGE_XLIB_LIBX11 if BR2_PACKAGE_XORG7
Signature · 1 line
2.24.0
#2 lore raw

PATCH 2/2 package/apitrace: needs wchar

Quoted 8 lines · On Sat, 14 Dec 2019 12:38:17 +0100 Fabrice Fontaine…

apitrace uses its own version of gtest which depends on wchar since version 8.0 and
https://github.com/apitrace/apitrace/commit/85cf7c8b86129699246574dfeec846e88a3f88a2

Moreover, apitrace also uses wcslen in trace_writer.cpp since at least version 8.0 and
https://github.com/apitrace/apitrace/commit/5e9a2b11b248aaa2f6f353bbcf9f600d65bcaf51

Quoted 7 lines

Fixes:
- http://autobuild.buildroot.org/results/5f27556ccc9daec578fe1bf2ed516ca9921ed474

---
 package/apitrace/Config.in | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

Applied to master, thanks.

Thomas

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

PATCH 1/2 package/apitrace: needs host-python3

In reply to Fabrice Fontaine
Quoted 2 lines · On Sat, 14 Dec 2019 12:38:16 +0100 Fabrice Fontaine…

apitrace needs host-python3 since version 9.0 and
https://github.com/apitrace/apitrace/commit/78078e9025efa898f6e5402e306abdd205c7b2c0

This commit is just updating their CI to force using Python 3.x, it's not the commit that makes apitrace require Python 3.x. The actual commit is:

https://github.com/apitrace/apitrace/commit/0b8b019952f2668a5e8786cc2d331062b958f02e

I've updated the commit log accordingly, and applied. Thanks!

Thomas

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