[vlc-commits] Revert "contribs: orc: Don't build anything more than the library"

Hugo Beauzée-Luyssen git at videolan.org
Tue Jun 21 11:22:18 CEST 2016


vlc | branch: master | Hugo Beauzée-Luyssen <hugo at beauzee.fr> | Tue Jun 21 11:20:25 2016 +0200| [cc8a46eba778e5f51c25e5772a7591e2dadd0e3e] | committer: Hugo Beauzée-Luyssen

Revert "contribs: orc: Don't build anything more than the library"

This reverts commit 2a7a036de4233b825071aa3920373e3eca40dd8f.
We need orcc to be built

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

 contrib/src/orc/dont-build-tests.patch |   11 -----------
 contrib/src/orc/rules.mak              |    2 --
 2 files changed, 13 deletions(-)

diff --git a/contrib/src/orc/dont-build-tests.patch b/contrib/src/orc/dont-build-tests.patch
deleted file mode 100644
index 1ab7f23..0000000
--- a/contrib/src/orc/dont-build-tests.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- orc/Makefile.am.orig	2016-06-20 13:55:10.080673365 +0000
-+++ orc/Makefile.am	2016-06-20 13:55:14.852672829 +0000
-@@ -1,7 +1,7 @@
- 
- AUTOMAKE_OPTIONS = foreign
- 
--SUBDIRS = orc orc-test tools examples doc testsuite
-+SUBDIRS = orc
- 
- EXTRA_DIST = COPYING autogen.sh gtk-doc.make orc.m4
-
diff --git a/contrib/src/orc/rules.mak b/contrib/src/orc/rules.mak
index 66d83f6..5ac4bde 100644
--- a/contrib/src/orc/rules.mak
+++ b/contrib/src/orc/rules.mak
@@ -15,12 +15,10 @@ $(TARBALLS)/orc-$(ORC_VERSION).tar.gz:
 orc: orc-$(ORC_VERSION).tar.gz .sum-orc
 	$(UNPACK)
 	$(APPLY) $(SRC)/orc/use-proper-func-detection.patch
-	$(APPLY) $(SRC)/orc/dont-build-tests.patch
 	$(UPDATE_AUTOCONFIG)
 	$(MOVE)
 
 .orc: orc
-	$(RECONF)
 	cd $< && $(HOSTVARS) ./configure $(HOSTCONF)
 	cd $< && $(MAKE) install
 	touch $@



More information about the vlc-commits mailing list