[vlc-commits] contrib: libxml2: disable tests

[Rafaël Carré]

vlc | branch: master | Rafaël Carré <funman at videolan.org> | Sat Nov 26 20:54:44 2011 -0500| [87636fed7ae915eb688e96bc061804798424a775] | committer: Rafaël Carré

contrib: libxml2: disable tests

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=87636fed7ae915eb688e96bc061804798424a775
---

 contrib/src/libxml2/no-tests.patch |   17 +++++++++++++++++
 contrib/src/libxml2/rules.mak      |    2 ++
 2 files changed, 19 insertions(+), 0 deletions(-)

diff --git a/contrib/src/libxml2/no-tests.patch b/contrib/src/libxml2/no-tests.patch
new file mode 100644
index 0000000..1f37434
--- /dev/null
+++ b/contrib/src/libxml2/no-tests.patch
@@ -0,0 +1,17 @@
+--- libxml2/Makefile.am.orig	2011-11-26 20:53:51.147060747 -0500
++++ libxml2/Makefile.am	2011-11-26 20:52:36.013140366 -0500
+@@ -8,10 +8,10 @@
+ 
+ INCLUDES = -I$(top_builddir)/include -I at srcdir@/include @THREAD_CFLAGS@ @Z_CFLAGS@ 
+ 
+-noinst_PROGRAMS=testSchemas testRelax testSAX testHTML testXPath testURI \
+-                testThreads testC14N testAutomata testRegexp \
+-                testReader testapi testModule runtest runsuite testchar \
+-		testdict runxmlconf testrecurse
++#noinst_PROGRAMS=testSchemas testRelax testSAX testHTML testXPath testURI \
++#                testThreads testC14N testAutomata testRegexp \
++#                testReader testapi testModule runtest runsuite testchar \
++#		testdict runxmlconf testrecurse
+ 
+ bin_PROGRAMS = xmllint xmlcatalog
+ 
diff --git a/contrib/src/libxml2/rules.mak b/contrib/src/libxml2/rules.mak
index 0a6a426..cf81b62 100644
--- a/contrib/src/libxml2/rules.mak
+++ b/contrib/src/libxml2/rules.mak
@@ -17,9 +17,11 @@ XMLCONF = --with-minimal --with-catalog --with-reader --with-tree --with-push --
 
 libxml2: libxml2-$(LIBXML2_VERSION).tar.gz .sum-libxml2
 	$(UNPACK)
+	$(APPLY) $(SRC)/libxml2/no-tests.patch
 	$(MOVE)
 
 .libxml2: libxml2
+	$(RECONF)
 	cd $< && $(HOSTVARS) ./configure $(HOSTCONF) CFLAGS="-DLIBXML_STATIC" $(XMLCONF)
 	cd $< && $(MAKE) install
 	touch $@