12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758596061 |
- From 62d65b6bf70142f89786c3ed61c2c987405ea907 Mon Sep 17 00:00:00 2001
- From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
- Date: Sat, 3 Oct 2015 22:45:14 +0200
- Subject: [PATCH 12/15] contrib/gcrypt: fix tvOS compilation
- ---
- contrib/src/gcrypt/fix-sha1-ssse3-for-clang.patch | 16 ++++++++++++++++
- contrib/src/gcrypt/rules.mak | 6 ++++++
- 2 files changed, 22 insertions(+)
- create mode 100644 contrib/src/gcrypt/fix-sha1-ssse3-for-clang.patch
- diff --git a/contrib/src/gcrypt/fix-sha1-ssse3-for-clang.patch b/contrib/src/gcrypt/fix-sha1-ssse3-for-clang.patch
- new file mode 100644
- index 0000000..f1d3ccc
- --- /dev/null
- +++ b/contrib/src/gcrypt/fix-sha1-ssse3-for-clang.patch
- @@ -0,0 +1,16 @@
- +diff -ru libgcrypt/cipher/sha1-ssse3-amd64.S libgcrypt/cipher/sha1-ssse3-amd64.S
- +--- libgcrypt/cipher/sha1-ssse3-amd64.S 2014-08-21 14:50:39.000000000 +0200
- ++++ libgcrypt/cipher/sha1-ssse3-amd64.S 2015-10-03 22:40:21.000000000 +0200
- +@@ -217,10 +217,9 @@
- + * _gcry_sha1_transform_amd64_ssse3 (void *ctx, const unsigned char *data)
- + */
- + .text
- +-.globl _gcry_sha1_transform_amd64_ssse3
- +-.type _gcry_sha1_transform_amd64_ssse3,@function
- ++.globl __gcry_sha1_transform_amd64_ssse3
- + .align 16
- +-_gcry_sha1_transform_amd64_ssse3:
- ++__gcry_sha1_transform_amd64_ssse3:
- + /* input:
- + * %rdi: ctx, CTX
- + * %rsi: data (64 bytes)
- diff --git a/contrib/src/gcrypt/rules.mak b/contrib/src/gcrypt/rules.mak
- index 4d2604c..ee4c969 100644
- --- a/contrib/src/gcrypt/rules.mak
- +++ b/contrib/src/gcrypt/rules.mak
- @@ -16,6 +16,7 @@ libgcrypt: libgcrypt-$(GCRYPT_VERSION).tar.bz2 .sum-gcrypt
- $(APPLY) $(SRC)/gcrypt/disable-doc-compilation.patch
- $(APPLY) $(SRC)/gcrypt/disable-tests-compilation.patch
- $(APPLY) $(SRC)/gcrypt/work-around-libtool-limitation.patch
- + $(APPLY) $(SRC)/gcrypt/fix-sha1-ssse3-for-clang.patch
- ifdef HAVE_WINSTORE
- $(APPLY) $(SRC)/gcrypt/winrt.patch
- endif
- @@ -36,6 +37,11 @@ GCRYPT_EXTRA_CFLAGS = -fheinous-gnu-extensions
- else
- GCRYPT_EXTRA_CFLAGS =
- endif
- +ifdef HAVE_TVOS
- +ifeq ($(ARCH), x86_64)
- +GCRYPT_CONF += --disable-asm --enable-ciphers=des,rfc2268,arcfour --enable-digests=md5,sha1,rmd160
- +endif
- +endif
- ifdef HAVE_MACOSX
- GCRYPT_CONF += --disable-aesni-support
- else
- --
- 2.9.2
|