From ee6477095a61a46ad66209f4fd14eaca12b51576 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 1 Jan 2022 16:59:50 +0100 Subject: [PATCH] package/tvheadend: disable execinfo Disable execinfo to avoid the following build failure if libexecinfo is built before tvheadend since the addition of the package in commit eea8ba446c10701a273432552108d80fb2224ef4: /home/peko/autobuild/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/i686-buildroot-linux-uclibc/9.3.0/../../../../i686-buildroot-linux-uclibc/bin/ld: /home/peko/autobuild/instance-0/output-1/build/tvheadend-b8710206eb073c72b142bce95846b77a0ffa34a6/build.linux/src/tvhlog.o: in function `tvhlog_backtrace_printf': /home/peko/autobuild/instance-0/output-1/build/tvheadend-b8710206eb073c72b142bce95846b77a0ffa34a6/src/tvhlog.c:522: undefined reference to `backtrace' Fixes: - http://autobuild.buildroot.org/results/ee9ad2c999b622097fe0f1522e7e32184722e548 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- .../0002-configure-add-execinfo-option.patch | 55 +++++++++++++++++++ package/tvheadend/tvheadend.mk | 1 + 2 files changed, 56 insertions(+) create mode 100644 package/tvheadend/0002-configure-add-execinfo-option.patch diff --git a/package/tvheadend/0002-configure-add-execinfo-option.patch b/package/tvheadend/0002-configure-add-execinfo-option.patch new file mode 100644 index 0000000000..c55d127d58 --- /dev/null +++ b/package/tvheadend/0002-configure-add-execinfo-option.patch @@ -0,0 +1,55 @@ +From 04c01e631cb1bf47dd50b1ef92a086308e380eff Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sat, 1 Jan 2022 16:53:29 +0100 +Subject: [PATCH] configure: add execinfo option + +Add execinfo option to allow the user to disable the feature even if +execinfo.h is found on the system + +Signed-off-by: Fabrice Fontaine +[Upsteam status: https://github.com/tvheadend/tvheadend/pull/1431] +--- + configure | 17 +++++++++++++++-- + 1 file changed, 15 insertions(+), 2 deletions(-) + +diff --git a/configure b/configure +index 4dad024c4..c087502bf 100755 +--- a/configure ++++ b/configure +@@ -75,6 +75,7 @@ OPTIONS=( + "ddci:yes" + "cclang_threadsan:no" + "gperftools:no" ++ "execinfo:auto" + ) + + # +@@ -150,11 +151,23 @@ if [ ${PLATFORM} = "freebsd" ]; then + # If we don't have libunwind then fallback to execinfo. + if ! enabled libunwind + then +- check_cc_header execinfo ++ if enabled_or_auto execinfo; then ++ if check_cc_header execinfo; then ++ enable execinfo ++ else ++ die "execinfo.h not found (use --disable-execinfo)" ++ fi ++ fi + fi + + else +- check_cc_header execinfo ++ if enabled_or_auto execinfo; then ++ if check_cc_header execinfo; then ++ enable execinfo ++ else ++ die "execinfo.h not found (use --disable-execinfo)" ++ fi ++ fi + fi + check_cc_option mmx + check_cc_option sse2 +-- +2.33.0 + diff --git a/package/tvheadend/tvheadend.mk b/package/tvheadend/tvheadend.mk index 4e84e496bf..58ebdcb054 100644 --- a/package/tvheadend/tvheadend.mk +++ b/package/tvheadend/tvheadend.mk @@ -161,6 +161,7 @@ define TVHEADEND_CONFIGURE_CMDS --enable-dvbscan \ --enable-bundle \ --enable-pngquant \ + --disable-execinfo \ --disable-ffmpeg_static \ --disable-hdhomerun_static \ $(TVHEADEND_CONF_OPTS) \