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 /nss | |
| 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 'nss')
| -rw-r--r-- | nss/ExternalProject_nss.mk | 2 | ||||
| -rw-r--r-- | nss/nss.patch | 8 |
2 files changed, 7 insertions, 3 deletions
diff --git a/nss/ExternalProject_nss.mk b/nss/ExternalProject_nss.mk index c853d89ddcf1..be1638544b9e 100644 --- a/nss/ExternalProject_nss.mk +++ b/nss/ExternalProject_nss.mk @@ -40,7 +40,7 @@ ifeq ($(OS),WNT) ifeq ($(COM),MSC) $(call gb_ExternalProject_get_state_target,nss,build): $(call gb_ExternalProject_get_state_target,nss,configure) $(call gb_ExternalExecutable_get_dependencies,python) $(call gb_ExternalProject_run,build,\ - $(if $(debug),,BUILD_OPT=1) \ + $(if $(MSVC_USE_DEBUG_RUNTIME),USE_DEBUG_RTL=1,BUILD_OPT=1) \ MOZ_MSVCVERSION=9 OS_TARGET=WIN95 \ $(if $(filter X,$(CPU)),USE_64=1) \ LIB="$(ILIB)" \ diff --git a/nss/nss.patch b/nss/nss.patch index d0e33181ec99..ca8106141c36 100644 --- a/nss/nss.patch +++ b/nss/nss.patch @@ -120,7 +120,7 @@ ifndef BUILD_OPT --- misc/nss-3.13.5/mozilla/security/coreconf/arch.mk 2009-06-05 04:14:49.000000000 +0200 +++ misc/build/nss-3.13.5/mozilla/security/coreconf/arch.mk 2010-06-11 16:35:54.990913282 +0200 -@@ -324,7 +324,12 @@ +@@ -324,10 +324,15 @@ # IMPL_STRATEGY may be defined too. # @@ -133,7 +133,11 @@ +OBJDIR_NAME = out ifeq (,$(filter-out WIN%,$(OS_TARGET))) - ifndef BUILD_OPT +-ifndef BUILD_OPT ++ifdef THIS_HAS_BEEN_DISABLED_TO_GET_out + # + # Define USE_DEBUG_RTL if you want to use the debug runtime library + # (RTL) in the debug build --- misc/nss-3.13.5/mozilla/security/nss/cmd/platlibs.mk 2010-02-04 19:59:10.000000000 +0100 +++ misc/build/nss-3.13.5/mozilla/security/nss/cmd/platlibs.mk 2010-06-11 16:35:55.004869805 +0200 @@ -41,27 +41,32 @@ |