RepositoryModule_host.mk | 1
boost/Makefile | 7
boost/Module_boost.mk | 28
boost/README | 4
boost/StaticLibrary_boostdatetime.mk | 30
boost/StaticLibrary_boostsystem.mk | 27
boost/StaticLibrary_boostthread.mk | 29
boost/UnpackedTarball_boost.mk | 61 -
boost/boost.3780.aliasing.patch | 23
boost/boost.4100.warnings.patch | 19
boost/boost.4510.warnings.patch | 26
boost/boost.4713.warnings.patch | 282 ------
boost/boost.6142.warnings.patch.1 | 38
boost/boost.6369.warnings.patch | 323 -------
boost/boost.6397.warnings.patch | 568 ------------
boost/boost.7551.unusedvars.patch | 10
boost/boost.auto_link.patch | 40
boost/boost.endian.patch | 13
boost/boost.gcc47679.patch | 61 -
boost/boost.libcdr.warnings.patch.1 | 539 -----------
boost/boost.loplugin.patch | 19
boost/boost.std.move.patch | 20
boost/boost.transform_width.patch | 11
boost/boost.vc2012.patch | 25
boost/boost.wdeprecated-auto_ptr.patch.0 | 91 -
boost/boost.wdeprecated-register.patch.0 | 36
boost/boost.windows.patch | 12
boost/boost.wshadow.patch | 330 -------
boost/boost.wundef.patch | 119 --
boost/boost.wuninitialized.patch | 10
boost/boost.wunused.patch | 50 -
boost/boost_1_44_0-clang-warnings.patch | 50 -
boost/boost_1_44_0-gcc4.8.patch | 448 ---------
boost/boost_1_44_0-unused-parameters.patch | 916 --------------------
external/Module_external.mk | 1
external/boost/Makefile | 7
external/boost/Module_boost.mk | 24
external/boost/README | 4
external/boost/StaticLibrary_boostdatetime.mk | 30
external/boost/StaticLibrary_boostsystem.mk | 27
external/boost/StaticLibrary_boostthread.mk | 29
external/boost/UnpackedTarball_boost.mk | 61 +
external/boost/boost.3780.aliasing.patch | 23
external/boost/boost.4100.warnings.patch | 19
external/boost/boost.4510.warnings.patch | 26
external/boost/boost.4713.warnings.patch | 282 ++++++
external/boost/boost.6142.warnings.patch.1 | 38
external/boost/boost.6369.warnings.patch | 323 +++++++
external/boost/boost.6397.warnings.patch | 568 ++++++++++++
external/boost/boost.7551.unusedvars.patch | 10
external/boost/boost.auto_link.patch | 40
external/boost/boost.endian.patch | 13
external/boost/boost.gcc47679.patch | 61 +
external/boost/boost.libcdr.warnings.patch.1 | 539 +++++++++++
external/boost/boost.loplugin.patch | 19
external/boost/boost.std.move.patch | 20
external/boost/boost.transform_width.patch | 11
external/boost/boost.vc2012.patch | 25
external/boost/boost.wdeprecated-auto_ptr.patch.0 | 91 +
external/boost/boost.wdeprecated-register.patch.0 | 36
external/boost/boost.windows.patch | 12
external/boost/boost.wshadow.patch | 330 +++++++
external/boost/boost.wundef.patch | 119 ++
external/boost/boost.wuninitialized.patch | 10
external/boost/boost.wunused.patch | 50 +
external/boost/boost_1_44_0-clang-warnings.patch | 50 +
external/boost/boost_1_44_0-gcc4.8.patch | 448 +++++++++
external/boost/boost_1_44_0-unused-parameters.patch | 916 ++++++++++++++++++++
68 files changed, 4262 insertions(+), 4266 deletions(-)
New commits:
commit 174e24ffff2f76da94df3bdefa5416c5f2256b78
Author: Khaled Hosny <khaledho...@eglug.org>
Date: Thu Oct 17 01:15:08 2013 +0200
fdo#70393: move boost to a subdir of external
Change-Id: Ib6aa36e296dfc1237463c4257f7ea1bd1fe72a1b
Reviewed-on: https://gerrit.libreoffice.org/6282
Reviewed-by: Björn Michaelsen <bjoern.michael...@canonical.com>
Tested-by: Björn Michaelsen <bjoern.michael...@canonical.com>
diff --git a/RepositoryModule_host.mk b/RepositoryModule_host.mk
index a4ad804..dccdb4d 100644
--- a/RepositoryModule_host.mk
+++ b/RepositoryModule_host.mk
@@ -22,7 +22,6 @@ $(eval $(call gb_Module_add_moduledirs,libreoffice,\
basegfx \
basic \
bean \
- $(call gb_Helper_optional,BOOST,boost) \
$(call gb_Helper_optional,BSH,beanshell) \
binaryurp \
bridges \
diff --git a/external/Module_external.mk b/external/Module_external.mk
index 2aca373..627b424 100644
--- a/external/Module_external.mk
+++ b/external/Module_external.mk
@@ -20,6 +20,7 @@ endif
$(eval $(call gb_Module_add_moduledirs,external,\
$(call gb_Helper_optional,AFMS,afms) \
$(call gb_Helper_optional,APACHE_COMMONS,apache-commons) \
+ $(call gb_Helper_optional,BOOST,boost) \
$(call gb_Helper_optional,HARFBUZZ,harfbuzz) \
$(call gb_Helper_optional,LIBPNG,libpng) \
))
diff --git a/boost/Makefile b/external/boost/Makefile
similarity index 100%
rename from boost/Makefile
rename to external/boost/Makefile
diff --git a/boost/Module_boost.mk b/external/boost/Module_boost.mk
similarity index 92%
rename from boost/Module_boost.mk
rename to external/boost/Module_boost.mk
index 9274e4a..1a21a77 100644
--- a/boost/Module_boost.mk
+++ b/external/boost/Module_boost.mk
@@ -9,8 +9,6 @@
$(eval $(call gb_Module_Module,boost))
-ifeq ($(SYSTEM_BOOST),NO)
-
$(eval $(call gb_Module_add_targets,boost,\
StaticLibrary_boostdatetime \
StaticLibrary_boostsystem \
@@ -23,6 +21,4 @@ $(eval $(call gb_Module_add_targets,boost,\
))
endif
-endif # SYSTEM_BOOST
-
# vim: set noet sw=4 ts=4:
diff --git a/boost/README b/external/boost/README
similarity index 100%
rename from boost/README
rename to external/boost/README
diff --git a/boost/StaticLibrary_boostdatetime.mk
b/external/boost/StaticLibrary_boostdatetime.mk
similarity index 100%
rename from boost/StaticLibrary_boostdatetime.mk
rename to external/boost/StaticLibrary_boostdatetime.mk
diff --git a/boost/StaticLibrary_boostsystem.mk
b/external/boost/StaticLibrary_boostsystem.mk
similarity index 100%
rename from boost/StaticLibrary_boostsystem.mk
rename to external/boost/StaticLibrary_boostsystem.mk
diff --git a/boost/StaticLibrary_boostthread.mk
b/external/boost/StaticLibrary_boostthread.mk
similarity index 100%
rename from boost/StaticLibrary_boostthread.mk
rename to external/boost/StaticLibrary_boostthread.mk
diff --git a/boost/UnpackedTarball_boost.mk
b/external/boost/UnpackedTarball_boost.mk
similarity index 97%
rename from boost/UnpackedTarball_boost.mk
rename to external/boost/UnpackedTarball_boost.mk
index 047fbea..777a8c4 100644
--- a/boost/UnpackedTarball_boost.mk
+++ b/external/boost/UnpackedTarball_boost.mk
@@ -55,7 +55,7 @@ $(eval $(call
gb_UnpackedTarball_set_tarball,boost,$(BOOST_TARBALL)))
$(eval $(call gb_UnpackedTarball_set_patchlevel,boost,3))
$(eval $(call gb_UnpackedTarball_add_patches,boost,\
- $(foreach patch,$(boost_patches),boost/$(patch)) \
+ $(foreach patch,$(boost_patches),external/boost/$(patch)) \
))
# vim: set noet sw=4 ts=4:
diff --git a/boost/boost.3780.aliasing.patch
b/external/boost/boost.3780.aliasing.patch
similarity index 100%
rename from boost/boost.3780.aliasing.patch
rename to external/boost/boost.3780.aliasing.patch
diff --git a/boost/boost.4100.warnings.patch
b/external/boost/boost.4100.warnings.patch
similarity index 100%
rename from boost/boost.4100.warnings.patch
rename to external/boost/boost.4100.warnings.patch
diff --git a/boost/boost.4510.warnings.patch
b/external/boost/boost.4510.warnings.patch
similarity index 100%
rename from boost/boost.4510.warnings.patch
rename to external/boost/boost.4510.warnings.patch
diff --git a/boost/boost.4713.warnings.patch
b/external/boost/boost.4713.warnings.patch
similarity index 100%
rename from boost/boost.4713.warnings.patch
rename to external/boost/boost.4713.warnings.patch
diff --git a/boost/boost.6142.warnings.patch.1
b/external/boost/boost.6142.warnings.patch.1
similarity index 100%
rename from boost/boost.6142.warnings.patch.1
rename to external/boost/boost.6142.warnings.patch.1
diff --git a/boost/boost.6369.warnings.patch
b/external/boost/boost.6369.warnings.patch
similarity index 100%
rename from boost/boost.6369.warnings.patch
rename to external/boost/boost.6369.warnings.patch
diff --git a/boost/boost.6397.warnings.patch
b/external/boost/boost.6397.warnings.patch
similarity index 100%
rename from boost/boost.6397.warnings.patch
rename to external/boost/boost.6397.warnings.patch
diff --git a/boost/boost.7551.unusedvars.patch
b/external/boost/boost.7551.unusedvars.patch
similarity index 100%
rename from boost/boost.7551.unusedvars.patch
rename to external/boost/boost.7551.unusedvars.patch
diff --git a/boost/boost.auto_link.patch b/external/boost/boost.auto_link.patch
similarity index 100%
rename from boost/boost.auto_link.patch
rename to external/boost/boost.auto_link.patch
diff --git a/boost/boost.endian.patch b/external/boost/boost.endian.patch
similarity index 100%
rename from boost/boost.endian.patch
rename to external/boost/boost.endian.patch
diff --git a/boost/boost.gcc47679.patch b/external/boost/boost.gcc47679.patch
similarity index 100%
rename from boost/boost.gcc47679.patch
rename to external/boost/boost.gcc47679.patch
diff --git a/boost/boost.libcdr.warnings.patch.1
b/external/boost/boost.libcdr.warnings.patch.1
similarity index 100%
rename from boost/boost.libcdr.warnings.patch.1
rename to external/boost/boost.libcdr.warnings.patch.1
diff --git a/boost/boost.loplugin.patch b/external/boost/boost.loplugin.patch
similarity index 100%
rename from boost/boost.loplugin.patch
rename to external/boost/boost.loplugin.patch
diff --git a/boost/boost.std.move.patch b/external/boost/boost.std.move.patch
similarity index 100%
rename from boost/boost.std.move.patch
rename to external/boost/boost.std.move.patch
diff --git a/boost/boost.transform_width.patch
b/external/boost/boost.transform_width.patch
similarity index 100%
rename from boost/boost.transform_width.patch
rename to external/boost/boost.transform_width.patch
diff --git a/boost/boost.vc2012.patch b/external/boost/boost.vc2012.patch
similarity index 100%
rename from boost/boost.vc2012.patch
rename to external/boost/boost.vc2012.patch
diff --git a/boost/boost.wdeprecated-auto_ptr.patch.0
b/external/boost/boost.wdeprecated-auto_ptr.patch.0
similarity index 100%
rename from boost/boost.wdeprecated-auto_ptr.patch.0
rename to external/boost/boost.wdeprecated-auto_ptr.patch.0
diff --git a/boost/boost.wdeprecated-register.patch.0
b/external/boost/boost.wdeprecated-register.patch.0
similarity index 100%
rename from boost/boost.wdeprecated-register.patch.0
rename to external/boost/boost.wdeprecated-register.patch.0
diff --git a/boost/boost.windows.patch b/external/boost/boost.windows.patch
similarity index 100%
rename from boost/boost.windows.patch
rename to external/boost/boost.windows.patch
diff --git a/boost/boost.wshadow.patch b/external/boost/boost.wshadow.patch
similarity index 100%
rename from boost/boost.wshadow.patch
rename to external/boost/boost.wshadow.patch
diff --git a/boost/boost.wundef.patch b/external/boost/boost.wundef.patch
similarity index 100%
rename from boost/boost.wundef.patch
rename to external/boost/boost.wundef.patch
diff --git a/boost/boost.wuninitialized.patch
b/external/boost/boost.wuninitialized.patch
similarity index 100%
rename from boost/boost.wuninitialized.patch
rename to external/boost/boost.wuninitialized.patch
diff --git a/boost/boost.wunused.patch b/external/boost/boost.wunused.patch
similarity index 100%
rename from boost/boost.wunused.patch
rename to external/boost/boost.wunused.patch
diff --git a/boost/boost_1_44_0-clang-warnings.patch
b/external/boost/boost_1_44_0-clang-warnings.patch
similarity index 100%
rename from boost/boost_1_44_0-clang-warnings.patch
rename to external/boost/boost_1_44_0-clang-warnings.patch
diff --git a/boost/boost_1_44_0-gcc4.8.patch
b/external/boost/boost_1_44_0-gcc4.8.patch
similarity index 100%
rename from boost/boost_1_44_0-gcc4.8.patch
rename to external/boost/boost_1_44_0-gcc4.8.patch
diff --git a/boost/boost_1_44_0-unused-parameters.patch
b/external/boost/boost_1_44_0-unused-parameters.patch
similarity index 100%
rename from boost/boost_1_44_0-unused-parameters.patch
rename to external/boost/boost_1_44_0-unused-parameters.patch
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
