diff options
Diffstat (limited to 'tools/osx')
-rw-r--r-- | tools/osx/ios-depends/openssl/01-build-armv7.patch | 36 |
1 files changed, 0 insertions, 36 deletions
diff --git a/tools/osx/ios-depends/openssl/01-build-armv7.patch b/tools/osx/ios-depends/openssl/01-build-armv7.patch deleted file mode 100644 index 1f0d57aded..0000000000 --- a/tools/osx/ios-depends/openssl/01-build-armv7.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff -ruN openssl-1.0.0a/Makefile openssl-1.0.0a.mod/Makefile ---- openssl-1.0.0a/Makefile 2010-10-31 18:12:06.000000000 -0400 -+++ openssl-1.0.0a.mod/Makefile 2010-10-31 18:02:34.000000000 -0400 -@@ -59,8 +59,8 @@ - # equal 4. - # PKCS1_CHECK - pkcs1 tests. - --CC= /Developer/Platforms/iPhoneOS.platform/Developer/usr/bin/arm-apple-darwin10-gcc-4.2.1 --CFLAG= -fPIC -fno-common -DOPENSSL_PIC -DZLIB -DOPENSSL_THREADS -D_REENTRANT -DDSO_DLFCN -DHAVE_DLFCN_H -arch i386 -O3 -fomit-frame-pointer -DL_ENDIAN -+CC= /Developer/Platforms/iPhoneOS.platform/Developer/usr/bin/gcc-4.2 -+CFLAG= -isysroot /Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS4.2.sdk -fPIC -fno-common -DOPENSSL_PIC -DZLIB -DOPENSSL_THREADS -D_REENTRANT -DDSO_DLFCN -DHAVE_DLFCN_H -arch armv7 -O3 -fomit-frame-pointer -DL_ENDIAN - DEPFLAG= -DOPENSSL_NO_GMP -DOPENSSL_NO_JPAKE -DOPENSSL_NO_MD2 -DOPENSSL_NO_RC5 -DOPENSSL_NO_RFC3779 -DOPENSSL_NO_STORE - PEX_LIBS= -Wl,-search_paths_first - EX_LIBS= -lz -@@ -150,7 +150,7 @@ - SHARED_SSL=libssl$(SHLIB_EXT) - SHARED_LIBS=$(SHARED_CRYPTO) $(SHARED_SSL) - SHARED_LIBS_LINK_EXTS=.$(SHLIB_MAJOR).dylib .dylib --SHARED_LDFLAGS=-arch i386 -dynamiclib -+SHARED_LDFLAGS=-arch armv7 -dynamiclib - - GENERAL= Makefile - BASENAME= openssl -diff -ruN openssl-1.0.0a/crypto/ui/ui_openssl.c openssl-1.0.0a.mod/crypto/ui/ui_openssl.c ---- openssl-1.0.0a/crypto/ui/ui_openssl.c 2009-10-04 12:43:21.000000000 -0400 -+++ openssl-1.0.0a.mod/crypto/ui/ui_openssl.c 2010-10-31 16:03:45.000000000 -0400 -@@ -404,7 +404,7 @@ - return 1; - } - --static volatile sig_atomic_t intr_signal; -+static volatile intr_signal; - #endif - - static int read_string_inner(UI *ui, UI_STRING *uis, int echo, int strip_nl) - |