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

5 files changed, 12 insertions, 32 deletions

diff --git a/boost/Module_boost.mk b/boost/Module_boost.mk
index 45677ff5f521..b9da8a733a63 100644
--- a/boost/Module_boost.mk
+++ b/boost/Module_boost.mk
@@ -18,8 +18,6 @@ $(eval $(call gb_Module_add_targets,boost,\
 
 ifeq ($(OS),WNT)
 $(eval $(call gb_Module_add_targets,boost,\
-	Package_boostdatetime \
-	Package_boostthread \
 	StaticLibrary_boostthread \
 ))
 endif
diff --git a/boost/Package_boostdatetime.mk b/boost/Package_boostdatetime.mk
deleted file mode 100644
index d0af67153169..000000000000
--- a/boost/Package_boostdatetime.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_Package_Package,boostdatetime,$(gb_StaticLibrary_OUTDIRLOCATION)))
-
-$(eval $(call gb_Package_add_file,boostdatetime,lib/libboost_date_time-vc90-mt-1_44.lib,$(notdir $(call gb_StaticLibrary_get_target,boostdatetime))))
-
-# vim: set noet sw=4 ts=4:
diff --git a/boost/Package_boostthread.mk b/boost/Package_boostthread.mk
deleted file mode 100644
index e79c39a89288..000000000000
--- a/boost/Package_boostthread.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_Package_Package,boostthread,$(gb_StaticLibrary_OUTDIRLOCATION)))
-
-$(eval $(call gb_Package_add_file,boostthread,lib/libboost_thread-vc90-mt-1_44.lib,$(notdir $(call gb_StaticLibrary_get_target,boostthread))))
-
-# vim: set noet sw=4 ts=4:
diff --git a/boost/StaticLibrary_boostdatetime.mk b/boost/StaticLibrary_boostdatetime.mk
index cdd2bb2dd12e..1328d559ffad 100644
--- a/boost/StaticLibrary_boostdatetime.mk
+++ b/boost/StaticLibrary_boostdatetime.mk
@@ -10,7 +10,12 @@
 $(eval $(call gb_StaticLibrary_StaticLibrary,boostdatetime))
 
 $(eval $(call gb_StaticLibrary_set_warnings_not_errors,boostdatetime))
-	
+
+# disable "auto link" "feature" on MSVC
+$(eval $(call gb_StaticLibrary_add_defs,boostdatetime,\
+	-DBOOST_ALL_NO_LIB \
+))
+
 $(eval $(call gb_StaticLibrary_use_unpacked,boostdatetime,boost))
 
 $(eval $(call gb_StaticLibrary_set_generated_cxx_suffix,boostdatetime,cpp))
diff --git a/boost/StaticLibrary_boostthread.mk b/boost/StaticLibrary_boostthread.mk
index 9a00cd96c5ff..3aa4859cbcbe 100644
--- a/boost/StaticLibrary_boostthread.mk
+++ b/boost/StaticLibrary_boostthread.mk
@@ -10,7 +10,12 @@
 $(eval $(call gb_StaticLibrary_StaticLibrary,boostthread))
 
 $(eval $(call gb_StaticLibrary_set_warnings_not_errors,boostthread))
-	
+
+# disable "auto link" "feature" on MSVC
+$(eval $(call gb_StaticLibrary_add_defs,boostthread,\
+	-DBOOST_ALL_NO_LIB \
+))
+
 $(eval $(call gb_StaticLibrary_use_unpacked,boostthread,boost))
 
 $(eval $(call gb_StaticLibrary_set_generated_cxx_suffix,boostthread,cpp))