From 64f5323a280d267bd1ebc022586489f490da569f Mon Sep 17 00:00:00 2001 From: Sebastian Kemper Date: Sun, 20 Sep 2020 13:40:56 +0200 Subject: [PATCH] spandsp3: prevent host include search paths Note the host include path for libxml2 below. This shouldn't cause an issue because libxml2 is never used. But better safe than sorry as the configure script probes other host include paths as well. /bin/sh ../libtool --tag=CC --mode=compile ccache_cc -DHAVE_CONFIG_H -I. -I.. -I/openwrt/staging_dir/target-mips_24kc_musl/usr/include -I/openwrt/staging_dir/toolchain-mips_24kc_gcc-10.2.0_musl/usr/include -I/openwrt/staging_dir/toolchain-mips_24kc_gcc-10.2.0_musl/include/fortify -I/openwrt/staging_dir/toolchain-mips_24kc_gcc-10.2.0_musl/include -I/usr/include/libxml2 -DNDEBUG -Wunused-but-set-variable -std=gnu99 -ffast-math -Wall -Wunused-variable -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes -fvisibility=hidden -DHAVE_VISIBILITY=1 -Os -pipe -mno-branch-likely -mips32r2 -mtune=24kc -fno-caller-saves -fno-plt -fhonour-copts -Wno-error=unused-but-set-variable -Wno-error=unused-result -msoft-float -mips16 -minterlink-mips16 -fmacro-prefix-map=/openwrt/build_dir/target-mips_24kc_musl/spandsp3-2020-08-14-6ec23e5a=spandsp3-2020-08-14-6ec23e5a -Wformat -Werror=format-security -fstack-protector -D_FORTIFY_SOURCE=1 -Wl,-z,now -Wl,-z,relro -MT dds_float.lo -MD -MP -MF .deps/dds_float.Tpo -c -o dds_float.lo dds_float.c Signed-off-by: Sebastian Kemper --- libs/spandsp3/Makefile | 2 +- .../patches/02-do-not-check-for-libxml2.patch | 20 +++++++++++++++++++ 2 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 libs/spandsp3/patches/02-do-not-check-for-libxml2.patch diff --git a/libs/spandsp3/Makefile b/libs/spandsp3/Makefile index ba369c6..480915e 100644 --- a/libs/spandsp3/Makefile +++ b/libs/spandsp3/Makefile @@ -13,7 +13,7 @@ PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/freeswitch/spandsp.git PKG_SOURCE_DATE=2020-08-14 PKG_SOURCE_VERSION:=6ec23e5a7e411a22d59e5678d12c4d2942c4a4b6 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_MIRROR_HASH:=fcfa13576a25ff27e3746c3db30de89d2afceb963072b352a34e7a4a9f492ae5 PKG_INSTALL:=1 diff --git a/libs/spandsp3/patches/02-do-not-check-for-libxml2.patch b/libs/spandsp3/patches/02-do-not-check-for-libxml2.patch new file mode 100644 index 0000000..25aefae --- /dev/null +++ b/libs/spandsp3/patches/02-do-not-check-for-libxml2.patch @@ -0,0 +1,20 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -231,6 +231,9 @@ then + AC_CHECK_HEADERS([X11/X.h]) + fi + ++# Note: the libxml2 checks below introduce host include paths into the ++# build, so we turn them off. ++if test -n "$enable_tests" ; then # OpenWrt doesn't build the tests + # Determine XML2 include path + AC_MSG_CHECKING(for libxml/xmlmemory.h) + +@@ -259,6 +262,7 @@ fi + AC_CHECK_HEADERS([libxml/xmlmemory.h]) + AC_CHECK_HEADERS([libxml/parser.h]) + AC_CHECK_HEADERS([libxml/xinclude.h]) ++fi # OpenWrt doesn't build the tests + + AC_LANG([C++]) + AC_CHECK_HEADERS([FL/Fl.H]) -- 2.30.2