You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by ar...@apache.org on 2021/11/16 21:12:37 UTC
[openoffice] 04/06: This is not needed any more with latest OpenSSL
This is an automated email from the ASF dual-hosted git repository.
ardovm pushed a commit to branch serf
in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit 2b0b520d573e38130e39d34b6fe43ea70770196a
Author: Arrigo Marchiori <ar...@yahoo.it>
AuthorDate: Tue Nov 16 22:04:01 2021 +0100
This is not needed any more with latest OpenSSL
---
main/openssl/openssllnx.patch | 25 -------------------------
1 file changed, 25 deletions(-)
diff --git a/main/openssl/openssllnx.patch b/main/openssl/openssllnx.patch
index 0779f7b..e69de29 100644
--- a/main/openssl/openssllnx.patch
+++ b/main/openssl/openssllnx.patch
@@ -1,25 +0,0 @@
-diff -ur misc/openssl-1.1.1l/Configure misc/build/openssl-1.1.1l/Configure
---- misc/openssl-1.1.1l/Configure 2018-08-14 05:49:04.000000000 -0700
-+++ misc/build/openssl-1.1.1l/Configure 2018-08-26 13:35:54.485021000 -0700
-@@ -493,6 +493,9 @@
-
- "bsdi-elf-gcc", "gcc:-DPERL5 -DL_ENDIAN -fomit-frame-pointer -O3 -march=i486 -Wall::(unknown)::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-
-+"debian-kfreebsd-amd64","gcc:-m64 -DL_ENDIAN -DTERMIOS -O3 -Wa,--noexecstack -Wall -DMD32_REG_T=int::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK BF_PTR2 DES_INT DES_UNROLL:${x86_64_asm}:dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-kfreebsd-i386","gcc:-DL_ENDIAN -DTERMIOS -O3 -Wa,--noexecstack -g -march=i486 -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+
- "nextstep", "cc:-O -Wall:<libc.h>:(unknown):::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:::",
- "nextstep3.3", "cc:-O3 -Wall:<libc.h>:(unknown):::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:::",
-
-diff -ur misc/openssl-1.1.1l/Makefile.org misc/build/openssl-1.1.1l/Makefile.org
---- misc/openssl-1.1.1l/Makefile.org 2018-08-14 05:48:56.000000000 -0700
-+++ misc/build/openssl-1.1.1l/Makefile.org 2018-08-26 13:35:54.485813000 -0700
-@@ -208,7 +208,7 @@
- # same language for uniform treatment.
- BUILDENV= LC_ALL=C PLATFORM='$(PLATFORM)' PROCESSOR='$(PROCESSOR)'\
- CC='$(CC)' CFLAG='$(CFLAG)' \
-- AS='$(CC)' ASFLAG='$(CFLAG) -c' \
-+ AS='$(CC)' ASFLAG='$(CFLAG) -c -Wa,--noexecstack' \
- AR='$(AR)' NM='$(NM)' RANLIB='$(RANLIB)' \
- RC='$(RC)' \
- CROSS_COMPILE='$(CROSS_COMPILE)' \