Commits

Tuukka Norri committed d475941

Updated OpenSSL and iPhone OS build scripts

Comments (0)

Files changed (5)

Contrib/OpenSSL/openssl-0.9.8h.tar.gz

Binary file removed.

Contrib/OpenSSL/openssl-1.0.0.tar.gz

Binary file added.

Patches/openssl.patch

---- openssl-0.9.8h-orig/Configure	2008-05-02 02:11:30.000000000 +0300
-+++ openssl-0.9.8h/Configure	2008-08-15 00:48:03.000000000 +0300
-@@ -514,6 +514,7 @@
- "darwin-i386-cc","cc:-arch i386 -O3 -fomit-frame-pointer -fno-common::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${no_asm}:dlfcn:darwin-shared:-fPIC -fno-common:-arch i386 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
- "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 BF_PTR2 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",
+--- openssl-1.0.0-orig/Configure	2010-05-04 02:06:04.000000000 +0300
++++ openssl-1.0.0/Configure 2010-05-04 02:06:25.000000000 +0300
+@@ -553,6 +553,7 @@
+ "debug-darwin-i386-cc","cc:-arch i386 -g3 -DL_ENDIAN::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:BN_LLONG RC4_INT RC4_CHUNK DES_UNROLL BF_PTR:${x86_asm}:macosx:dlfcn:darwin-shared:-fPIC -fno-common:-arch i386 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
+ "darwin64-x86_64-cc","cc:-arch x86_64 -O3 -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:${x86_64_asm}:macosx: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:${ppc32_asm}:osx32:dlfcn:darwin-shared:-fPIC:-dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
 +"darwin-arm-gcc","$ENV{'CC'}:-arch armv6 -mthumb -O3 -fomit-frame-pointer -fno-common -D_DARWIN_C_SOURCE -isysroot $ENV{'SDKROOT'}::-D_REENTRANT:MACOSX:-Wl,-syslibroot,$ENV{'SDKROOT'},-search_paths_first%:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${no_asm}:dlfcn:darwin-static:-fPIC -fno-common:-arch armv6 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
  
  ##### A/UX

Tools/PostgreSQL/build-postgresql.sh

 		opts=(
 			arm
 			arm-apple-darwin
-			"${PLATFORM_DEVELOPER_BIN_DIR}/gcc-4.2"
+            "${DEVELOPER_DIR}/Platforms/iPhoneOS.platform/Developer/usr/bin/gcc-4.2"
 			"-arch armv6 -mthumb"
 			"-arch armv6 -isysroot ${SDKROOT}"
 			"-Wl,-syslibroot,${SDKROOT}"

Tools/build-openssl.sh

 . "$SRCROOT"/Tools/defines.sh
-openssl_source_file=openssl-0.9.8h.tar.gz
-openssl_dir=openssl-0.9.8h
+openssl_source_file=openssl-1.0.0.tar.gz
+openssl_dir=openssl-1.0.0
 openssl_root="$my_build_dir"/"$openssl_dir"
 
 
 
 		gnutar -zxf "$openssl_source_file" -C "$my_build_dir"
 		exit_on_error
-		patch -p1 -d "$openssl_root" < "$SRCROOT"/PostgreSQL/openssl.patch
+		patch -p1 -d "$openssl_root" < "$SRCROOT"/Patches/openssl.patch
 		exit_on_error
 		
 		pushd "$my_build_dir"
 then
     echo "yes."
 
-	export CC="${PLATFORM_DEVELOPER_BIN_DIR}/gcc-4.0"
+	export CC="${DEVELOPER_DIR}/Platforms/iPhoneOS.platform/Developer/usr/bin/gcc-4.2"
 	mkdir -p "$my_build_dir"
 	
 	pushd "$SRCROOT"/Contrib/OpenSSL