diff options
| author | Michael Stahl <mstahl@redhat.com> | 2012-09-06 20:22:11 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2012-09-10 20:24:43 +0200 |
| commit | 7f2e168421c3cd928a31a52a8b5afe97e931d3ba (patch) | |
| tree | ea3c0dcce467f18b921b266e3cbd21e57b0da1a7 /liborcus | |
| parent | d73fc13af4fccb098928d1646ad843d92505562e (diff) | |
boost, orcus: disable bizarre "auto link" feature for MSVC:
Boost apparently uses a MSVC auto-link feature to cause MSVC to request
a static library with a very particular name; disable this and remove
the associated ugly workarounds boost/Package_boost*.mk.
(Another alternative better than Package_boost*.mk would be to
just mangle the static library name in RepositoryFixes.mk)
Change-Id: Iea91f9978da00d89d2a696f3cdd090a85cea8e64
Diffstat (limited to 'liborcus')
| -rw-r--r-- | liborcus/liborcus_0.1.0-boost_disable_auto_lib.patch | 20 | ||||
| -rw-r--r-- | liborcus/makefile.mk | 4 |
2 files changed, 24 insertions, 0 deletions
diff --git a/liborcus/liborcus_0.1.0-boost_disable_auto_lib.patch b/liborcus/liborcus_0.1.0-boost_disable_auto_lib.patch new file mode 100644 index 000000000000..18b2ed73014a --- /dev/null +++ b/liborcus/liborcus_0.1.0-boost_disable_auto_lib.patch @@ -0,0 +1,20 @@ +--- misc/liborcus_0.1.0/vsprojects/liborcus-static-nozip/liborcus-static-nozip.vcproj 2012-09-07 06:00:35.000000000 +0200 ++++ misc/build/liborcus_0.1.0/vsprojects/liborcus-static-nozip/liborcus-static-nozip.vcproj 2012-09-10 18:10:23.821600000 +0200 +@@ -42,7 +42,7 @@ + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="" +- PreprocessorDefinitions="__ORCUS_STATIC_LIB" ++ PreprocessorDefinitions="__ORCUS_STATIC_LIB;BOOST_ALL_NO_LIB" + MinimalRebuild="true" + BasicRuntimeChecks="3" + RuntimeLibrary="3" +@@ -107,7 +107,7 @@ + Optimization="2" + EnableIntrinsicFunctions="true" + AdditionalIncludeDirectories="" +- PreprocessorDefinitions="__ORCUS_STATIC_LIB" ++ PreprocessorDefinitions="__ORCUS_STATIC_LIB;BOOST_ALL_NO_LIB" + RuntimeLibrary="2" + EnableFunctionLevelLinking="true" + WarningLevel="3" diff --git a/liborcus/makefile.mk b/liborcus/makefile.mk index 4acf2d8cf34e..86821fc2fe9a 100644 --- a/liborcus/makefile.mk +++ b/liborcus/makefile.mk @@ -46,6 +46,10 @@ PATCH_FILES+=liborcus_0.1.0-mingw.patch .IF "$(GUI)$(COM)"=="WNTMSC" +# disable boost "auto lib" in MSVC build +# for some reason (CRLF in file?) this patch doesn't want to apply on unix... +PATCH_FILES+=liborcus_0.1.0-boost_disable_auto_lib.patch + BUILD_DIR=vsprojects/liborcus-static-nozip BUILD_ACTION= \ export BOOST_INCLUDE_DIR=$(OUTDIR)/inc/external && \ |