[Libreoffice-commits] core.git: 6 commits - external/coinmp external/libxslt external/lpsolve external/openssl solenv/gbuild solenv/gcc-wrappers
Michael Stahl
mstahl at redhat.com
Mon Jan 8 11:43:01 UTC 2018
external/coinmp/windows.build.patch.1 | 16 ++++++++--------
external/libxslt/ExternalProject_libxslt.mk | 1 +
external/lpsolve/lp_solve_5.5-windows.patch | 2 +-
external/openssl/opensslwnt.patch | 15 +++++++++++++--
solenv/gbuild/platform/com_MSC_class.mk | 2 +-
solenv/gcc-wrappers/wrapper.cxx | 2 +-
6 files changed, 25 insertions(+), 13 deletions(-)
New commits:
commit 3dc21da3b01811e9e26890e3a30ea73589f36ea1
Author: Michael Stahl <mstahl at redhat.com>
Date: Mon Jan 8 12:37:15 2018 +0100
libxslt: enable debug if ENABLE_DBGUTIL
BinScope requires a PDB file to check the DLL.
Change-Id: Id4c584fb5b0e1a7368708267bb4650e4f1c61e79
diff --git a/external/libxslt/ExternalProject_libxslt.mk b/external/libxslt/ExternalProject_libxslt.mk
index 8d6a40f5e187..3e4ebb87ea0a 100644
--- a/external/libxslt/ExternalProject_libxslt.mk
+++ b/external/libxslt/ExternalProject_libxslt.mk
@@ -21,6 +21,7 @@ $(call gb_ExternalProject_get_state_target,libxslt,build):
$(call gb_ExternalProject_run,build,\
cscript /e:javascript configure.js \
$(if $(MSVC_USE_DEBUG_RUNTIME),cruntime=/MDd) \
+ $(if $(filter TRUE,$(ENABLE_DBGUTIL)),debug=yes) \
vcmanifest=yes \
lib=$(call gb_UnpackedTarball_get_dir,libxml2)/win32/bin.msvc \
&& nmake \
commit d6b91568d22b9019ddf098f3c3072de25eb1c268
Author: Michael Stahl <mstahl at redhat.com>
Date: Mon Jan 8 12:34:59 2018 +0100
gcc-wrappers: recognise -ggdb.* in addition to -g as debug flag
Firebird uses -ggdb. This causes it to have 2 PDB files, however
this isn't sufficient to make BinScope happy, more investigation
needed.
Change-Id: I5286964586eaffea36790ab7a7ca2df75d85f068
diff --git a/solenv/gcc-wrappers/wrapper.cxx b/solenv/gcc-wrappers/wrapper.cxx
index 800687ad65a6..eb8954bc9764 100644
--- a/solenv/gcc-wrappers/wrapper.cxx
+++ b/solenv/gcc-wrappers/wrapper.cxx
@@ -127,7 +127,7 @@ string processccargs(vector<string> rawargs) {
exit(1);
}
}
- else if(*i == "-g") {
+ else if(*i == "-g" || !(*i).compare(0,5,"-ggdb")) {
args.append("-Zi");
args.append(" -FS");
}
commit e8f2ca76037eed4c10c9851682c7f6856c7fb0de
Author: Michael Stahl <mstahl at redhat.com>
Date: Mon Jan 8 12:33:55 2018 +0100
gbuild: MSVC: invoke MSASM with /safeseh
BinScope complains that the sblo.dll lacks SAFESEH flag.
Change-Id: If2b4b6592eac37542c3e2745d90a8e432b8da2e2
diff --git a/solenv/gbuild/platform/com_MSC_class.mk b/solenv/gbuild/platform/com_MSC_class.mk
index 0916c2fd1fd9..27a0aec80c4b 100644
--- a/solenv/gbuild/platform/com_MSC_class.mk
+++ b/solenv/gbuild/platform/com_MSC_class.mk
@@ -95,7 +95,7 @@ define gb_AsmObject__command
$(call gb_Output_announce,$(2),$(true),ASM,3)
$(call gb_Helper_abbreviate_dirs,\
mkdir -p $(dir $(1)) $(dir $(4)) && \
- "$(ML_EXE)" /c /Cp $(gb_AFLAGS) -D$(COM) /Fo$(1) $(3)) && \
+ "$(ML_EXE)" /safeseh /c /Cp $(gb_AFLAGS) -D$(COM) /Fo$(1) $(3)) && \
echo "$(1) : $(3)" > $(4)
endef
commit 8f3ca0831993f7d687d7fc0feb1abe0c67a413bd
Author: Michael Stahl <mstahl at redhat.com>
Date: Mon Jan 8 12:31:39 2018 +0100
openssl: MSVC build: link and run MSASM with /SAFESEH
Actually the assembler requires lowercase /safeseh, oddly enough.
Change-Id: I1569409a2d6358282a7463ea996a6b1615e6ed8c
diff --git a/external/openssl/opensslwnt.patch b/external/openssl/opensslwnt.patch
index e22bea6f077b..c5c96dd25700 100644
--- a/external/openssl/opensslwnt.patch
+++ b/external/openssl/opensslwnt.patch
@@ -79,15 +79,26 @@ diff -ru openssl.orig/util/mk1mf.pl openssl/util/mk1mf.pl
APP_CFLAG=$app_cflag
LIB_CFLAG=$lib_cflag
SHLIB_CFLAG=$shl_cflag
-@@ -488,7 +493,7 @@
+@@ -488,8 +493,8 @@
+ SRC_D=$src_dir
LINK_CMD=$link
- LFLAGS=$lflags
+-LFLAGS=$lflags
++LFLAGS=$lflags /SAFESEH
-RSC=$rsc
+RSC=$rsc \$(SOLARINC)
# The output directory for everything interesting
OUT_D=$out_dir
+@@ -511,7 +516,7 @@
+ MKDIR=$mkdir
+ MKLIB=$bin_dir$mklib
+ MLFLAGS=$mlflags
+-ASM=$bin_dir$asm
++ASM=$bin_dir$asm /safeseh
+
+ # FIPS validated module and support file locations
+
@@ -669,7 +674,7 @@
printf OUT <<EOF;
#ifdef $platform_cpp_symbol
commit 65e63f48dac411de9e85ee5d8789f6d1329a0725
Author: Michael Stahl <mstahl at redhat.com>
Date: Mon Jan 8 12:21:31 2018 +0100
lpsolve: always generate symbols with MSVC
BinScope requires a PDB file to check the DLL; not worth the effort
to conditionalize this.
Change-Id: Ibb9800baa0932495504f0bebea2ffa765aa0cecf
diff --git a/external/lpsolve/lp_solve_5.5-windows.patch b/external/lpsolve/lp_solve_5.5-windows.patch
index 368c90d04270..1ea580dc8311 100644
--- a/external/lpsolve/lp_solve_5.5-windows.patch
+++ b/external/lpsolve/lp_solve_5.5-windows.patch
@@ -46,7 +46,7 @@
-rc lpsolve.rc
+rc %SOLARINC% lpsolve.rc
-%c% -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL -I../colamd /LD /MD /O1 /Zp8 /Gz -D_WINDLL -D_USRDLL -DWIN32 -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE -DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine %src% lpsolve.res ..\lp_solve.def -o lpsolve55.dll
-+%c% -arch:SSE -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL -I../colamd %SOLARINC% /LD %RUNTIME_FLAG% /O1 /Zp8 /Gz -D_WINDLL -D_USRDLL -DWIN32 -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE -DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine %src% lpsolve.res ..\lp_solve.def -Felpsolve55.dll
++%c% -arch:SSE -Zi -FS -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL -I../colamd %SOLARINC% /LD %RUNTIME_FLAG% /O1 /Zp8 /Gz -D_WINDLL -D_USRDLL -DWIN32 -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE -DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine %src% lpsolve.res ..\lp_solve.def -Felpsolve55.dll
-rem /link /LINK50COMPAT
-
-if exist a.obj del a.obj
commit b0471fc84a065faf2aa38925c486b40b185ffa58
Author: Michael Stahl <mstahl at redhat.com>
Date: Mon Jan 8 12:20:04 2018 +0100
coinmp: link with /DYNAMICBASE
No idea why this would be explicitly disabled.
Change-Id: I1e06544ae4ae579de578560ce66e310da659ccb4
diff --git a/external/coinmp/windows.build.patch.1 b/external/coinmp/windows.build.patch.1
index e2e292e3ff28..2bd0526ac2c4 100644
--- a/external/coinmp/windows.build.patch.1
+++ b/external/coinmp/windows.build.patch.1
@@ -1966,7 +1966,7 @@ diff -urN coinmp.org/CoinMP/MSVisualStudio/v9/CoinMP/CoinMP.vcxproj coinmp/CoinM
+ <ModuleDefinitionFile>..\..\..\..\CoinMP\src\CoinMP.def</ModuleDefinitionFile>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <SubSystem>Windows</SubSystem>
-+ <RandomizedBaseAddress>false</RandomizedBaseAddress>
++ <RandomizedBaseAddress>true</RandomizedBaseAddress>
+ <DataExecutionPrevention />
+ <TargetMachine>MachineX86</TargetMachine>
+ </Link>
@@ -1987,7 +1987,7 @@ diff -urN coinmp.org/CoinMP/MSVisualStudio/v9/CoinMP/CoinMP.vcxproj coinmp/CoinM
+ <SubSystem>Windows</SubSystem>
+ <OptimizeReferences>true</OptimizeReferences>
+ <EnableCOMDATFolding>true</EnableCOMDATFolding>
-+ <RandomizedBaseAddress>false</RandomizedBaseAddress>
++ <RandomizedBaseAddress>true</RandomizedBaseAddress>
+ <DataExecutionPrevention />
+ <TargetMachine>MachineX86</TargetMachine>
+ </Link>
@@ -2012,7 +2012,7 @@ diff -urN coinmp.org/CoinMP/MSVisualStudio/v9/CoinMP/CoinMP.vcxproj coinmp/CoinM
+ <ModuleDefinitionFile>..\..\..\..\CoinMP\src\CoinMP.def</ModuleDefinitionFile>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <SubSystem>Windows</SubSystem>
-+ <RandomizedBaseAddress>false</RandomizedBaseAddress>
++ <RandomizedBaseAddress>true</RandomizedBaseAddress>
+ <DataExecutionPrevention />
+ <TargetMachine>MachineX64</TargetMachine>
+ </Link>
@@ -2036,7 +2036,7 @@ diff -urN coinmp.org/CoinMP/MSVisualStudio/v9/CoinMP/CoinMP.vcxproj coinmp/CoinM
+ <SubSystem>Windows</SubSystem>
+ <OptimizeReferences>true</OptimizeReferences>
+ <EnableCOMDATFolding>true</EnableCOMDATFolding>
-+ <RandomizedBaseAddress>false</RandomizedBaseAddress>
++ <RandomizedBaseAddress>true</RandomizedBaseAddress>
+ <DataExecutionPrevention />
+ <TargetMachine>MachineX64</TargetMachine>
+ </Link>
@@ -2273,7 +2273,7 @@ diff -urN coinmp.org/CoinMP/MSVisualStudio/v9/unitTest/unitTest.vcxproj coinmp/C
+ <Link>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <SubSystem>Console</SubSystem>
-+ <RandomizedBaseAddress>false</RandomizedBaseAddress>
++ <RandomizedBaseAddress>true</RandomizedBaseAddress>
+ <DataExecutionPrevention />
+ <TargetMachine>MachineX86</TargetMachine>
+ </Link>
@@ -2293,7 +2293,7 @@ diff -urN coinmp.org/CoinMP/MSVisualStudio/v9/unitTest/unitTest.vcxproj coinmp/C
+ <SubSystem>Console</SubSystem>
+ <OptimizeReferences>true</OptimizeReferences>
+ <EnableCOMDATFolding>true</EnableCOMDATFolding>
-+ <RandomizedBaseAddress>false</RandomizedBaseAddress>
++ <RandomizedBaseAddress>true</RandomizedBaseAddress>
+ <DataExecutionPrevention />
+ <TargetMachine>MachineX86</TargetMachine>
+ </Link>
@@ -2317,7 +2317,7 @@ diff -urN coinmp.org/CoinMP/MSVisualStudio/v9/unitTest/unitTest.vcxproj coinmp/C
+ <Link>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <SubSystem>Console</SubSystem>
-+ <RandomizedBaseAddress>false</RandomizedBaseAddress>
++ <RandomizedBaseAddress>true</RandomizedBaseAddress>
+ <DataExecutionPrevention />
+ <TargetMachine>MachineX64</TargetMachine>
+ </Link>
@@ -2340,7 +2340,7 @@ diff -urN coinmp.org/CoinMP/MSVisualStudio/v9/unitTest/unitTest.vcxproj coinmp/C
+ <SubSystem>Console</SubSystem>
+ <OptimizeReferences>true</OptimizeReferences>
+ <EnableCOMDATFolding>true</EnableCOMDATFolding>
-+ <RandomizedBaseAddress>false</RandomizedBaseAddress>
++ <RandomizedBaseAddress>true</RandomizedBaseAddress>
+ <DataExecutionPrevention />
+ <TargetMachine>MachineX64</TargetMachine>
+ </Link>
More information about the Libreoffice-commits
mailing list