0019-contrib-gcrypt-use-git-version-on-iOS.patch 4.9 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142
  1. From 676fd11a579c6ed05728f82f478f82fe0f0f9434 Mon Sep 17 00:00:00 2001
  2. From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
  3. Date: Thu, 31 Oct 2013 20:42:59 +0100
  4. Subject: [PATCH 19/20] contrib/gcrypt: use git version on iOS
  5. ---
  6. contrib/src/gcrypt/disable-doc-compilation.patch | 43 ++++++++++++++++++++++
  7. contrib/src/gcrypt/rules.mak | 15 +++++++-
  8. .../gcrypt/work-around-libtool-limitation.patch | 25 +++++++++++++
  9. 3 files changed, 82 insertions(+), 1 deletion(-)
  10. create mode 100644 contrib/src/gcrypt/disable-doc-compilation.patch
  11. create mode 100644 contrib/src/gcrypt/work-around-libtool-limitation.patch
  12. diff --git a/contrib/src/gcrypt/disable-doc-compilation.patch b/contrib/src/gcrypt/disable-doc-compilation.patch
  13. new file mode 100644
  14. index 0000000..e63224e
  15. --- /dev/null
  16. +++ b/contrib/src/gcrypt/disable-doc-compilation.patch
  17. @@ -0,0 +1,43 @@
  18. +From 18ac3f6a6e0ab9fe353ee8b5ab2b34ef5ce500d7 Mon Sep 17 00:00:00 2001
  19. +From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
  20. +Date: Thu, 31 Oct 2013 20:34:15 +0100
  21. +Subject: [PATCH] disable doc compilation
  22. +
  23. +---
  24. + Makefile.am | 6 +++---
  25. + configure.ac | 1 -
  26. + 2 files changed, 3 insertions(+), 4 deletions(-)
  27. +
  28. +diff --git a/Makefile.am b/Makefile.am
  29. +index f1dbd09..9e0abd6 100644
  30. +--- a/Makefile.am
  31. ++++ b/Makefile.am
  32. +@@ -25,10 +25,10 @@ DISTCHECK_CONFIGURE_FLAGS = --disable-random-daemon \
  33. + # (A suitable gitlog-to-changelog script can be found in GnuPG master.)
  34. + GITLOG_TO_CHANGELOG=gitlog-to-changelog
  35. +
  36. +-DIST_SUBDIRS = m4 compat mpi cipher random src doc tests
  37. +-SUBDIRS = compat mpi cipher random src doc tests
  38. ++DIST_SUBDIRS = m4 compat mpi cipher random src tests
  39. ++SUBDIRS = compat mpi cipher random src tests
  40. + EXTRA_DIST = autogen.sh README.GIT \
  41. +- ChangeLog-2011 scripts/ChangeLog-2011 doc/ChangeLog-2011 \
  42. ++ ChangeLog-2011 scripts/ChangeLog-2011 \
  43. + m4/ChangeLog-2011 cipher/ChangeLog-2011 src/ChangeLog-2011 \
  44. + random/ChangeLog-2011 tests/ChangeLog-2011 mpi/ChangeLog-2011 \
  45. + scripts/git-log-footer scripts/git-log-fix
  46. +diff --git a/configure.ac b/configure.ac
  47. +index e3471d0..6fa4ad6 100644
  48. +--- a/configure.ac
  49. ++++ b/configure.ac
  50. +@@ -1799,7 +1799,6 @@ compat/Makefile
  51. + mpi/Makefile
  52. + cipher/Makefile
  53. + random/Makefile
  54. +-doc/Makefile
  55. + src/Makefile
  56. + src/gcrypt.h
  57. + src/libgcrypt-config
  58. +--
  59. +1.8.3.4 (Apple Git-47)
  60. +
  61. diff --git a/contrib/src/gcrypt/rules.mak b/contrib/src/gcrypt/rules.mak
  62. index e0824ba..da17a41 100644
  63. --- a/contrib/src/gcrypt/rules.mak
  64. +++ b/contrib/src/gcrypt/rules.mak
  65. @@ -1,6 +1,7 @@
  66. # GCRYPT
  67. GCRYPT_VERSION := 1.6.1
  68. GCRYPT_URL := ftp://ftp.gnupg.org/gcrypt/libgcrypt/libgcrypt-$(GCRYPT_VERSION).tar.bz2
  69. +GCRYPT_GITURL := git://git.gnupg.org/libgcrypt.git
  70. PKGS += gcrypt
  71. @@ -9,12 +10,24 @@ $(TARBALLS)/libgcrypt-$(GCRYPT_VERSION).tar.bz2:
  72. .sum-gcrypt: libgcrypt-$(GCRYPT_VERSION).tar.bz2
  73. +$(TARBALLS)/libgcrypt-git.tar.xz:
  74. + $(call download_git,$(GCRYPT_GITURL),,d1cadd145)
  75. +
  76. +ifndef HAVE_IOS
  77. libgcrypt: libgcrypt-$(GCRYPT_VERSION).tar.bz2 .sum-gcrypt
  78. $(UNPACK)
  79. $(APPLY) $(SRC)/gcrypt/gcrypt-fix-x86_64-codepath-on-Darwin.patch
  80. $(APPLY) $(SRC)/gcrypt/fix-amd64-assembly-on-solaris.patch
  81. $(APPLY) $(SRC)/gcrypt/0001-Fix-assembly-division-check.patch
  82. $(MOVE)
  83. +else
  84. +libgcrypt: libgcrypt-git.tar.xz
  85. + $(UNPACK)
  86. + $(APPLY) $(SRC)/gcrypt/gcrypt-fix-x86_64-codepath-on-Darwin.patch
  87. + $(APPLY) $(SRC)/gcrypt/disable-doc-compilation.patch
  88. + $(APPLY) $(SRC)/gcrypt/work-around-libtool-limitation.patch
  89. + $(MOVE)
  90. +endif
  91. DEPS_gcrypt = gpg-error
  92. @@ -48,6 +61,6 @@ endif
  93. .gcrypt: libgcrypt
  94. $(RECONF)
  95. - cd $< && $(HOSTVARS) CFLAGS="$(CFLAGS) $(GCRYPT_EXTRA_CFLAGS)" ./configure $(HOSTCONF) $(GCRYPT_CONF)
  96. + cd $< && $(HOSTVARS) ./configure $(HOSTCONF) $(GCRYPT_CONF)
  97. cd $< && $(MAKE) install
  98. touch $@
  99. diff --git a/contrib/src/gcrypt/work-around-libtool-limitation.patch b/contrib/src/gcrypt/work-around-libtool-limitation.patch
  100. new file mode 100644
  101. index 0000000..df97ffb
  102. --- /dev/null
  103. +++ b/contrib/src/gcrypt/work-around-libtool-limitation.patch
  104. @@ -0,0 +1,25 @@
  105. +diff -ru libgcrypt-broken/cipher/Makefile.am libgcrypt/cipher/Makefile.am
  106. +--- libgcrypt-broken/cipher/Makefile.am 2013-11-06 23:05:24.000000000 +0100
  107. ++++ libgcrypt/cipher/Makefile.am 2013-11-06 23:21:25.000000000 +0100
  108. +@@ -19,6 +19,8 @@
  109. +
  110. + # Process this file with automake to produce Makefile.in
  111. +
  112. ++LIBTOOL=@LIBTOOL@ --tag=CC
  113. ++
  114. + EXTRA_DIST = Manifest
  115. +
  116. + # Need to include ../src in addition to top_srcdir because gcrypt.h is
  117. +diff -ru libgcrypt-broken/mpi/Makefile.am libgcrypt/mpi/Makefile.am
  118. +--- libgcrypt-broken/mpi/Makefile.am 2013-11-06 23:05:24.000000000 +0100
  119. ++++ libgcrypt/mpi/Makefile.am 2013-11-06 23:22:04.000000000 +0100
  120. +@@ -23,6 +23,9 @@
  121. +
  122. + # Need to include ../src in addition to top_srcdir because gcrypt.h is
  123. + # a built header.
  124. ++
  125. ++LIBTOOL=@LIBTOOL@ --tag=CC
  126. ++
  127. + AM_CPPFLAGS = -I../src -I$(top_srcdir)/src
  128. + AM_CFLAGS = $(GPG_ERROR_CFLAGS)
  129. +
  130. --
  131. 1.9.3 (Apple Git-50)