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 /RepositoryFixes.mk | |
| 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 'RepositoryFixes.mk')
| -rw-r--r-- | RepositoryFixes.mk | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/RepositoryFixes.mk b/RepositoryFixes.mk index 2a4969ef39d0..24289481ca00 100644 --- a/RepositoryFixes.mk +++ b/RepositoryFixes.mk @@ -107,11 +107,13 @@ gb_Library_FILENAMES := $(patsubst xmlsec1-nss:ixmlsec1-nss%,xmlsec1-nss:libxmls gb_Library_FILENAMES := $(patsubst z:z%,z:zlib%,$(gb_Library_FILENAMES)) +gb_Library_NOILIBFILENAMES_D := \ + icudt icuin icule icuuc \ + lcms2 \ + # change the names of all import libraries that don't have an "i" prefix as in our standard naming schema gb_Library_NOILIBFILENAMES := \ - icudt icuin icule icuuc \ langtag \ - lcms2 \ lpsolve55 \ xpcom \ xpcom_core \ @@ -129,10 +131,12 @@ gb_Library_LIBLIBFILENAMES := \ gb_Library_FILENAMES := \ $(filter-out $(foreach lib,$(gb_Library_NOILIBFILENAMES),$(lib):%) \ + $(foreach lib,$(gb_Library_NOILIBFILENAMES_D),$(lib):%) \ $(foreach lib,$(gb_Library_LIBLIBFILENAMES),$(lib):%) \ ,$(gb_Library_FILENAMES)) gb_Library_FILENAMES += \ $(foreach lib,$(gb_Library_NOILIBFILENAMES),$(lib):$(lib)$(gb_Library_PLAINEXT)) \ + $(foreach lib,$(gb_Library_NOILIBFILENAMES_D),$(lib):$(lib)d$(gb_Library_PLAINEXT)) \ $(foreach lib,$(gb_Library_LIBLIBFILENAMES),$(lib):lib$(lib)$(gb_Library_PLAINEXT)) endif # ifeq ($(COM),GCC) |