summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--RepositoryExternal.mk4
-rw-r--r--configure.ac6
-rw-r--r--external/firebird/ExternalProject_firebird.mk4
-rw-r--r--external/libabw/ExternalProject_libabw.mk3
-rw-r--r--external/libcdr/ExternalProject_libcdr.mk2
-rw-r--r--external/libebook/ExternalProject_libebook.mk2
-rw-r--r--external/libetonyek/ExternalProject_libetonyek.mk2
-rw-r--r--external/libmspub/ExternalProject_libmspub.mk2
-rw-r--r--external/libmwaw/ExternalProject_libmwaw.mk2
-rw-r--r--external/libodfgen/ExternalProject_libodfgen.mk2
-rw-r--r--external/liborcus/ExternalProject_liborcus.mk8
-rw-r--r--external/libvisio/ExternalProject_libvisio.mk2
-rw-r--r--external/libwps/ExternalProject_libwps.mk2
13 files changed, 21 insertions, 20 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 74ac19004333..9823fe9e3e9e 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -584,7 +584,7 @@ endef
endif # SYSTEM_HUNSPELL
-ifeq ($(SYSTEM_BOOST),YES)
+ifneq ($(SYSTEM_BOOST),)
define gb_LinkTarget__use_boostdatetime
$(call gb_LinkTarget_set_include,$(1),\
@@ -2692,7 +2692,7 @@ $(call gb_LinkTarget_add_libs,$(1),\
$(call gb_UnpackedTarball_get_dir,liborcus)/src/liborcus/.libs/liborcus-0.6$(gb_StaticLibrary_PLAINEXT) \
)
-$(if $(filter YES,$(SYSTEM_BOOST)), \
+$(if $(SYSTEM_BOOST), \
$(call gb_LinkTarget_add_ldflags,$(1),$(BOOST_LDFLAGS)) \
$(call gb_LinkTarget_add_libs,$(1),$(BOOST_SYSTEM_LIB)) \
)
diff --git a/configure.ac b/configure.ac
index 90e43ce125d2..75e188afe561 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8738,7 +8738,7 @@ dnl ===================================================================
AC_MSG_CHECKING([which boost to use])
if test "$with_system_boost" = "yes"; then
AC_MSG_RESULT([external])
- SYSTEM_BOOST=YES
+ SYSTEM_BOOST=TRUE
AX_BOOST_BASE(1.47)
AX_BOOST_DATE_TIME
mingw_boost_date_time_dll=`echo $BOOST_DATE_TIME_LIB | sed -e 's/^-l//' -e 's/\.dll$//'`
@@ -8770,7 +8770,7 @@ if test "$with_system_boost" = "yes"; then
else
AC_MSG_RESULT([internal])
BUILD_TYPE="$BUILD_TYPE BOOST"
- SYSTEM_BOOST=NO
+ SYSTEM_BOOST=
fi
AC_SUBST(SYSTEM_BOOST)
@@ -9169,7 +9169,7 @@ if test -z "$enable_orcus" -o "$enable_orcus" != no; then
libo_CHECK_SYSTEM_MODULE([orcus],[ORCUS],[liborcus-0.6 >= 0.5.0])
if test "$with_system_orcus" != "yes"; then
- if test "$SYSTEM_BOOST" = "YES"; then
+ if test "$SYSTEM_BOOST" = "TRUE"; then
# ===========================================================
# Determine if we are going to need to link with Boost.System
# ===========================================================
diff --git a/external/firebird/ExternalProject_firebird.mk b/external/firebird/ExternalProject_firebird.mk
index 692a81a78a8d..5bfb99800042 100644
--- a/external/firebird/ExternalProject_firebird.mk
+++ b/external/firebird/ExternalProject_firebird.mk
@@ -35,10 +35,10 @@ $(call gb_ExternalProject_get_state_target,firebird,build):
) \
" \
&& export CXXFLAGS=" \
- $(if $(filter NO,$(SYSTEM_BOOST)), \
+ $(if $(SYSTEM_BOOST),$(BOOST_CPPFLAGS), \
-I$(call gb_UnpackedTarball_get_dir,boost) \
-L$(call gb_UnpackedTarball_get_dir,boost)/source/lib \
- ,$(BOOST_CPPFLAGS)) \
+ ) \
$(if $(filter NO,$(SYSTEM_ICU)), \
-I$(call gb_UnpackedTarball_get_dir,icu)/source \
-I$(call gb_UnpackedTarball_get_dir,icu)/source/i18n \
diff --git a/external/libabw/ExternalProject_libabw.mk b/external/libabw/ExternalProject_libabw.mk
index 66be64f55cff..6afcfb8d51ab 100644
--- a/external/libabw/ExternalProject_libabw.mk
+++ b/external/libabw/ExternalProject_libabw.mk
@@ -33,7 +33,8 @@ $(call gb_ExternalProject_get_state_target,libabw,build) :
--disable-tools \
--disable-debug \
--disable-werror \
- CXXFLAGS="$(if $(filter NO,$(SYSTEM_BOOST)),-I$(call gb_UnpackedTarball_get_dir,boost) -I$(BUILDDIR)/config_$(gb_Side),$(BOOST_CPPFLAGS)) \
+ CXXFLAGS="$(if $(SYSTEM_BOOST),$(BOOST_CPPFLAGS),\
+ -I$(call gb_UnpackedTarball_get_dir,boost) -I$(BUILDDIR)/config_$(gb_Side)) \
$(if $(SYSTEM_LIBXML),,-I$(call gb_UnpackedTarball_get_dir,xml2)/include)" \
$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
&& (cd $(EXTERNAL_WORKDIR)/src/lib && \
diff --git a/external/libcdr/ExternalProject_libcdr.mk b/external/libcdr/ExternalProject_libcdr.mk
index 9ec9154fcd63..087adbf7e824 100644
--- a/external/libcdr/ExternalProject_libcdr.mk
+++ b/external/libcdr/ExternalProject_libcdr.mk
@@ -35,7 +35,7 @@ $(call gb_ExternalProject_get_state_target,libcdr,build) :
--disable-debug \
--disable-werror \
--disable-weffc \
- CXXFLAGS="$(if $(filter NO,$(SYSTEM_BOOST)),-I$(call gb_UnpackedTarball_get_dir,boost) -I$(BUILDDIR)/config_$(gb_Side),$(BOOST_CPPFLAGS))" \
+ CXXFLAGS="$(if $(SYSTEM_BOOST),$(BOOST_CPPFLAGS),-I$(call gb_UnpackedTarball_get_dir,boost) -I$(BUILDDIR)/config_$(gb_Side))" \
$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
&& (cd $(EXTERNAL_WORKDIR)/src/lib && \
$(if $(VERBOSE)$(verbose),V=1) \
diff --git a/external/libebook/ExternalProject_libebook.mk b/external/libebook/ExternalProject_libebook.mk
index 242777fc89f5..6da18706571a 100644
--- a/external/libebook/ExternalProject_libebook.mk
+++ b/external/libebook/ExternalProject_libebook.mk
@@ -34,7 +34,7 @@ $(call gb_ExternalProject_get_state_target,libebook,build) :
$(if $(filter TRUE,$(ENABLE_DEBUG)),--enable-debug,--disable-debug) \
--disable-werror \
--disable-weffc \
- CXXFLAGS="$(if $(filter NO,$(SYSTEM_BOOST)),-I$(call gb_UnpackedTarball_get_dir,boost) -I$(BUILDDIR)/config_$(gb_Side),$(BOOST_CPPFLAGS))" \
+ CXXFLAGS="$(if $(SYSTEM_BOOST),$(BOOST_CPPFLAGS),-I$(call gb_UnpackedTarball_get_dir,boost) -I$(BUILDDIR)/config_$(gb_Side))" \
XML_CFLAGS="$(if $(SYSTEM_LIBXML),$(LIBXML_CFLAGS),-I$(call gb_UnpackedTarball_get_dir,xml2)/include)" \
XML_LIBS="$(LIBXML_LIBS)" \
$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
diff --git a/external/libetonyek/ExternalProject_libetonyek.mk b/external/libetonyek/ExternalProject_libetonyek.mk
index c081d3d4725e..cbd0a9ef960b 100644
--- a/external/libetonyek/ExternalProject_libetonyek.mk
+++ b/external/libetonyek/ExternalProject_libetonyek.mk
@@ -34,7 +34,7 @@ $(call gb_ExternalProject_get_state_target,libetonyek,build) :
--disable-werror \
--disable-weffc \
--without-tools \
- BOOST_CFLAGS="$(if $(filter NO,$(SYSTEM_BOOST)),-I$(call gb_UnpackedTarball_get_dir,boost) -I$(BUILDDIR)/config_$(gb_Side),$(BOOST_CPPFLAGS))" \
+ BOOST_CFLAGS="$(if $(SYSTEM_BOOST),$(BOOST_CPPFLAGS),-I$(call gb_UnpackedTarball_get_dir,boost) -I$(BUILDDIR)/config_$(gb_Side))" \
XML_CFLAGS="$(if $(SYSTEM_LIBXML),$(LIBXML_CFLAGS),-I$(call gb_UnpackedTarball_get_dir,xml2)/include)" \
XML_LIBS="$(LIBXML_LIBS)" \
$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
diff --git a/external/libmspub/ExternalProject_libmspub.mk b/external/libmspub/ExternalProject_libmspub.mk
index f0b862a74750..1a2c84e13651 100644
--- a/external/libmspub/ExternalProject_libmspub.mk
+++ b/external/libmspub/ExternalProject_libmspub.mk
@@ -33,7 +33,7 @@ $(call gb_ExternalProject_get_state_target,libmspub,build) :
--disable-debug \
--disable-werror \
--disable-weffc \
- CXXFLAGS="$(if $(filter NO,$(SYSTEM_BOOST)),-I$(call gb_UnpackedTarball_get_dir,boost) -I$(BUILDDIR)/config_$(gb_Side),$(BOOST_CPPFLAGS))" \
+ CXXFLAGS="$(if $(SYSTEM_BOOST),$(BOOST_CPPFLAGS),-I$(call gb_UnpackedTarball_get_dir,boost) -I$(BUILDDIR)/config_$(gb_Side))" \
$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
&& (cd $(EXTERNAL_WORKDIR)/src/lib && \
$(if $(VERBOSE)$(verbose),V=1) \
diff --git a/external/libmwaw/ExternalProject_libmwaw.mk b/external/libmwaw/ExternalProject_libmwaw.mk
index c1b5c8d5e760..478dc7db1446 100644
--- a/external/libmwaw/ExternalProject_libmwaw.mk
+++ b/external/libmwaw/ExternalProject_libmwaw.mk
@@ -31,7 +31,7 @@ $(call gb_ExternalProject_get_state_target,libmwaw,build) :
--without-docs \
--disable-debug \
--disable-werror \
- CXXFLAGS="$(if $(filter NO,$(SYSTEM_BOOST)),-I$(call gb_UnpackedTarball_get_dir,boost) -I$(BUILDDIR)/config_$(gb_Side),$(BOOST_CPPFLAGS))" \
+ CXXFLAGS="$(if $(SYSTEM_BOOST),$(BOOST_CPPFLAGS),-I$(call gb_UnpackedTarball_get_dir,boost) -I$(BUILDDIR)/config_$(gb_Side))" \
$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
&& (cd $(EXTERNAL_WORKDIR)/src/lib && \
$(if $(VERBOSE)$(verbose),V=1) \
diff --git a/external/libodfgen/ExternalProject_libodfgen.mk b/external/libodfgen/ExternalProject_libodfgen.mk
index dfc44b44379b..dd311441a5ef 100644
--- a/external/libodfgen/ExternalProject_libodfgen.mk
+++ b/external/libodfgen/ExternalProject_libodfgen.mk
@@ -32,7 +32,7 @@ $(call gb_ExternalProject_get_state_target,libodfgen,build) :
--disable-debug \
--disable-werror \
--disable-weffc \
- CXXFLAGS="$(if $(filter NO,$(SYSTEM_BOOST)),-I$(call gb_UnpackedTarball_get_dir,boost) -I$(BUILDDIR)/config_$(gb_Side),$(BOOST_CPPFLAGS))" \
+ CXXFLAGS="$(if $(SYSTEM_BOOST),$(BOOST_CPPFLAGS),-I$(call gb_UnpackedTarball_get_dir,boost) -I$(BUILDDIR)/config_$(gb_Side))" \
$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
&& (cd $(EXTERNAL_WORKDIR)/src && \
$(if $(VERBOSE)$(verbose),V=1) \
diff --git a/external/liborcus/ExternalProject_liborcus.mk b/external/liborcus/ExternalProject_liborcus.mk
index 432423a2a3e4..a62855d4e3ea 100644
--- a/external/liborcus/ExternalProject_liborcus.mk
+++ b/external/liborcus/ExternalProject_liborcus.mk
@@ -35,7 +35,7 @@ liborcus_LIBS=
ifneq ($(SYSTEM_ZLIB),)
liborcus_LIBS+=-lz
endif
-ifeq ($(SYSTEM_BOOST),YES)
+ifneq ($(SYSTEM_BOOST),)
liborcus_LIBS+=$(BOOST_SYSTEM_LIB)
else
liborcus_LIBS+=-L$(gb_StaticLibrary_WORKDIR) -lboostsystem
@@ -52,7 +52,7 @@ ifeq ($(SYSTEM_ZLIB),)
liborcus_CPPFLAGS+=$(ZLIB_CFLAGS)
endif
# patched boost needs to find config_global.h
-ifeq ($(SYSTEM_BOOST),NO)
+ifeq ($(SYSTEM_BOOST),)
liborcus_CPPFLAGS += -I$(BUILDDIR)/config_$(gb_Side)
endif
#
@@ -73,7 +73,7 @@ liborcus_LDFLAGS=$(LDFLAGS)
ifeq ($(COM),MSC)
liborcus_CXXFLAGS+=$(BOOST_CXXFLAGS)
endif
-ifeq ($(SYSTEM_BOOST),NO)
+ifeq ($(SYSTEM_BOOST),)
liborcus_CXXFLAGS+=-I$(WORKDIR)/UnpackedTarball/boost
else
liborcus_LDFLAGS+=$(BOOST_LDFLAGS)
@@ -96,7 +96,7 @@ $(call gb_ExternalProject_get_state_target,liborcus,build) :
--disable-spreadsheet-model \
--disable-werror \
$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
- $(if $(filter NO,$(SYSTEM_BOOST)),--with-boost-system=boostsystem) \
+ $(if $(SYSTEM_BOOST),,--with-boost-system=boostsystem) \
&& $(if $(VERBOSE)$(verbose),V=1) \
$(MAKE) \
)
diff --git a/external/libvisio/ExternalProject_libvisio.mk b/external/libvisio/ExternalProject_libvisio.mk
index 26859e8c4f2d..cbdea647bfe8 100644
--- a/external/libvisio/ExternalProject_libvisio.mk
+++ b/external/libvisio/ExternalProject_libvisio.mk
@@ -34,7 +34,7 @@ $(call gb_ExternalProject_get_state_target,libvisio,build) :
--without-docs \
--disable-debug \
--disable-werror \
- CXXFLAGS="$(if $(filter NO,$(SYSTEM_BOOST)),-I$(call gb_UnpackedTarball_get_dir,boost) -I$(BUILDDIR)/config_$(gb_Side),$(BOOST_CPPFLAGS)) \
+ CXXFLAGS="$(if $(SYSTEM_BOOST),$(BOOST_CPPFLAGS),-I$(call gb_UnpackedTarball_get_dir,boost) -I$(BUILDDIR)/config_$(gb_Side)) \
$(if $(SYSTEM_LIBXML),,-I$(call gb_UnpackedTarball_get_dir,xml2)/include)" \
$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
&& (cd $(EXTERNAL_WORKDIR)/src/lib && \
diff --git a/external/libwps/ExternalProject_libwps.mk b/external/libwps/ExternalProject_libwps.mk
index abfd006d056f..855c683e7c69 100644
--- a/external/libwps/ExternalProject_libwps.mk
+++ b/external/libwps/ExternalProject_libwps.mk
@@ -30,7 +30,7 @@ $(call gb_ExternalProject_get_state_target,libwps,build) :
--without-docs \
--disable-debug \
--disable-werror \
- CXXFLAGS="$(if $(filter NO,$(SYSTEM_BOOST)),-I$(call gb_UnpackedTarball_get_dir,boost) -I$(BUILDDIR)/config_$(gb_Side),$(BOOST_CPPFLAGS))" \
+ CXXFLAGS="$(if $(SYSTEM_BOOST),$(BOOST_CPPFLAGS),-I$(call gb_UnpackedTarball_get_dir,boost) -I$(BUILDDIR)/config_$(gb_Side))" \
$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
&& (cd $(EXTERNAL_WORKDIR)/src/lib && \
$(if $(VERBOSE)$(verbose),V=1) \
generated by cgit (git 2.34.1) at 2024-06-14 00:13:57 +0000