forked from amazingfate/loongoffice
01798050c1
We can't "break symlinks after extracting tarball" because they populate that dir during the build now. So instead cripple mklink.pl to copy instead of link. (Configure no-symlinks simply skips the symlink step instead of copying, so that appears useless) Change-Id: Ib30b2c1b8b3de72511d09c478297a7a5a4bc691e Reviewed-on: https://gerrit.libreoffice.org/21880 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
24 lines
1.6 KiB
Diff
24 lines
1.6 KiB
Diff
--- build/openssl-0.9.8v/Configure-old 2010-04-17 13:51:42.000000000 +0200
|
|
+++ build/openssl-0.9.8v/Configure 2010-04-17 13:52:03.000000000 +0200
|
|
@@ -388,6 +388,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}:::",
|
|
|
|
--- build/openssl-0.9.8v/Makefile.org 2010-01-27 17:06:36.000000000 +0100
|
|
+++ build/openssl-0.9.8v/Makefile.org 2010-09-20 09:24:00.000000000 +0100
|
|
@@ -206,7 +206,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)' \
|
|
CROSS_COMPILE='$(CROSS_COMPILE)' \
|
|
PERL='$(PERL)' ENGDIRS='$(ENGDIRS)' \
|