configure.ac | 1 -
external/icu/ExternalProject_icu.mk | 2 +-
solenv/gbuild/LinkTarget.mk | 2 +-
solenv/gbuild/SdiTarget.mk | 3 ++-
solenv/gbuild/WinResTarget.mk | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
New commits:
commit 7e101d967328610de3d37b83ca68aca708e4ac48
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Wed Jan 19 14:32:52 2022 +0100
Commit: Stephan Bergmann <sberg...@redhat.com>
CommitDate: Wed Jan 19 19:22:09 2022 +0100
Decouple SRCDIR/include from SOLARINC
...turning the latter into "whatever include directories are needed for the
given toolchain and platform, outside the scope of LibreOffice". This is a
prerequisite for fixing <https://gerrit.libreoffice.org/c/core/+/128591/1>
"Let
CppunitTest_odk_checkapi build against the SDK include directory", which
failed
to find the C++ standard library headers (available via SOLARINC) on
Windows.
(In external/icu/ExternalProject_icu.mk, SRCDIR/include is needed for
ANDROID to
find <android/compatibility.hxx> in external/icu/icu4c-android.patch.1.)
Change-Id: I960e31140b0839b2b6184a78d935042c3c558d5b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128615
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
diff --git a/configure.ac b/configure.ac
index c6e778253ef3..b130e1e5ec68 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5326,7 +5326,6 @@ WORKDIR="${BUILDDIR}/workdir"
INSTDIR="${BUILDDIR}/instdir"
INSTROOTBASE=${INSTDIR}${INSTROOTBASESUFFIX}
INSTROOT=${INSTROOTBASE}${INSTROOTCONTENTSUFFIX}
-SOLARINC="-I$SRC_ROOT/include $SOLARINC"
AC_SUBST(COM)
AC_SUBST(CPUNAME)
AC_SUBST(RTL_OS)
diff --git a/external/icu/ExternalProject_icu.mk
b/external/icu/ExternalProject_icu.mk
index 18a8f3838834..d9d6c4b81700 100644
--- a/external/icu/ExternalProject_icu.mk
+++ b/external/icu/ExternalProject_icu.mk
@@ -52,7 +52,7 @@ icu_CXXFLAGS:="$(CXXFLAGS) $(CXXFLAGS_CXX11) \
$(if $(filter GCC,$(COM)),-fno-strict-aliasing) \
$(if $(call gb_Module__symbols_enabled,icu),$(gb_DEBUGINFO_FLAGS)) \
$(if $(filter FUZZERS,$(BUILD_TYPE)),-DU_USE_STRTOD_L=0) \
- $(if $(filter ANDROID,$(OS)),-fvisibility=hidden
-fno-omit-frame-pointer $(SOLARINC))"
+ $(if $(filter ANDROID,$(OS)),-fvisibility=hidden
-fno-omit-frame-pointer -I$(SRCDIR)/include)"
icu_LDFLAGS:=" \
$(if $(ENABLE_LTO),$(gb_LTOFLAGS)) \
$(if $(filter
TRUE,$(HAVE_LD_HASH_STYLE)),-Wl$(COMMA)--hash-style=$(WITH_LINKER_HASH_STYLE)) \
diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index a0c199ac765f..ba7518805bc7 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -1034,7 +1034,7 @@ $(call gb_LinkTarget_get_target,$(1)) : T_CXXCLRFLAGS :=
$$(gb_LinkTarget_CXXCLR
$(call gb_LinkTarget_get_target,$(1)) : T_CXXCLRFLAGS_APPEND :=
$(call gb_LinkTarget_get_target,$(1)) : DEFS := $$(gb_LinkTarget_DEFAULTDEFS)
$(CPPFLAGS)
$(call gb_LinkTarget_get_target,$(1)) : PCH_DEFS :=
$$(gb_LinkTarget_DEFAULTDEFS) $(CPPFLAGS)
-$(call gb_LinkTarget_get_target,$(1)) : INCLUDE := $$(gb_LinkTarget_INCLUDE)
+$(call gb_LinkTarget_get_target,$(1)) : INCLUDE := -I$$(SRCDIR)/include
$$(gb_LinkTarget_INCLUDE)
$(call gb_LinkTarget_get_target,$(1)) : T_LDFLAGS := $$(gb_LinkTarget_LDFLAGS)
$(call gb_LinkTarget_get_linksearchpath_for_layer,$(3)) $(call
gb_LinkTarget__get_ldflags,$(2))
$(call gb_LinkTarget_get_target,$(1)) : LINKED_LIBS :=
$(call gb_LinkTarget_get_target,$(1)) : LINKED_STATIC_LIBS :=
diff --git a/solenv/gbuild/SdiTarget.mk b/solenv/gbuild/SdiTarget.mk
index 1b02e7f1699e..ed98bdbfadea 100644
--- a/solenv/gbuild/SdiTarget.mk
+++ b/solenv/gbuild/SdiTarget.mk
@@ -65,7 +65,8 @@ $(call gb_SdiTarget_get_clean_target,%) :
$(call gb_SdiTarget_get_target,$*))
define gb_SdiTarget_SdiTarget
-$(call gb_SdiTarget_get_target,$(1)) : INCLUDE := $(SOLARINC) -I$$(dir
$(SRCDIR)/$(1))
+$(call gb_SdiTarget_get_target,$(1)) : \
+ INCLUDE := -I$(SRCDIR)/include $(SOLARINC) -I$$(dir $(SRCDIR)/$(1))
$(call gb_SdiTarget_get_target,$(1)) : EXPORTS := $(SRCDIR)/$(2).sdi
ifeq ($(gb_FULLDEPS),$(true))
-include $(call gb_SdiTarget_get_dep_target,$(1))
diff --git a/solenv/gbuild/WinResTarget.mk b/solenv/gbuild/WinResTarget.mk
index c110491722c3..7cc98adc5f2c 100644
--- a/solenv/gbuild/WinResTarget.mk
+++ b/solenv/gbuild/WinResTarget.mk
@@ -31,7 +31,7 @@ endef
define gb_WinResTarget_WinResTarget_init
$(call gb_WinResTarget_get_target,$(1)) : DEFS :=
$(gb_WinResTarget_DEFAULTDEFS)
$(call gb_WinResTarget_get_target,$(1)) : FLAGS := $(gb_RCFLAGS)
-$(call gb_WinResTarget_get_target,$(1)) : INCLUDE := $(subst
-isystem,-I,$(SOLARINC)) -I$(BUILDDIR)/config_$(gb_Side)
+$(call gb_WinResTarget_get_target,$(1)) : INCLUDE := -I$(SRCDIR)/include
$(subst -isystem,-I,$(SOLARINC)) -I$(BUILDDIR)/config_$(gb_Side)
$(call gb_WinResTarget_get_clean_target,$(1)) : RCFILE :=
$(call gb_WinResTarget_get_target,$(1)) : RCFILE :=
