[Libreoffice-commits] .: codemaker/Executable_cppumaker.mk codemaker/Executable_javamaker.mk codemaker/StaticLibrary_codemaker_cpp.mk codemaker/StaticLibrary_codemaker_java.mk codemaker/StaticLibrary_codemaker.mk l10ntools/Executable_cfgex.mk l10ntools/Executable_gsicheck.mk l10ntools/Executable_helpex.mk l10ntools/Executable_uiex.mk l10ntools/Executable_ulfex.mk l10ntools/Executable_xrmex.mk l10ntools/StaticLibrary_transex.mk RepositoryExternal.mk sal/Library_sal.mk
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Tue Nov 13 14:04:04 PST 2012
RepositoryExternal.mk | 6 ++++++
codemaker/Executable_cppumaker.mk | 2 +-
codemaker/Executable_javamaker.mk | 2 +-
codemaker/StaticLibrary_codemaker.mk | 2 +-
codemaker/StaticLibrary_codemaker_cpp.mk | 6 +++---
codemaker/StaticLibrary_codemaker_java.mk | 4 ++--
l10ntools/Executable_cfgex.mk | 2 +-
l10ntools/Executable_gsicheck.mk | 2 +-
l10ntools/Executable_helpex.mk | 6 ++++--
l10ntools/Executable_uiex.mk | 3 +--
l10ntools/Executable_ulfex.mk | 2 +-
l10ntools/Executable_xrmex.mk | 2 +-
l10ntools/StaticLibrary_transex.mk | 2 +-
sal/Library_sal.mk | 5 +----
14 files changed, 25 insertions(+), 21 deletions(-)
New commits:
commit e1f742a601c1c1c0535d796e7a7705990a9da891
Author: Peter Foley <pefoley2 at verizon.net>
Date: Mon Nov 12 18:37:10 2012 -0500
fix system boost
Change-Id: Id80557cb47ab471a0f3a643a1c11a59e89c14c54
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index dd666a6..9808e14 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -416,6 +416,7 @@ $(call gb_LinkTarget_add_libs,$(1),\
endef
+gb_LinkTarget__use_boost_headers:=
gb_ExternalProject__use_boost_headers:=
else # !SYSTEM_BOOST
@@ -452,6 +453,11 @@ $(call gb_LinkTarget_use_static_libraries,$(1),\
endef
+define gb_LinkTarget__use_boost_headers
+$(call gb_LinkTarget_get_preparation_target,$(1)) : $(call gb_UnpackedTarball_get_target,boost)
+
+endef
+
define gb_ExternalProject__use_boost_headers
$(call gb_ExternalProject_get_preparation_target,$(1)) : $(call gb_UnpackedTarball_get_target,boost)
diff --git a/codemaker/Executable_cppumaker.mk b/codemaker/Executable_cppumaker.mk
index 074c539..a508fd2 100644
--- a/codemaker/Executable_cppumaker.mk
+++ b/codemaker/Executable_cppumaker.mk
@@ -26,7 +26,7 @@
$(eval $(call gb_Executable_Executable,cppumaker))
-$(eval $(call gb_Executable_use_unpacked,cppumaker,boost))
+$(eval $(call gb_Executable_use_external,cppumaker,boost_headers))
$(eval $(call gb_Executable_use_libraries,cppumaker,\
reg \
diff --git a/codemaker/Executable_javamaker.mk b/codemaker/Executable_javamaker.mk
index 22d89fd..a79a76e 100644
--- a/codemaker/Executable_javamaker.mk
+++ b/codemaker/Executable_javamaker.mk
@@ -26,7 +26,7 @@
$(eval $(call gb_Executable_Executable,javamaker))
-$(eval $(call gb_Executable_use_unpacked,javamaker,boost))
+$(eval $(call gb_Executable_use_external,javamaker,boost_headers))
$(eval $(call gb_Executable_use_libraries,javamaker,\
reg \
diff --git a/codemaker/StaticLibrary_codemaker.mk b/codemaker/StaticLibrary_codemaker.mk
index a300518..510b2c5 100644
--- a/codemaker/StaticLibrary_codemaker.mk
+++ b/codemaker/StaticLibrary_codemaker.mk
@@ -27,7 +27,7 @@
$(eval $(call gb_StaticLibrary_StaticLibrary,codemaker))
-$(eval $(call gb_StaticLibrary_use_unpacked,codemaker,boost))
+$(eval $(call gb_StaticLibrary_use_external,codemaker,boost_headers))
$(eval $(call gb_StaticLibrary_use_packages,codemaker,\
codemaker_inc \
diff --git a/codemaker/StaticLibrary_codemaker_cpp.mk b/codemaker/StaticLibrary_codemaker_cpp.mk
index 627f731..2ee9c4e 100644
--- a/codemaker/StaticLibrary_codemaker_cpp.mk
+++ b/codemaker/StaticLibrary_codemaker_cpp.mk
@@ -27,11 +27,11 @@
$(eval $(call gb_StaticLibrary_StaticLibrary,codemaker_cpp))
-$(eval $(call gb_StaticLibrary_use_unpacked,codemaker_cpp,boost))
+$(eval $(call gb_StaticLibrary_use_external,codemaker_cpp,boost_headers))
$(eval $(call gb_StaticLibrary_use_packages,codemaker_cpp,\
- codemaker_inc \
- registry_inc \
+ codemaker_inc \
+ registry_inc \
sal_generated \
sal_inc \
))
diff --git a/codemaker/StaticLibrary_codemaker_java.mk b/codemaker/StaticLibrary_codemaker_java.mk
index b6eb705..1bcdb25 100644
--- a/codemaker/StaticLibrary_codemaker_java.mk
+++ b/codemaker/StaticLibrary_codemaker_java.mk
@@ -27,10 +27,10 @@
$(eval $(call gb_StaticLibrary_StaticLibrary,codemaker_java))
-$(eval $(call gb_StaticLibrary_use_unpacked,codemaker_java,boost))
+$(eval $(call gb_StaticLibrary_use_external,codemaker_java,boost_headers))
$(eval $(call gb_StaticLibrary_use_packages,codemaker_java,\
- codemaker_inc \
+ codemaker_inc \
registry_inc \
sal_generated \
sal_inc \
diff --git a/l10ntools/Executable_cfgex.mk b/l10ntools/Executable_cfgex.mk
index 5531606..a2c8d6c 100644
--- a/l10ntools/Executable_cfgex.mk
+++ b/l10ntools/Executable_cfgex.mk
@@ -35,7 +35,7 @@ $(eval $(call gb_Executable_use_libraries,cfgex,\
sal \
))
-$(eval $(call gb_Executable_use_unpacked,cfgex,boost))
+$(eval $(call gb_Executable_use_external,cfgex,boost_headers))
$(eval $(call gb_Executable_add_scanners,cfgex,\
l10ntools/source/cfglex \
diff --git a/l10ntools/Executable_gsicheck.mk b/l10ntools/Executable_gsicheck.mk
index 829a029..a99dc30 100644
--- a/l10ntools/Executable_gsicheck.mk
+++ b/l10ntools/Executable_gsicheck.mk
@@ -35,7 +35,7 @@ $(eval $(call gb_Executable_use_libraries,gsicheck,\
sal \
))
-$(eval $(call gb_Executable_use_unpacked,gsicheck,boost))
+$(eval $(call gb_Executable_use_external,gsicheck,boost_headers))
$(eval $(call gb_Executable_add_exception_objects,gsicheck,\
l10ntools/source/gsicheck \
diff --git a/l10ntools/Executable_helpex.mk b/l10ntools/Executable_helpex.mk
index f1d447c..085fd94 100644
--- a/l10ntools/Executable_helpex.mk
+++ b/l10ntools/Executable_helpex.mk
@@ -35,8 +35,10 @@ $(eval $(call gb_Executable_use_libraries,helpex,\
sal \
))
-$(eval $(call gb_Executable_use_external,helpex,expat_utf8))
-$(eval $(call gb_Executable_use_unpacked,helpex,boost))
+$(eval $(call gb_Executable_use_externals,helpex,\
+ expat_utf8 \
+ boost_headers \
+))
$(eval $(call gb_Executable_use_static_libraries,helpex,\
transex \
diff --git a/l10ntools/Executable_uiex.mk b/l10ntools/Executable_uiex.mk
index 03699f6..064b207 100644
--- a/l10ntools/Executable_uiex.mk
+++ b/l10ntools/Executable_uiex.mk
@@ -18,8 +18,6 @@ $(eval $(call gb_Executable_use_libraries,uiex,\
sal \
))
-$(eval $(call gb_Executable_use_unpacked,uiex,boost))
-
$(eval $(call gb_Executable_use_static_libraries,uiex,\
transex \
))
@@ -32,6 +30,7 @@ $(eval $(call gb_Executable_use_externals,uiex,\
libexslt \
libxml2 \
libxslt \
+ boost_headers \
))
# vim: set noet sw=4 ts=4:
diff --git a/l10ntools/Executable_ulfex.mk b/l10ntools/Executable_ulfex.mk
index c045eb1..f0b134e 100644
--- a/l10ntools/Executable_ulfex.mk
+++ b/l10ntools/Executable_ulfex.mk
@@ -35,7 +35,7 @@ $(eval $(call gb_Executable_use_libraries,ulfex,\
sal \
))
-$(eval $(call gb_Executable_use_unpacked,ulfex,boost))
+$(eval $(call gb_Executable_use_external,ulfex,boost_headers))
$(eval $(call gb_Executable_use_static_libraries,ulfex,\
transex \
diff --git a/l10ntools/Executable_xrmex.mk b/l10ntools/Executable_xrmex.mk
index 1aeef21..3cbcd88 100644
--- a/l10ntools/Executable_xrmex.mk
+++ b/l10ntools/Executable_xrmex.mk
@@ -35,7 +35,7 @@ $(eval $(call gb_Executable_use_libraries,xrmex,\
sal \
))
-$(eval $(call gb_Executable_use_unpacked,xrmex,boost))
+$(eval $(call gb_Executable_use_external,xrmex,boost_headers))
$(eval $(call gb_Executable_add_scanners,xrmex,\
l10ntools/source/xrmlex \
diff --git a/l10ntools/StaticLibrary_transex.mk b/l10ntools/StaticLibrary_transex.mk
index da2414a..4e77801 100644
--- a/l10ntools/StaticLibrary_transex.mk
+++ b/l10ntools/StaticLibrary_transex.mk
@@ -37,7 +37,7 @@ $(eval $(call gb_StaticLibrary_set_include,transex,\
$$(INCLUDE) \
))
-$(eval $(call gb_StaticLibrary_use_unpacked,transex,boost))
+$(eval $(call gb_StaticLibrary_use_external,transex,boost_headers))
$(eval $(call gb_StaticLibrary_add_exception_objects,transex,\
l10ntools/source/export2 \
diff --git a/sal/Library_sal.mk b/sal/Library_sal.mk
index 237fe3f..d537bc0 100644
--- a/sal/Library_sal.mk
+++ b/sal/Library_sal.mk
@@ -59,12 +59,9 @@ $(eval $(call gb_Library_use_libraries,sal,\
$(gb_UWINAPI) \
))
-ifneq ($(SYSTEM_BOOST),YES)
-$(eval $(call gb_Library_use_unpacked,sal,boost))
-endif
-
$(eval $(call gb_Library_use_externals,sal,\
valgrind \
+ boost_headers \
))
$(eval $(call gb_Library_use_system_win32_libs,sal,\
More information about the Libreoffice-commits
mailing list