initial buildroot for linux 5.15
This commit is contained in:
@@ -0,0 +1,40 @@
|
||||
From 36ff87a927092b4d62c587736d7684dea9c82e63 Mon Sep 17 00:00:00 2001
|
||||
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
Date: Mon, 19 Jul 2021 08:27:48 +0200
|
||||
Subject: [PATCH] thirdparty/libbacktrace/backtrace/h: include config.h
|
||||
|
||||
Build on musl is broken since version 10.0 because the include on
|
||||
config.h was removed by
|
||||
https://github.com/apitrace/apitrace/commit/1544abf59d68d74977b8b692bea4d7468d65547b:
|
||||
|
||||
In file included from /home/buildroot/autobuild/instance-3/output-1/build/apitrace-10.0/thirdparty/libbacktrace/testlib.c:40:
|
||||
/home/buildroot/autobuild/instance-3/output-1/build/apitrace-10.0/thirdparty/libbacktrace/backtrace.h:53:10: fatal error: gstdint.h: No such file or directory
|
||||
53 | #include "gstdint.h"
|
||||
| ^~~~~~~~~~~
|
||||
|
||||
Fixes:
|
||||
- http://autobuild.buildroot.org/results/a10793d01efa3a1533ba37aa845b9ac2bb1dfb6b
|
||||
|
||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
[Upstream status: not needed
|
||||
(https://github.com/apitrace/apitrace/issues/755)]
|
||||
---
|
||||
thirdparty/libbacktrace/backtrace.h | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/thirdparty/libbacktrace/backtrace.h b/thirdparty/libbacktrace/backtrace.h
|
||||
index 2814763f..ab7679a0 100644
|
||||
--- a/thirdparty/libbacktrace/backtrace.h
|
||||
+++ b/thirdparty/libbacktrace/backtrace.h
|
||||
@@ -33,6 +33,8 @@ POSSIBILITY OF SUCH DAMAGE. */
|
||||
#ifndef BACKTRACE_H
|
||||
#define BACKTRACE_H
|
||||
|
||||
+#include "config.h"
|
||||
+
|
||||
#include <stddef.h>
|
||||
#include <stdio.h>
|
||||
|
||||
--
|
||||
2.30.2
|
||||
|
||||
+34
@@ -0,0 +1,34 @@
|
||||
From d28a980802ad48568c87da02d630c8babfe163bb Mon Sep 17 00:00:00 2001
|
||||
From: Jose Fonseca <jfonseca@vmware.com>
|
||||
Date: Wed, 1 Sep 2021 16:34:54 +0100
|
||||
Subject: [PATCH] gltrace: Avoid __libc_dlsym and __libc_dlopen_mode on GLIBC
|
||||
2.34.
|
||||
|
||||
These GLIBC_PRIVATE symbols are gone from GLIBC 2.34 due to the merge of
|
||||
libdl.so onto libc.so.
|
||||
|
||||
This means apitrace can't defend against infinite recursion when
|
||||
used with Steam Overlay, but at least it should work otherwise.
|
||||
|
||||
Fixes https://github.com/apitrace/apitrace/issues/756
|
||||
|
||||
[Retrieved from:
|
||||
https://github.com/apitrace/apitrace/commit/d28a980802ad48568c87da02d630c8babfe163bb]
|
||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
---
|
||||
wrappers/dlsym.cpp | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/wrappers/dlsym.cpp b/wrappers/dlsym.cpp
|
||||
index 5ab8465b0..5369af35a 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 <dlfcn.h>
|
||||
@@ -0,0 +1,22 @@
|
||||
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_7
|
||||
|
||||
config BR2_PACKAGE_APITRACE
|
||||
bool "apitrace"
|
||||
depends on BR2_USE_MMU # fork()
|
||||
depends on BR2_USE_WCHAR
|
||||
depends on BR2_INSTALL_LIBSTDCPP
|
||||
depends on !BR2_STATIC_LIBS # dlfcn.h
|
||||
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
|
||||
help
|
||||
Trace and replay OpenGL and OpenGL ES APIs calls to/from a
|
||||
file. You may install apitrace GUI from your distribution to
|
||||
inspect generated traces.
|
||||
|
||||
http://apitrace.github.io/
|
||||
@@ -0,0 +1,3 @@
|
||||
# Locally calculated
|
||||
sha256 2e57d37af39369d7ce78666acb8afb1a49ec758f683a21077ec39eb0befae4ad apitrace-10.0.tar.gz
|
||||
sha256 7066bb1b787519c42f8278b77757c21de522cd97755cb30a22759ac401c62260 LICENSE
|
||||
@@ -0,0 +1,45 @@
|
||||
################################################################################
|
||||
#
|
||||
# apitrace
|
||||
#
|
||||
################################################################################
|
||||
|
||||
APITRACE_VERSION = 10.0
|
||||
APITRACE_SITE = $(call github,apitrace,apitrace,$(APITRACE_VERSION))
|
||||
APITRACE_LICENSE = MIT
|
||||
APITRACE_LICENSE_FILES = LICENSE
|
||||
|
||||
APITRACE_DEPENDENCIES = host-python3 libpng
|
||||
|
||||
ifeq ($(BR2_PACKAGE_XORG7),y)
|
||||
APITRACE_DEPENDENCIES += xlib_libX11
|
||||
APITRACE_CONF_OPTS += -DENABLE_X11=ON
|
||||
else
|
||||
APITRACE_CONF_OPTS += -DENABLE_X11=OFF
|
||||
endif
|
||||
|
||||
# Gui was never tested, so we prefer to explicitly disable it
|
||||
APITRACE_CONF_OPTS += -DENABLE_GUI=false
|
||||
|
||||
APITRACE_CFLAGS = $(TARGET_CFLAGS)
|
||||
APITRACE_CXXFLAGS = $(TARGET_CXXFLAGS)
|
||||
|
||||
ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_68485),y)
|
||||
# This works around embedded Brotli build failure
|
||||
APITRACE_CFLAGS += -O0
|
||||
# CMakeLists.txt sets CMAKE_CXX_FLAGS_<BUILD_TYPE> depending on
|
||||
# BUILD_TYPE, and this comes after the generic CMAKE_CXX_FLAGS.
|
||||
# Override CMAKE_BUILD_TYPE so no overrides are applied.
|
||||
APITRACE_CONF_OPTS += -DCMAKE_BUILD_TYPE=Buildroot
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_85180),y)
|
||||
# This works around Apitrace itself build failure
|
||||
APITRACE_CXXFLAGS += -O0
|
||||
endif
|
||||
|
||||
APITRACE_CONF_OPTS += \
|
||||
-DCMAKE_C_FLAGS="$(APITRACE_CFLAGS)" \
|
||||
-DCMAKE_CXX_FLAGS="$(APITRACE_CXXFLAGS)"
|
||||
|
||||
$(eval $(cmake-package))
|
||||
Reference in New Issue
Block a user