[vlc-commits] contrib: libxml2: don't build binaries

Rafaël Carré git at videolan.org
Tue Aug 20 15:38:35 CEST 2013


vlc/vlc-2.1 | branch: master | Rafaël Carré <funman at videolan.org> | Tue Aug 20 14:00:41 2013 +0200| [b12606d973d1f306056e738bf50ae27a7d510e58] | committer: Jean-Baptiste Kempf

contrib: libxml2: don't build binaries

(cherry picked from commit 5b04e2dcee081af7996b48803383289bd0ad192a)
Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

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

 contrib/src/libxml2/bins.patch |   20 ++++++++++++++++++++
 contrib/src/libxml2/rules.mak  |    1 +
 2 files changed, 21 insertions(+)

diff --git a/contrib/src/libxml2/bins.patch b/contrib/src/libxml2/bins.patch
new file mode 100644
index 0000000..3fef23a
--- /dev/null
+++ b/contrib/src/libxml2/bins.patch
@@ -0,0 +1,20 @@
+--- libxml2/Makefile.am.orig	2013-08-20 13:57:37.911178174 +0200
++++ libxml2/Makefile.am	2013-08-20 13:57:44.543177895 +0200
+@@ -2,7 +2,7 @@
+ 
+ ACLOCAL_AMFLAGS = -I m4
+ 
+-SUBDIRS = include . doc example xstc $(PYTHON_SUBDIR)
++SUBDIRS = include . xstc $(PYTHON_SUBDIR)
+ 
+ DIST_SUBDIRS = include . doc example python xstc
+ 
+@@ -15,7 +15,7 @@
+ #                 testReader testapi testModule runtest runsuite testchar \
+ # 		testdict runxmlconf testrecurse testlimits
+ 
+-bin_PROGRAMS = xmllint xmlcatalog
++bin_PROGRAMS =
+ 
+ bin_SCRIPTS=xml2-config
+ 
diff --git a/contrib/src/libxml2/rules.mak b/contrib/src/libxml2/rules.mak
index a477599..e4a6b23 100644
--- a/contrib/src/libxml2/rules.mak
+++ b/contrib/src/libxml2/rules.mak
@@ -19,6 +19,7 @@ libxml2: libxml2-$(LIBXML2_VERSION).tar.gz .sum-libxml2
 	$(UNPACK)
 	$(APPLY) $(SRC)/libxml2/no-tests.patch
 	$(APPLY) $(SRC)/libxml2/win32.patch
+	$(APPLY) $(SRC)/libxml2/bins.patch
 	$(APPLY) $(SRC)/libxml2/pthread.patch
 	$(MOVE)
 



More information about the vlc-commits mailing list