summaryrefslogtreecommitdiff
path: root/boost
diff options
context:
space:
mode:
authorTor Lillqvist <tml@iki.fi>2013-05-24 15:00:14 +0300
committerTor Lillqvist <tml@iki.fi>2013-05-24 15:03:45 +0300
commit3aeecc525c76797801e9e2b24c2ebff6ac81adac (patch)
tree9149a2f91b918f77083fdee21e42e9bc0c80c85d /boost
parent58b9060b5f325f611dd7d5748dfa41b897aa09eb (diff)
Rename Boost libraries when built internally to match conventions
The standard Boost convention is for them to be called libboost_date_time and libboost_system (with apropriate suffix then depending on type). Did not touch the libboostthread library we build for Windows. Add the ax_boost_thread.m4 file for completeness and possible use. Document where the ax_boost*.m4 files come from. Change-Id: Ib49bee71398d62c9760a1f8fd5c46be9f3400430
Diffstat (limited to 'boost')
-rw-r--r--boost/Module_boost.mk4
-rw-r--r--boost/StaticLibrary_boost_date_time.mk (renamed from boost/StaticLibrary_boostdatetime.mk)12
-rw-r--r--boost/StaticLibrary_boost_system.mk (renamed from boost/StaticLibrary_boostsystem.mk)12
3 files changed, 14 insertions, 14 deletions
diff --git a/boost/Module_boost.mk b/boost/Module_boost.mk
index 9274e4ad52b4..b4b3aa1783cc 100644
--- a/boost/Module_boost.mk
+++ b/boost/Module_boost.mk
@@ -12,8 +12,8 @@ $(eval $(call gb_Module_Module,boost))
ifeq ($(SYSTEM_BOOST),NO)
$(eval $(call gb_Module_add_targets,boost,\
- StaticLibrary_boostdatetime \
- StaticLibrary_boostsystem \
+ StaticLibrary_boost_date_time \
+ StaticLibrary_boost_system \
UnpackedTarball_boost \
))
diff --git a/boost/StaticLibrary_boostdatetime.mk b/boost/StaticLibrary_boost_date_time.mk
index bea82da1cf31..fb189463f0c1 100644
--- a/boost/StaticLibrary_boostdatetime.mk
+++ b/boost/StaticLibrary_boost_date_time.mk
@@ -7,20 +7,20 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-$(eval $(call gb_StaticLibrary_StaticLibrary,boostdatetime))
+$(eval $(call gb_StaticLibrary_StaticLibrary,boost_date_time))
-$(eval $(call gb_StaticLibrary_set_warnings_not_errors,boostdatetime))
+$(eval $(call gb_StaticLibrary_set_warnings_not_errors,boost_date_time))
# disable "auto link" "feature" on MSVC
-$(eval $(call gb_StaticLibrary_add_defs,boostdatetime,\
+$(eval $(call gb_StaticLibrary_add_defs,boost_date_time,\
-DBOOST_ALL_NO_LIB \
))
-$(eval $(call gb_StaticLibrary_use_external,boostdatetime,boost_headers))
+$(eval $(call gb_StaticLibrary_use_external,boost_date_time,boost_headers))
-$(eval $(call gb_StaticLibrary_set_generated_cxx_suffix,boostdatetime,cpp))
+$(eval $(call gb_StaticLibrary_set_generated_cxx_suffix,boost_date_time,cpp))
-$(eval $(call gb_StaticLibrary_add_generated_exception_objects,boostdatetime,\
+$(eval $(call gb_StaticLibrary_add_generated_exception_objects,boost_date_time,\
UnpackedTarball/boost/libs/date_time/src/gregorian/date_generators \
UnpackedTarball/boost/libs/date_time/src/gregorian/gregorian_types \
UnpackedTarball/boost/libs/date_time/src/gregorian/greg_month \
diff --git a/boost/StaticLibrary_boostsystem.mk b/boost/StaticLibrary_boost_system.mk
index 053321b3f02f..1a950d72b3a3 100644
--- a/boost/StaticLibrary_boostsystem.mk
+++ b/boost/StaticLibrary_boost_system.mk
@@ -7,20 +7,20 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-$(eval $(call gb_StaticLibrary_StaticLibrary,boostsystem))
+$(eval $(call gb_StaticLibrary_StaticLibrary,boost_system))
-$(eval $(call gb_StaticLibrary_set_warnings_not_errors,boostsystem))
+$(eval $(call gb_StaticLibrary_set_warnings_not_errors,boost_system))
# disable "auto link" "feature" on MSVC
-$(eval $(call gb_StaticLibrary_add_defs,boostsystem,\
+$(eval $(call gb_StaticLibrary_add_defs,boost_system,\
-DBOOST_ALL_NO_LIB \
))
-$(eval $(call gb_StaticLibrary_use_external,boostsystem,boost_headers))
+$(eval $(call gb_StaticLibrary_use_external,boost_system,boost_headers))
-$(eval $(call gb_StaticLibrary_set_generated_cxx_suffix,boostsystem,cpp))
+$(eval $(call gb_StaticLibrary_set_generated_cxx_suffix,boost_system,cpp))
-$(eval $(call gb_StaticLibrary_add_generated_exception_objects,boostsystem,\
+$(eval $(call gb_StaticLibrary_add_generated_exception_objects,boost_system,\
UnpackedTarball/boost/libs/system/src/error_code \
))