|
@@ -1,13 +1,13 @@
|
|
|
-From 9bf8926abdc3d92fec03822ea83bbe53d55d99af Mon Sep 17 00:00:00 2001
|
|
|
+From b2fd1fd905972efa93759525600fd24c89958751 Mon Sep 17 00:00:00 2001
|
|
|
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
|
|
|
Date: Thu, 31 Oct 2013 20:42:59 +0100
|
|
|
-Subject: [PATCH 09/18] contrib/gcrypt: use git version on iOS
|
|
|
+Subject: [PATCH 19/19] contrib/gcrypt: use git version on iOS
|
|
|
|
|
|
---
|
|
|
contrib/src/gcrypt/disable-doc-compilation.patch | 43 ++++++++++++++++++++++
|
|
|
- contrib/src/gcrypt/rules.mak | 23 ++++++++----
|
|
|
+ contrib/src/gcrypt/rules.mak | 15 +++++++-
|
|
|
.../gcrypt/work-around-libtool-limitation.patch | 25 +++++++++++++
|
|
|
- 3 files changed, 83 insertions(+), 8 deletions(-)
|
|
|
+ 3 files changed, 82 insertions(+), 1 deletion(-)
|
|
|
create mode 100644 contrib/src/gcrypt/disable-doc-compilation.patch
|
|
|
create mode 100644 contrib/src/gcrypt/work-around-libtool-limitation.patch
|
|
|
|
|
@@ -61,7 +61,7 @@ index 0000000..e63224e
|
|
|
+1.8.3.4 (Apple Git-47)
|
|
|
+
|
|
|
diff --git a/contrib/src/gcrypt/rules.mak b/contrib/src/gcrypt/rules.mak
|
|
|
-index ae55695..44dfcab 100644
|
|
|
+index 0a4d7d5..71b4241 100644
|
|
|
--- a/contrib/src/gcrypt/rules.mak
|
|
|
+++ b/contrib/src/gcrypt/rules.mak
|
|
|
@@ -1,6 +1,7 @@
|
|
@@ -72,7 +72,7 @@ index ae55695..44dfcab 100644
|
|
|
|
|
|
PKGS += gcrypt
|
|
|
|
|
|
-@@ -9,9 +10,20 @@ $(TARBALLS)/libgcrypt-$(GCRYPT_VERSION).tar.bz2:
|
|
|
+@@ -9,11 +10,23 @@ $(TARBALLS)/libgcrypt-$(GCRYPT_VERSION).tar.bz2:
|
|
|
|
|
|
.sum-gcrypt: libgcrypt-$(GCRYPT_VERSION).tar.bz2
|
|
|
|
|
@@ -82,10 +82,13 @@ index ae55695..44dfcab 100644
|
|
|
+ifndef HAVE_IOS
|
|
|
libgcrypt: libgcrypt-$(GCRYPT_VERSION).tar.bz2 .sum-gcrypt
|
|
|
$(UNPACK)
|
|
|
+ $(APPLY) $(SRC)/gcrypt/gcrypt-fix-x86_64-codepath-on-Darwin.patch
|
|
|
+ $(APPLY) $(SRC)/gcrypt/fix-amd64-assembly-on-solaris.patch
|
|
|
$(MOVE)
|
|
|
+else
|
|
|
-+libgcrypt: libgcrypt-git.tar.xz .sum-gcrypt
|
|
|
++libgcrypt: libgcrypt-git.tar.xz
|
|
|
+ $(UNPACK)
|
|
|
++ $(APPLY) $(SRC)/gcrypt/gcrypt-fix-x86_64-codepath-on-Darwin.patch
|
|
|
+ $(APPLY) $(SRC)/gcrypt/disable-doc-compilation.patch
|
|
|
+ $(APPLY) $(SRC)/gcrypt/work-around-libtool-limitation.patch
|
|
|
+ $(MOVE)
|
|
@@ -93,27 +96,11 @@ index ae55695..44dfcab 100644
|
|
|
|
|
|
DEPS_gcrypt = gpg-error
|
|
|
|
|
|
-@@ -22,12 +34,7 @@ GCRYPT_CONF = \
|
|
|
- ifdef HAVE_WIN64
|
|
|
- GCRYPT_CONF += --disable-asm
|
|
|
- endif
|
|
|
--ifdef HAVE_IOS
|
|
|
--GCRYPT_EXTRA_CFLAGS = -fheinous-gnu-extensions
|
|
|
--else
|
|
|
--GCRYPT_EXTRA_CFLAGS =
|
|
|
--endif
|
|
|
--ifdef HAVE_MACOSX
|
|
|
-+ifdef HAVE_DARWIN_OS
|
|
|
- GCRYPT_CONF += --disable-aesni-support
|
|
|
- else
|
|
|
- ifdef HAVE_BSD
|
|
|
-@@ -41,7 +48,7 @@ endif
|
|
|
- endif
|
|
|
+@@ -47,6 +60,6 @@ endif
|
|
|
|
|
|
.gcrypt: libgcrypt
|
|
|
-- #$(RECONF)
|
|
|
+ $(RECONF)
|
|
|
- cd $< && $(HOSTVARS) CFLAGS="$(CFLAGS) $(GCRYPT_EXTRA_CFLAGS)" ./configure $(HOSTCONF) $(GCRYPT_CONF)
|
|
|
-+ $(RECONF)
|
|
|
+ cd $< && $(HOSTVARS) ./configure $(HOSTCONF) $(GCRYPT_CONF)
|
|
|
cd $< && $(MAKE) install
|
|
|
touch $@
|
|
@@ -149,5 +136,5 @@ index 0000000..df97ffb
|
|
|
+ AM_CFLAGS = $(GPG_ERROR_CFLAGS)
|
|
|
+
|
|
|
--
|
|
|
-1.8.3.4 (Apple Git-47)
|
|
|
+1.8.5.2 (Apple Git-48)
|
|
|
|