aboutsummaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authordavilla <davilla@4pi.com>2012-05-06 13:13:56 -0400
committerdavilla <davilla@4pi.com>2012-05-06 14:26:18 -0400
commit44cbad1ecbed70a45c0e622745aa829d2c52d663 (patch)
treee3ab83dd600fd0d8ae8bf7d885f59d734af7498f /tools
parente04fed4895ba86907a3c773b972284a9a283d390 (diff)
[osx/ios] prep for 10.6 sdk build under xcode4
Diffstat (limited to 'tools')
-rw-r--r--tools/darwin/depends/libgcrypt/01-static-mpi_mpi-internal.patch53
-rw-r--r--tools/darwin/depends/libgcrypt/Makefile4
2 files changed, 56 insertions, 1 deletions
diff --git a/tools/darwin/depends/libgcrypt/01-static-mpi_mpi-internal.patch b/tools/darwin/depends/libgcrypt/01-static-mpi_mpi-internal.patch
new file mode 100644
index 0000000000..5a1f60f8d6
--- /dev/null
+++ b/tools/darwin/depends/libgcrypt/01-static-mpi_mpi-internal.patch
@@ -0,0 +1,53 @@
+*** mpi/mpi-internal.h Sun May 6 17:39:56 2012
+--- mpi/mpi-internal_new.h Sun May 6 17:45:59 2012
+*************** void _gcry_mpi_lshift_limbs( gcry_mpi_t
+*** 183,206 ****
+
+
+ /*-- mpih-add.c --*/
+! mpi_limb_t _gcry_mpih_add_1(mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr,
+! mpi_size_t s1_size, mpi_limb_t s2_limb );
+ mpi_limb_t _gcry_mpih_add_n( mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr,
+! mpi_ptr_t s2_ptr, mpi_size_t size);
+! mpi_limb_t _gcry_mpih_add(mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr, mpi_size_t s1_size,
+! mpi_ptr_t s2_ptr, mpi_size_t s2_size);
+!
+ /*-- mpih-sub.c --*/
+! mpi_limb_t _gcry_mpih_sub_1( mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr,
+! mpi_size_t s1_size, mpi_limb_t s2_limb );
+ mpi_limb_t _gcry_mpih_sub_n( mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr,
+! mpi_ptr_t s2_ptr, mpi_size_t size);
+! mpi_limb_t _gcry_mpih_sub(mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr, mpi_size_t s1_size,
+! mpi_ptr_t s2_ptr, mpi_size_t s2_size);
+!
+ /*-- mpih-cmp.c --*/
+! int _gcry_mpih_cmp( mpi_ptr_t op1_ptr, mpi_ptr_t op2_ptr, mpi_size_t size );
+!
+ /*-- mpih-mul.c --*/
+
+ struct karatsuba_ctx {
+--- 183,206 ----
+
+
+ /*-- mpih-add.c --*/
+! static mpi_limb_t _gcry_mpih_add_1(mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr,
+! mpi_size_t s1_size, mpi_limb_t s2_limb );
+ mpi_limb_t _gcry_mpih_add_n( mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr,
+! mpi_ptr_t s2_ptr, mpi_size_t size);
+! static mpi_limb_t _gcry_mpih_add(mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr, mpi_size_t s1_size,
+! mpi_ptr_t s2_ptr, mpi_size_t s2_size);
+!
+ /*-- mpih-sub.c --*/
+! static mpi_limb_t _gcry_mpih_sub_1( mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr,
+! mpi_size_t s1_size, mpi_limb_t s2_limb );
+ mpi_limb_t _gcry_mpih_sub_n( mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr,
+! mpi_ptr_t s2_ptr, mpi_size_t size);
+! static mpi_limb_t _gcry_mpih_sub(mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr, mpi_size_t s1_size,
+! mpi_ptr_t s2_ptr, mpi_size_t s2_size);
+!
+ /*-- mpih-cmp.c --*/
+! static int _gcry_mpih_cmp( mpi_ptr_t op1_ptr, mpi_ptr_t op2_ptr, mpi_size_t size );
+!
+ /*-- mpih-mul.c --*/
+
+ struct karatsuba_ctx {
diff --git a/tools/darwin/depends/libgcrypt/Makefile b/tools/darwin/depends/libgcrypt/Makefile
index 5498e52fb5..fc5d12c301 100644
--- a/tools/darwin/depends/libgcrypt/Makefile
+++ b/tools/darwin/depends/libgcrypt/Makefile
@@ -2,9 +2,10 @@ include ../Makefile.include
# lib name, version
LIBNAME=libgcrypt
-VERSION=1.4.0
+VERSION=1.4.5
SOURCE=$(LIBNAME)-$(VERSION)
ARCHIVE=$(SOURCE).tar.bz2
+BASE_URL=http://mirrors.dotsrc.org/gcrypt/libgcrypt
# configuration settings
export PATH:=$(TOOLCHAIN)/bin:$(PATH)
@@ -24,6 +25,7 @@ $(SOURCE): $(TARBALLS_LOCATION)/$(ARCHIVE)
$(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE)
echo $(SOURCE) > .gitignore
cd $(SOURCE); autoreconf -vif
+ cd $(SOURCE); patch -p0 < ../01-static-mpi_mpi-internal.patch
cd $(SOURCE); $(CONFIGURE)
$(LIBDYLIB): $(SOURCE)