[vlc-commits] contrib/libogg: added support for iOS by disabling make check

[Felix Paul Kühne]

vlc | branch: master | Felix Paul Kühne <fkuehne at videolan.org> | Wed Mar 21 13:08:02 2012 +0100| [6be7d870e0aca19df73fde84a22b8a2d97ed4c3e] | committer: Felix Paul Kühne

contrib/libogg: added support for iOS by disabling make check

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

 contrib/src/ogg/libogg-disable-check.patch |   12 ++++++++++++
 contrib/src/ogg/rules.mak                  |    3 ++-
 2 files changed, 14 insertions(+), 1 deletions(-)

diff --git a/contrib/src/ogg/libogg-disable-check.patch b/contrib/src/ogg/libogg-disable-check.patch
new file mode 100644
index 0000000..5801b37
--- /dev/null
+++ b/contrib/src/ogg/libogg-disable-check.patch
@@ -0,0 +1,12 @@
+diff -ru libogg/src/Makefile.am libogg/src/Makefile.am
+--- libogg/src/Makefile.am	2011-08-04 19:07:42.000000000 +0200
++++ libogg-f/src/Makefile.am	2012-03-21 13:05:23.000000000 +0100
+@@ -9,7 +9,7 @@
+ 
+ # build and run the self tests on 'make check'
+ 
+-noinst_PROGRAMS = test_bitwise test_framing
++noinst_PROGRAMS =
+ 
+ test_bitwise_SOURCES = bitwise.c
+ test_bitwise_CFLAGS = -D_V_SELFTEST
diff --git a/contrib/src/ogg/rules.mak b/contrib/src/ogg/rules.mak
index 5d49122..721e5bf 100644
--- a/contrib/src/ogg/rules.mak
+++ b/contrib/src/ogg/rules.mak
@@ -22,11 +22,12 @@ libogg: libogg-$(OGG_VERSION).tar.xz .sum-ogg
 ifdef HAVE_WINCE
 	$(APPLY) $(SRC)/ogg/libogg-wince.patch
 endif
+	$(APPLY) $(SRC)/ogg/libogg-disable-check.patch
 	$(UPDATE_AUTOCONFIG)
 	$(MOVE)
 
 .ogg: libogg
-	#$(RECONF)
+	$(RECONF)
 	cd $< && $(HOSTVARS) ./configure $(HOSTCONF)
 	cd $< && $(MAKE) install
 	touch $@