diff options
| author | Tor Lillqvist <tml@iki.fi> | 2020-07-05 00:12:05 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2020-07-05 09:12:46 +0200 |
| commit | 6420c1edbf5b41c4ad0063e98e2040f2d74cf034 (patch) | |
| tree | f5ccfe7598e1c8a4bde2c92ec8686451beec6e73 | |
| parent | 1c4aa5c2d5625bbf05299639d4898872d2bd53bb (diff) | |
Bin leftover support for OS X on PowerPC
Change-Id: I2108aca1a7ce12fc0b028124170df502a6c46e60
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98012
Tested-by: Jenkins
Reviewed-by: Tor Lillqvist <tml@collabora.com>
| -rw-r--r-- | external/openssl/ExternalProject_openssl.mk | 1 | ||||
| -rw-r--r-- | external/openssl/UnpackedTarball_openssl.mk | 1 | ||||
| -rw-r--r-- | external/openssl/opensslosxppc.patch | 15 |
3 files changed, 0 insertions, 17 deletions
diff --git a/external/openssl/ExternalProject_openssl.mk b/external/openssl/ExternalProject_openssl.mk index 1378ef6ffa14..37efffefbf4a 100644 --- a/external/openssl/ExternalProject_openssl.mk +++ b/external/openssl/ExternalProject_openssl.mk @@ -45,7 +45,6 @@ OPENSSL_PLATFORM := \ $(if $(filter INTEL,$(CPUNAME)),VC-WIN32,VC-WIN64A)\ ,\ $(if $(filter MACOSX,$(OS)),\ - $(if $(filter POWERPC,$(CPUNAME)),darwin-ppc-cc)\ $(if $(filter INTEL,$(CPUNAME)),darwin-i386-cc)\ $(if $(filter X86_64,$(CPUNAME)),darwin64-x86_64-cc)\ )\ diff --git a/external/openssl/UnpackedTarball_openssl.mk b/external/openssl/UnpackedTarball_openssl.mk index 719b8b0e5842..05fd56448a58 100644 --- a/external/openssl/UnpackedTarball_openssl.mk +++ b/external/openssl/UnpackedTarball_openssl.mk @@ -18,7 +18,6 @@ $(eval $(call gb_UnpackedTarball_add_patches,openssl,\ external/openssl/openssl-1.0.1h-win64.patch.1 \ external/openssl/opensslsol.patch \ external/openssl/opensslios.patch \ - external/openssl/opensslosxppc.patch \ external/openssl/openssl-3650-masm.patch.1 \ external/openssl/openssl-fixbuild.patch.1 \ )) diff --git a/external/openssl/opensslosxppc.patch b/external/openssl/opensslosxppc.patch deleted file mode 100644 index 2e9168e8b306..000000000000 --- a/external/openssl/opensslosxppc.patch +++ /dev/null @@ -1,15 +0,0 @@ --*- Mode: diff -*- - ---- a/openssl/Configure -+++ b/openssl/Configure -@@ -620,8 +620,8 @@ - - ##### MacOS X (a.k.a. Rhapsody or Darwin) setup - "rhapsody-ppc-cc","cc:-O3 -DB_ENDIAN::(unknown):MACOSX_RHAPSODY::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${no_asm}::", --"darwin-ppc-cc","cc:-arch ppc -O3 -DB_ENDIAN -Wa,-force_cpusubtype_ALL::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${ppc32_asm}:osx32:dlfcn:darwin-shared:-fPIC -fno-common:-arch ppc -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", --"darwin64-ppc-cc","cc:-arch ppc64 -O3 -DB_ENDIAN::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${ppc64_asm}:osx64:dlfcn:darwin-shared:-fPIC -fno-common:-arch ppc64 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", -+"darwin-ppc-cc","cc:-m32 -O3 -DB_ENDIAN -Wa,-force_cpusubtype_ALL::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${ppc32_asm}:osx32:dlfcn:darwin-shared:-fPIC -fno-common:-arch ppc -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", -+"darwin64-ppc-cc","cc:-m64 -O3 -DB_ENDIAN::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${ppc64_asm}:osx64:dlfcn:darwin-shared:-fPIC -fno-common:-arch ppc64 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", - "darwin-i386-cc","cc:-arch i386 -O3 -fomit-frame-pointer -DL_ENDIAN::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:BN_LLONG RC4_INT RC4_CHUNK DES_UNROLL BF_PTR:".eval{my $asm=$x86_asm;$asm=~s/cast\-586\.o//;$asm}.":macosx:dlfcn:darwin-shared:-fPIC -fno-common:-arch i386 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", - "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 -Wall::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:".eval{my $asm=$x86_64_asm;$asm=~s/rc4\-[^:]+//;$asm}.":macosx:dlfcn:darwin-shared:-fPIC -fno-common:-arch x86_64 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", |