[Replicant] [system_core] [PATCH] Fix the build on Trisquel 9
Denis 'GNUtoo' Carikli
GNUtoo at cyberdimension.org
Thu Aug 26 07:15:51 UTC 2021
Without that fix we have:
host C++: libbacktrace <= system/core/libbacktrace/BacktraceCurrent.cpp
In file included from system/core/libbacktrace/Backtrace.cpp:27:
system/core/include/backtrace/Backtrace.h:52:18: error:
typedef redefinition with different types ('ucontext' vs 'struct ucontext_t')
typedef ucontext ucontext_t;
^
/usr/include/x86_64-linux-gnu/sys/ucontext.h:150:5: note: previous definition is here
} ucontext_t;
^
1 error generated.
In file included from system/core/libbacktrace/BacktraceCurrent.cpp:29:
system/core/include/backtrace/Backtrace.h:52:18: error:
typedef redefinition with different types ('ucontext' vs 'struct ucontext_t')
typedef ucontext ucontext_t;
^
/usr/include/x86_64-linux-gnu/sys/ucontext.h:150:5:
note: previous definition is here
} ucontext_t;
^
So to workaround that, we disable the build of libbacktrace on the host
to avoid the conflicting headers.
Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo at cyberdimension.org>
---
libbacktrace/Android.mk | 7 -------
1 file changed, 7 deletions(-)
diff --git a/libbacktrace/Android.mk b/libbacktrace/Android.mk
index 6a689a61..97d50bcd 100644
--- a/libbacktrace/Android.mk
+++ b/libbacktrace/Android.mk
@@ -73,9 +73,6 @@ module_tag := optional
build_type := target
build_target := SHARED_LIBRARY
include $(LOCAL_PATH)/Android.build.mk
-build_type := host
-libbacktrace_multilib := both
-include $(LOCAL_PATH)/Android.build.mk
#-------------------------------------------------------------------------
# The libbacktrace_test library needed by backtrace_test.
@@ -92,8 +89,6 @@ build_type := target
build_target := SHARED_LIBRARY
libbacktrace_test_multilib := both
include $(LOCAL_PATH)/Android.build.mk
-build_type := host
-include $(LOCAL_PATH)/Android.build.mk
#-------------------------------------------------------------------------
# The backtrace_test executable.
@@ -133,8 +128,6 @@ build_type := target
build_target := NATIVE_TEST
backtrace_test_multilib := both
include $(LOCAL_PATH)/Android.build.mk
-build_type := host
-include $(LOCAL_PATH)/Android.build.mk
#----------------------------------------------------------------------------
# Special truncated libbacktrace library for mac.
--
2.33.0
More information about the Replicant
mailing list