diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-04-14 13:52:56 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-04-15 15:26:32 +0200 |
| commit | 4811c2dc9f94929b60e7e2e0077871aad14fdc3a (patch) | |
| tree | 8754348c8dbdf9c4fb91e0d70346f96ee7455999 /scp2 | |
| parent | 3b65852f37f1c8daf8c5c0af1d810c68cc71d8e3 (diff) | |
adapt all externals to build against MSVC debug runtime
Add patches and/or tweaks to the following modules:
curl, cppunit, icu, lcms2, libxml2, libxslt, libxmlsec,
lpsolve, nss, openssl, python3
lcms2 has an inconsistency where the .lib and the .dll don't agree on
the .dll name.
openssl gets a honorable mention because apparently it's undocumented
custom build system can build with /MDd if one picks the right
configuration but i couldn't figure out how to do that in an hour of
trying, and just patched the release config instead.
Change-Id: I7854a0fc85247e398d561b4f513d09fe2d1ebb3c
Diffstat (limited to 'scp2')
| -rw-r--r-- | scp2/InstallModule_ooo.mk | 1 | ||||
| -rw-r--r-- | scp2/InstallModule_python.mk | 3 | ||||
| -rw-r--r-- | scp2/source/ooo/file_library_ooo.scp | 16 | ||||
| -rw-r--r-- | scp2/source/python/file_python.scp | 2 |
4 files changed, 21 insertions, 1 deletions
diff --git a/scp2/InstallModule_ooo.mk b/scp2/InstallModule_ooo.mk index 3390f45b75e7..70692211db02 100644 --- a/scp2/InstallModule_ooo.mk +++ b/scp2/InstallModule_ooo.mk @@ -103,6 +103,7 @@ $(eval $(call gb_InstallModule_add_defs,scp2/ooo,\ $(if $(filter YES,$(SYSTEM_HSQLDB)),\ -DHSQLDB_JAR=\""$(call gb_Helper_make_path,$(HSQLDB_JAR))"\" \ ) \ + $(if $(filter MSC,$(COM)),$(if $(MSVC_USE_DEBUG_RUNTIME),-DMSVC_PKG_DEBUG_RUNTIME)) \ )) ifeq ($(GUIBASE),unx) diff --git a/scp2/InstallModule_python.mk b/scp2/InstallModule_python.mk index 8b8af4809bda..9839ef6bd75f 100644 --- a/scp2/InstallModule_python.mk +++ b/scp2/InstallModule_python.mk @@ -49,7 +49,8 @@ $(eval $(call gb_InstallModule_add_defs,scp2/python,\ -DPYVERSION=$(PYTHON_VERSION) \ -DPYMAJMIN=$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR) \ -DPYMAJOR=$(PYTHON_VERSION_MAJOR) \ - -DPY_FULL_DLL_NAME=$(if $(filter WNT-MSC,$(OS)-$(COM)),python$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR).dll,libpython$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)m.so) \ + -DPY_FULL_DLL_NAME=$(if $(filter WNT-MSC,$(OS)-$(COM)),python$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)$(if $(MSVC_USE_DEBUG_RUNTIME),_d).dll,libpython$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)m.so) \ + $(if $(filter MSC,$(COM)),$(if $(MSVC_USE_DEBUG_RUNTIME),-DMSVC_PKG_DEBUG_RUNTIME)) \ )) endif diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp index b9298013f174..5aafd046585a 100644 --- a/scp2/source/ooo/file_library_ooo.scp +++ b/scp2/source/ooo/file_library_ooo.scp @@ -595,7 +595,11 @@ File gid_File_Lib_Icudata #ifdef UNX Name = STRING(CONCAT6(libicudata,UNXSUFFIX,.,ICU_MAJOR,.,ICU_MINOR)); #else + #ifdef MSVC_PKG_DEBUG_RUNTIME + Name = STRING(CONCAT3(icudtd,ICU_MAJOR,.dll)); + #else Name = STRING(CONCAT3(icudt,ICU_MAJOR,.dll)); + #endif // MSVC_PKG_DEBUG_RUNTIME #endif Dir = SCP2_OOO_BIN_DIR; Styles = (PACKED); @@ -606,7 +610,11 @@ File gid_File_Lib_Icui18n #ifdef UNX Name = STRING(CONCAT6(libicui18n,UNXSUFFIX,.,ICU_MAJOR,.,ICU_MINOR)); #else + #ifdef MSVC_PKG_DEBUG_RUNTIME + Name = STRING(CONCAT3(icuind,ICU_MAJOR,.dll)); + #else Name = STRING(CONCAT3(icuin,ICU_MAJOR,.dll)); + #endif // MSVC_PKG_DEBUG_RUNTIME #endif Dir = SCP2_OOO_BIN_DIR; Styles = (PACKED); @@ -617,7 +625,11 @@ File gid_File_Lib_Icule #ifdef UNX Name = STRING(CONCAT6(libicule,UNXSUFFIX,.,ICU_MAJOR,.,ICU_MINOR)); #else + #ifdef MSVC_PKG_DEBUG_RUNTIME + Name = STRING(CONCAT3(iculed,ICU_MAJOR,.dll)); + #else Name = STRING(CONCAT3(icule,ICU_MAJOR,.dll)); + #endif // MSVC_PKG_DEBUG_RUNTIME #endif Dir = SCP2_OOO_BIN_DIR; Styles = (PACKED); @@ -628,7 +640,11 @@ File gid_File_Lib_Icuuc #ifdef UNX Name = STRING(CONCAT6(libicuuc,UNXSUFFIX,.,ICU_MAJOR,.,ICU_MINOR)); #else + #ifdef MSVC_PKG_DEBUG_RUNTIME + Name = STRING(CONCAT3(icuucd,ICU_MAJOR,.dll)); + #else Name = STRING(CONCAT3(icuuc,ICU_MAJOR,.dll)); + #endif // MSVC_PKG_DEBUG_RUNTIME #endif Dir = SCP2_OOO_BIN_DIR; Styles = (PACKED); diff --git a/scp2/source/python/file_python.scp b/scp2/source/python/file_python.scp index 3390e67b87aa..ce892fd6fad3 100644 --- a/scp2/source/python/file_python.scp +++ b/scp2/source/python/file_python.scp @@ -167,6 +167,7 @@ File gid_File_Lib_Python_So Name = STRING(PY_FULL_DLL_NAME); Styles = (PACKED); End +#ifndef MSVC_PKG_DEBUG_RUNTIME File gid_File_Lib_Python3_So LIB_FILE_BODY; Dir = gid_Brand_Dir_Program; @@ -177,6 +178,7 @@ File gid_File_Lib_Python3_So #endif //UNX Styles = (PACKED); End +#endif #else //MACOSX //directory entries solely to be able to create the symlinks Directory gid_Dir_PythonFramework |