diff options
author | Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org> | 2021-08-25 18:19:31 +0200 |
---|---|---|
committer | Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org> | 2021-08-25 18:27:01 +0200 |
commit | 9919e82b97c0a9b61c1b2e74586a9e1bfe9a3356 (patch) | |
tree | 7835799fd8a95ac5b33aaf8e60951ba5740abbfa | |
parent | f934a3ca934b7d2fac7e4dc493204d64a70013ea (diff) | |
download | system_core-9919e82b97c0a9b61c1b2e74586a9e1bfe9a3356.tar.gz system_core-9919e82b97c0a9b61c1b2e74586a9e1bfe9a3356.tar.bz2 system_core-9919e82b97c0a9b61c1b2e74586a9e1bfe9a3356.zip |
Fix the build on Trisquel 9replicant-6.0-0004-rc6
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@cyberdimension.org>
-rw-r--r-- | libbacktrace/Android.mk | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/libbacktrace/Android.mk b/libbacktrace/Android.mk index 6a689a61d..97d50bcd7 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. |