0012-contrib-gcrypt-fix-tvOS-compilation.patch 2.2 KB

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