jeans/motioneyeos
jeans/motioneyeos
1
0
Fork 0
mirror of https://github.com/motioneye-project/motioneyeos.git synced 2025-07-28 05:36:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

package/apitrace: fix build under uClibc/musl

Browse Source 
Add a patch which has been merged upstream which allows apitrace to be
compiled under uClibc and musl.

Signed-off-by: Paul Cercueil <paul@crapouillou.net>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
This commit is contained in:
Paul Cercueil 2019-12-08 19:58:22 +01:00 committed by Thomas Petazzoni
parent cde2f0ce6d
commit 2cda8162d8
2 changed files with 33 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
package/apitrace/0001-dlsym-Fix-build-under-uClibc.patch Normal file
View File

@ -0,0 +1,31 @@
From 189a3b8397c61ba262a2221885e38dc514c59d94 Mon Sep 17 00:00:00 2001
From: Paul Cercueil <paul@crapouillou.net>
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 <paul@crapouillou.net>
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

6
package/apitrace/Config.in
View File

@ -1,11 +1,9 @@
comment "apitrace needs a glibc toolchain w/ C++, gcc >= 4.9" comment "apitrace needs a toolchain w/ C++, gcc >= 4.9"
depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_USES_GLIBC \ depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9
|| !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9
config BR2_PACKAGE_APITRACE config BR2_PACKAGE_APITRACE
bool "apitrace" bool "apitrace"
depends on BR2_INSTALL_LIBSTDCPP depends on BR2_INSTALL_LIBSTDCPP
depends on BR2_TOOLCHAIN_USES_GLIBC # uses glibc specific __libc_dlsym
depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9
select BR2_PACKAGE_XLIB_LIBX11 if BR2_PACKAGE_XORG7 select BR2_PACKAGE_XLIB_LIBX11 if BR2_PACKAGE_XORG7
select BR2_PACKAGE_LIBPNG select BR2_PACKAGE_LIBPNG