RepositoryExternal.mk | 103 ++++++++++++++-------------------------- config_host.mk.in | 1 configure.ac | 1 m4/ax_boost_filesystem.m4 | 118 ++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 156 insertions(+), 67 deletions(-)
New commits: commit b4339fa7eee12f173b2273aed5dc6b8abae528f4 Author: David Tardon <[email protected]> Date: Tue Mar 8 06:08:36 2016 +0100 define boost_filestystem external for system boost too Change-Id: Ie9bfc6a5f3e1862acbd1bb08c6f2bb0b63f2587e diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 58f924d..ca7cdf8 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -636,6 +636,13 @@ $(call gb_LinkTarget__use_boost_lib,$(1),$(BOOST_DATE_TIME_LIB)) endef +define gb_LinkTarget__use_boost_filesystem +$(call gb_LinkTarget__use_boost_lib,$(1),$(BOOST_FILESYSTEM_LIB)) + +endef + +gb_ExternalProject__use_boost_filesystem := + define gb_LinkTarget__use_boost_iostreams $(call gb_LinkTarget__use_boost_lib,$(1),$(BOOST_IOSTREAMS_LIB)) commit ed41a33ca22f46b123df4132d376247682af07af Author: David Tardon <[email protected]> Date: Tue Mar 8 06:23:24 2016 +0100 detect Boost.Filesystem Change-Id: I86c268f49f44bd1e208a9de781a16bf19450c64c diff --git a/config_host.mk.in b/config_host.mk.in index 89081ca..0a2ec0b 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -37,6 +37,7 @@ export BARCODE_EXTENSION_PACK=@BARCODE_EXTENSION_PACK@ export BOOST_CPPFLAGS=@BOOST_CPPFLAGS@ export BOOST_CXXFLAGS=@BOOST_CXXFLAGS@ export BOOST_DATE_TIME_LIB=@BOOST_DATE_TIME_LIB@ +export BOOST_FILESYSTEM_LIB=@BOOST_FILESYSTEM_LIB@ export BOOST_IOSTREAMS_LIB=@BOOST_IOSTREAMS_LIB@ export BOOST_LDFLAGS=@BOOST_LDFLAGS@ export BOOST_SYSTEM_LIB=@BOOST_SYSTEM_LIB@ diff --git a/configure.ac b/configure.ac index dab1919..7b5cedd 100644 --- a/configure.ac +++ b/configure.ac @@ -8836,6 +8836,7 @@ if test "$with_system_boost" = "yes"; then SYSTEM_BOOST=TRUE AX_BOOST_BASE(1.47) AX_BOOST_DATE_TIME + AX_BOOST_FILESYSTEM AX_BOOST_IOSTREAMS mingw_boost_date_time_dll=`echo $BOOST_DATE_TIME_LIB | sed -e 's/^-l//' -e 's/\.dll$//'` libo_MINGW_TRY_DLL([$mingw_boost_date_time_dll]) diff --git a/m4/ax_boost_filesystem.m4 b/m4/ax_boost_filesystem.m4 new file mode 100644 index 0000000..f162163 --- /dev/null +++ b/m4/ax_boost_filesystem.m4 @@ -0,0 +1,118 @@ +# =========================================================================== +# http://www.gnu.org/software/autoconf-archive/ax_boost_filesystem.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_BOOST_FILESYSTEM +# +# DESCRIPTION +# +# Test for Filesystem library from the Boost C++ libraries. The macro +# requires a preceding call to AX_BOOST_BASE. Further documentation is +# available at <http://randspringer.de/boost/index.html>. +# +# This macro calls: +# +# AC_SUBST(BOOST_FILESYSTEM_LIB) +# +# And sets: +# +# HAVE_BOOST_FILESYSTEM +# +# LICENSE +# +# Copyright (c) 2009 Thomas Porschberg <[email protected]> +# Copyright (c) 2009 Michael Tindal +# Copyright (c) 2009 Roman Rybalko <[email protected]> +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 26 + +AC_DEFUN([AX_BOOST_FILESYSTEM], +[ + AC_ARG_WITH([boost-filesystem], + AS_HELP_STRING([--with-boost-filesystem@<:@=special-lib@:>@], + [use the Filesystem library from boost - it is possible to specify a certain library for the linker + e.g. --with-boost-filesystem=boost_filesystem-gcc-mt ]), + [ + if test "$withval" = "no"; then + want_boost="no" + elif test "$withval" = "yes"; then + want_boost="yes" + ax_boost_user_filesystem_lib="" + else + want_boost="yes" + ax_boost_user_filesystem_lib="$withval" + fi + ], + [want_boost="yes"] + ) + + if test "x$want_boost" = "xyes"; then + AC_REQUIRE([AC_PROG_CC]) + CPPFLAGS_SAVED="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS" + export CPPFLAGS + + LDFLAGS_SAVED="$LDFLAGS" + LDFLAGS="$LDFLAGS $BOOST_LDFLAGS" + export LDFLAGS + + LIBS_SAVED=$LIBS + LIBS="$LIBS $BOOST_SYSTEM_LIB" + export LIBS + + AC_CACHE_CHECK(whether the Boost::Filesystem library is available, + ax_cv_boost_filesystem, + [AC_LANG_PUSH([C++]) + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[@%:@include <boost/filesystem/path.hpp>]], + [[using namespace boost::filesystem; + path my_path( "foo/bar/data.txt" ); + return 0;]])], + ax_cv_boost_filesystem=yes, ax_cv_boost_filesystem=no) + AC_LANG_POP([C++]) + ]) + if test "x$ax_cv_boost_filesystem" = "xyes"; then + AC_DEFINE(HAVE_BOOST_FILESYSTEM,,[define if the Boost::Filesystem library is available]) + BOOSTLIBDIR=`echo $BOOST_LDFLAGS | sed -e 's/@<:@^\/@:>@*//'` + if test "x$ax_boost_user_filesystem_lib" = "x"; then + for libextension in `ls -r $BOOSTLIBDIR/libboost_filesystem* 2>/dev/null | sed 's,.*/lib,,' | sed 's,\..*,,'` ; do + ax_lib=${libextension} + AC_CHECK_LIB($ax_lib, exit, + [BOOST_FILESYSTEM_LIB="-l$ax_lib"; AC_SUBST(BOOST_FILESYSTEM_LIB) link_filesystem="yes"; break], + [link_filesystem="no"]) + done + if test "x$link_filesystem" != "xyes"; then + for libextension in `ls -r $BOOSTLIBDIR/boost_filesystem* 2>/dev/null | sed 's,.*/,,' | sed -e 's,\..*,,'` ; do + ax_lib=${libextension} + AC_CHECK_LIB($ax_lib, exit, + [BOOST_FILESYSTEM_LIB="-l$ax_lib"; AC_SUBST(BOOST_FILESYSTEM_LIB) link_filesystem="yes"; break], + [link_filesystem="no"]) + done + fi + else + for ax_lib in $ax_boost_user_filesystem_lib boost_filesystem-$ax_boost_user_filesystem_lib; do + AC_CHECK_LIB($ax_lib, exit, + [BOOST_FILESYSTEM_LIB="-l$ax_lib"; AC_SUBST(BOOST_FILESYSTEM_LIB) link_filesystem="yes"; break], + [link_filesystem="no"]) + done + + fi + if test "x$ax_lib" = "x"; then + AC_MSG_ERROR(Could not find a version of the library!) + fi + if test "x$link_filesystem" != "xyes"; then + AC_MSG_ERROR(Could not link against $ax_lib !) + fi + fi + + CPPFLAGS="$CPPFLAGS_SAVED" + LDFLAGS="$LDFLAGS_SAVED" + LIBS="$LIBS_SAVED" + fi +]) commit 57c439a15e151fa9f7c298ceb15165749958c53c Author: David Tardon <[email protected]> Date: Tue Mar 8 06:06:36 2016 +0100 reduce copypasta Change-Id: I5303caf69128a0a6d28fccfcf2ab63ed466e3853 diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index c8aab64..58f924d 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -617,7 +617,7 @@ endif # SYSTEM_HUNSPELL ifneq ($(SYSTEM_BOOST),) -define gb_LinkTarget__use_boostdatetime +define gb_LinkTarget__use_boost_lib $(call gb_LinkTarget_set_include,$(1),\ $$(INCLUDE) \ $(BOOST_CPPFLAGS) \ @@ -627,43 +627,24 @@ $(call gb_LinkTarget_add_ldflags,$(1),\ $(BOOST_LDFLAGS) \ ) -$(call gb_LinkTarget_add_libs,$(1),\ - $(BOOST_DATE_TIME_LIB) \ -) +$(call gb_LinkTarget_add_libs,$(1),$(2)) endef -define gb_LinkTarget__use_boost_iostreams -$(call gb_LinkTarget_set_include,$(1),\ - $$(INCLUDE) \ - $(BOOST_CPPFLAGS) \ -) +define gb_LinkTarget__use_boostdatetime +$(call gb_LinkTarget__use_boost_lib,$(1),$(BOOST_DATE_TIME_LIB)) -$(call gb_LinkTarget_add_ldflags,$(1),\ - $(BOOST_LDFLAGS) \ -) +endef -$(call gb_LinkTarget_add_libs,$(1),\ - $(BOOST_IOSTREAMS_LIB) \ -) +define gb_LinkTarget__use_boost_iostreams +$(call gb_LinkTarget__use_boost_lib,$(1),$(BOOST_IOSTREAMS_LIB)) endef gb_ExternalProject__use_boost_iostreams := define gb_LinkTarget__use_boost_system -$(call gb_LinkTarget_set_include,$(1),\ - $$(INCLUDE) \ - $(BOOST_CPPFLAGS) \ -) - -$(call gb_LinkTarget_add_ldflags,$(1),\ - $(BOOST_LDFLAGS) \ -) - -$(call gb_LinkTarget_add_libs,$(1),\ - $(BOOST_SYSTEM_LIB) \ -) +$(call gb_LinkTarget__use_boost_lib,$(1),$(BOOST_SYSTEM_LIB)) endef @@ -681,37 +662,29 @@ gb_ExternalProject__use_boost_headers:= else # !SYSTEM_BOOST -ifeq ($(OS),WNT) -define gb_LinkTarget__use_boostthread +define gb_LinkTarget__use_boost_lib $(call gb_LinkTarget_add_defs,$(1),\ -DBOOST_ALL_NO_LIB \ ) -$(call gb_LinkTarget_use_static_libraries,$(1),\ - boostthread \ -) +$(call gb_LinkTarget_use_static_libraries,$(1),$(2)) + +endef + +ifeq ($(OS),WNT) +define gb_LinkTarget__use_boostthread +$(call gb_LinkTarget__use_boost_lib,$(1),boostthread) + endef endif define gb_LinkTarget__use_boostdatetime -$(call gb_LinkTarget_add_defs,$(1),\ - -DBOOST_ALL_NO_LIB \ -) - -$(call gb_LinkTarget_use_static_libraries,$(1),\ - boostdatetime \ -) +$(call gb_LinkTarget__use_boost_lib,$(1),boostdatetime) endef define gb_LinkTarget__use_boost_filesystem -$(call gb_LinkTarget_add_defs,$(1),\ - -DBOOST_ALL_NO_LIB \ -) - -$(call gb_LinkTarget_use_static_libraries,$(1),\ - boost_filesystem \ -) +$(call gb_LinkTarget__use_boost_lib,$(1),boost_filesystem) endef @@ -720,13 +693,7 @@ $(call gb_ExternalProject_use_static_libraries,$(1),boost_filesystem) endef define gb_LinkTarget__use_boost_iostreams -$(call gb_LinkTarget_add_defs,$(1),\ - -DBOOST_ALL_NO_LIB \ -) - -$(call gb_LinkTarget_use_static_libraries,$(1),\ - boost_iostreams \ -) +$(call gb_LinkTarget__use_boost_lib,$(1),boost_iostreams) endef @@ -735,13 +702,7 @@ $(call gb_ExternalProject_use_static_libraries,$(1),boost_iostreams) endef define gb_LinkTarget__use_boost_system -$(call gb_LinkTarget_add_defs,$(1),\ - -DBOOST_ALL_NO_LIB \ -) - -$(call gb_LinkTarget_use_static_libraries,$(1),\ - boost_system \ -) +$(call gb_LinkTarget__use_boost_lib,$(1),boost_system) endef commit d72a33c6aed0ca8f9fe0b90bc6d72e7313985524 Author: David Tardon <[email protected]> Date: Tue Mar 8 05:57:40 2016 +0100 reorder Change-Id: I8ff9f61475fddb475fe08e867c5446c825abb7dc diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index c6fe371..c8aab64 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -704,6 +704,21 @@ $(call gb_LinkTarget_use_static_libraries,$(1),\ endef +define gb_LinkTarget__use_boost_filesystem +$(call gb_LinkTarget_add_defs,$(1),\ + -DBOOST_ALL_NO_LIB \ +) + +$(call gb_LinkTarget_use_static_libraries,$(1),\ + boost_filesystem \ +) + +endef + +define gb_ExternalProject__use_boost_filesystem +$(call gb_ExternalProject_use_static_libraries,$(1),boost_filesystem) +endef + define gb_LinkTarget__use_boost_iostreams $(call gb_LinkTarget_add_defs,$(1),\ -DBOOST_ALL_NO_LIB \ @@ -743,25 +758,11 @@ $(call gb_LinkTarget_set_include,$(1),\ endef -define gb_LinkTarget__use_boost_filesystem -$(call gb_LinkTarget_add_defs,$(1),\ - -DBOOST_ALL_NO_LIB \ -) - -$(call gb_LinkTarget_use_static_libraries,$(1),\ - boost_filesystem \ -) - -endef - -define gb_ExternalProject__use_boost_filesystem -$(call gb_ExternalProject_use_static_libraries,$(1),boost_filesystem) -endef - define gb_ExternalProject__use_boost_headers $(call gb_ExternalProject_use_unpacked,$(1),boost) endef + endif # SYSTEM_BOOST _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
