瀏覽代碼

MobileVLCKit/patches: remove gmp patches as we won't need them for now

Felix Paul Kühne 11 年之前
父節點
當前提交
069fe6a4f5

+ 0 - 30
MobileVLCKit/patches/0020-contrib-gmp-compile-without-pic-on-iOS.patch

@@ -1,31 +0,0 @@
-From c93b4e0c1b96888c27089c9daae6f78622fdab67 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
-Date: Tue, 19 Nov 2013 17:16:28 +0100
-Subject: [PATCH 20/21] contrib/gmp: compile without pic on iOS
-
----
- contrib/src/gmp/rules.mak | 7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/contrib/src/gmp/rules.mak b/contrib/src/gmp/rules.mak
-index 5f60fb0..818d541 100644
---- a/contrib/src/gmp/rules.mak
-+++ b/contrib/src/gmp/rules.mak
-@@ -18,8 +18,13 @@ gmp: gmp-$(GMP_VERSION).tar.bz2 .sum-gmp
- 	$(APPLY) $(SRC)/gmp/ansi2knr.diff
- 	$(MOVE)
- 
-+GMP_CONF := $(HOSTCONF)
-+ifdef HAVE_IOS
-+GMP_CONF += --without-pic
-+endif
-+
- .gmp: gmp
- 	$(RECONF)
--	cd $< && $(HOSTVARS) ./configure $(HOSTCONF)
-+	cd $< && $(HOSTVARS) ./configure $(GMP_CONF)
- 	cd $< && $(MAKE) install
- 	touch $@
-1.8.3.4 (Apple Git-47)
-

+ 0 - 47
MobileVLCKit/patches/0021-contrib-gmp-disable-ARM-assembly-for-iOS.patch

@@ -1,48 +0,0 @@
-From d1c2c9addcc8eea36f53797a1e0f91f555860571 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
-Date: Tue, 19 Nov 2013 22:02:38 +0100
-Subject: [PATCH 21/21] contrib/gmp: disable ARM assembly for iOS
-
----
- contrib/src/gmp/disable-arm-assembly-on-ios.patch | 14 ++++++++++++++
- contrib/src/gmp/rules.mak                         |  3 +++
- 2 files changed, 17 insertions(+)
- create mode 100644 contrib/src/gmp/disable-arm-assembly-on-ios.patch
-
-diff --git a/contrib/src/gmp/disable-arm-assembly-on-ios.patch b/contrib/src/gmp/disable-arm-assembly-on-ios.patch
-new file mode 100644
-index 0000000..d47ce96
---- /dev/null
-+++ b/contrib/src/gmp/disable-arm-assembly-on-ios.patch
-@@ -0,0 +1,14 @@
-+diff -ru gmp/configure.in gmp/configure.in
-+--- gmp/configure.in	2013-11-19 22:00:53.000000000 +0100
-++++ gmp/configure.in	2013-11-19 22:01:10.000000000 +0100
-+@@ -523,6 +523,10 @@
-+     path="cray"
-+     ;;
-+ 
-++  arm*-apple-*)
-++    path="generic"
-++    gmp_asm_syntax_testing=no
-++    ;;
-+ 
-+   arm*-*-*)
-+     path="arm"
-diff --git a/contrib/src/gmp/rules.mak b/contrib/src/gmp/rules.mak
-index 818d541..f51bf31 100644
---- a/contrib/src/gmp/rules.mak
-+++ b/contrib/src/gmp/rules.mak
-@@ -16,6 +16,9 @@ gmp: gmp-$(GMP_VERSION).tar.bz2 .sum-gmp
- 	$(APPLY) $(SRC)/gmp/inline.diff
- 	$(APPLY) $(SRC)/gmp/ansitest.diff
- 	$(APPLY) $(SRC)/gmp/ansi2knr.diff
-+ifdef HAVE_IOS
-+	$(APPLY) $(SRC)/gmp/disable-arm-assembly-on-ios.patch
-+endif
- 	$(MOVE)
- 
- GMP_CONF := $(HOSTCONF)
-1.8.3.4 (Apple Git-47)
-