[Libreoffice-commits] .: openssl/makefile.mk openssl/opensslios.patch

[Tor Lillqvist]

 openssl/makefile.mk      |    6 ++++++
 openssl/opensslios.patch |   12 ++++++++++++
 2 files changed, 18 insertions(+)

New commits:
commit 11eb56d47823130dad4e334df9eaffbc7876093e
Author: Tor Lillqvist <tml at iki.fi>
Date:   Mon Jun 13 02:06:08 2011 +0300

    Enable building openssl for iOS
    
    Wasn't that complicated after all.

diff --git a/openssl/makefile.mk b/openssl/makefile.mk
index 21a8dc7..1b789b3 100644
--- a/openssl/makefile.mk
+++ b/openssl/makefile.mk
@@ -110,6 +110,12 @@ UNAME=$(shell uname)
     .ENDIF
 .ENDIF
 
+.IF "$(OS)" == "IOS"
+    PATCH_FILES=opensslios.patch
+    CONFIGURE_ACTION=Configure ios-armv7
+    CONFIGURE_FLAGS=no-shared no-idea
+.ENDIF
+
 .IF "$(OS)" == "WNT"
 
 .IF "$(COM)"=="GCC"
diff --git a/openssl/opensslios.patch b/openssl/opensslios.patch
new file mode 100644
index 0000000..48166e8
--- /dev/null
+++ b/openssl/opensslios.patch
@@ -0,0 +1,12 @@
+--- misc/openssl-0.9.8o/Configure
++++ misc/build/openssl-0.9.8o/Configure
+@@ -530,6 +530,9 @@
+ "darwin64-x86_64-cc","cc:-arch x86_64 -O3 -fomit-frame-pointer -DL_ENDIAN -DMD32_REG_T=int -Wall::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL:${no_asm}:dlfcn:darwin-shared:-fPIC -fno-common:-arch x86_64 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
+ "debug-darwin-ppc-cc","cc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG -DB_ENDIAN -g -Wall -O::-D_REENTRANT:MACOSX::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR::osx_ppc32.o::::::::::dlfcn:darwin-shared:-fPIC -fno-common:-dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
+ 
++##### iOS
++"ios-armv7","gcc:-arch armv7 -O3 -fomit-frame-pointer -DL_ENDIAN:::IOS::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${no_asm}:::::",
++
+ ##### A/UX
+ "aux3-gcc","gcc:-O2 -DTERMIO::(unknown):AUX:-lbsd:RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:::",
+