summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormicmac1 <sebastian_ml@gmx.net>2020-09-20 20:19:44 +0200
committerGitHub <noreply@github.com>2020-09-20 20:19:44 +0200
commit85cb5591de23767f2b477010de4abc3fc3aaf0e1 (patch)
tree3f708aaa395251df24da2f71d4d357f1343c94fd
parent10c68488ee71a4c51e7dab8f3842f162548cc269 (diff)
parent64f5323a280d267bd1ebc022586489f490da569f (diff)
Merge pull request #573 from micmac1/span3xml2-1907
[19.07] spandsp3: prevent host include search paths
-rw-r--r--libs/spandsp3/Makefile2
-rw-r--r--libs/spandsp3/patches/02-do-not-check-for-libxml2.patch20
2 files changed, 21 insertions, 1 deletions
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])