0011-contrib-gcrypt-work-around-a-libtool-limitation.patch 2.2 KB

12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758
  1. From f3e5f5fd75f3143bb8804a0ca132c8fd29ec1ae8 Mon Sep 17 00:00:00 2001
  2. From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
  3. Date: Sun, 7 Dec 2014 20:02:18 +0100
  4. Subject: [PATCH 11/15] contrib/gcrypt: work-around a libtool limitation
  5. ---
  6. contrib/src/gcrypt/rules.mak | 1 +
  7. .../gcrypt/work-around-libtool-limitation.patch | 25 ++++++++++++++++++++++
  8. 2 files changed, 26 insertions(+)
  9. create mode 100644 contrib/src/gcrypt/work-around-libtool-limitation.patch
  10. diff --git a/contrib/src/gcrypt/rules.mak b/contrib/src/gcrypt/rules.mak
  11. index e528e57..4d2604c 100644
  12. --- a/contrib/src/gcrypt/rules.mak
  13. +++ b/contrib/src/gcrypt/rules.mak
  14. @@ -15,6 +15,7 @@ libgcrypt: libgcrypt-$(GCRYPT_VERSION).tar.bz2 .sum-gcrypt
  15. $(APPLY) $(SRC)/gcrypt/0001-Fix-assembly-division-check.patch
  16. $(APPLY) $(SRC)/gcrypt/disable-doc-compilation.patch
  17. $(APPLY) $(SRC)/gcrypt/disable-tests-compilation.patch
  18. + $(APPLY) $(SRC)/gcrypt/work-around-libtool-limitation.patch
  19. ifdef HAVE_WINSTORE
  20. $(APPLY) $(SRC)/gcrypt/winrt.patch
  21. endif
  22. diff --git a/contrib/src/gcrypt/work-around-libtool-limitation.patch b/contrib/src/gcrypt/work-around-libtool-limitation.patch
  23. new file mode 100644
  24. index 0000000..df97ffb
  25. --- /dev/null
  26. +++ b/contrib/src/gcrypt/work-around-libtool-limitation.patch
  27. @@ -0,0 +1,25 @@
  28. +diff -ru libgcrypt-broken/cipher/Makefile.am libgcrypt/cipher/Makefile.am
  29. +--- libgcrypt-broken/cipher/Makefile.am 2013-11-06 23:05:24.000000000 +0100
  30. ++++ libgcrypt/cipher/Makefile.am 2013-11-06 23:21:25.000000000 +0100
  31. +@@ -19,6 +19,8 @@
  32. +
  33. + # Process this file with automake to produce Makefile.in
  34. +
  35. ++LIBTOOL=@LIBTOOL@ --tag=CC
  36. ++
  37. + EXTRA_DIST = Manifest
  38. +
  39. + # Need to include ../src in addition to top_srcdir because gcrypt.h is
  40. +diff -ru libgcrypt-broken/mpi/Makefile.am libgcrypt/mpi/Makefile.am
  41. +--- libgcrypt-broken/mpi/Makefile.am 2013-11-06 23:05:24.000000000 +0100
  42. ++++ libgcrypt/mpi/Makefile.am 2013-11-06 23:22:04.000000000 +0100
  43. +@@ -23,6 +23,9 @@
  44. +
  45. + # Need to include ../src in addition to top_srcdir because gcrypt.h is
  46. + # a built header.
  47. ++
  48. ++LIBTOOL=@LIBTOOL@ --tag=CC
  49. ++
  50. + AM_CPPFLAGS = -I../src -I$(top_srcdir)/src
  51. + AM_CFLAGS = $(GPG_ERROR_CFLAGS)
  52. +
  53. --
  54. 2.9.2