external/libatomic_ops/ExternalProject_libatomic_ops.mk | 2 +- external/liborcus/ExternalProject_liborcus.mk | 2 +- external/liborcus/UnpackedTarball_liborcus.mk | 4 ++-- external/libwpd/ExternalProject_libwpd.mk | 2 +- external/poppler/ExternalProject_poppler.mk | 2 +- solenv/gbuild/platform/com_GCC_defs.mk | 3 ++- 6 files changed, 8 insertions(+), 7 deletions(-)
New commits: commit fc6f894d2211cee7b28cb93345e90297ec04fe06 Author: Stephan Bergmann <[email protected]> Date: Fri Feb 27 09:55:02 2015 +0100 Pass -fvisibility-inlines-hidden into external modules Change-Id: Icf872e269c7e427ba1287ccd0082974c9426449e diff --git a/external/libatomic_ops/ExternalProject_libatomic_ops.mk b/external/libatomic_ops/ExternalProject_libatomic_ops.mk index 28384ad..afbad2e 100644 --- a/external/libatomic_ops/ExternalProject_libatomic_ops.mk +++ b/external/libatomic_ops/ExternalProject_libatomic_ops.mk @@ -17,7 +17,7 @@ $(eval $(call gb_ExternalProject_register_targets,libatomic_ops,\ $(call gb_ExternalProject_get_state_target,libatomic_ops,build) : $(call gb_ExternalProject_run,build,\ - $(if $(filter TRUE,$(DISABLE_DYNLOADING)),CFLAGS="$(CFLAGS) $(gb_VISIBILITY_FLAGS) $(gb_COMPILEROPTFLAGS)" CXXFLAGS="$(CXXFLAGS) $(gb_VISIBILITY_FLAGS) $(gb_COMPILEROPTFLAGS)") \ + $(if $(filter TRUE,$(DISABLE_DYNLOADING)),CFLAGS="$(CFLAGS) $(gb_VISIBILITY_FLAGS) $(gb_COMPILEROPTFLAGS)" CXXFLAGS="$(CXXFLAGS) $(gb_VISIBILITY_FLAGS) $(gb_VISIBILITY_FLAGS_CXX) $(gb_COMPILEROPTFLAGS)") \ ./configure \ $(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ && $(MAKE) \ diff --git a/external/liborcus/ExternalProject_liborcus.mk b/external/liborcus/ExternalProject_liborcus.mk index 9e68331..90d453c 100644 --- a/external/liborcus/ExternalProject_liborcus.mk +++ b/external/liborcus/ExternalProject_liborcus.mk @@ -63,7 +63,7 @@ liborcus_CPPFLAGS+=-D_GLIBCXX_DEBUG endif endif -liborcus_CXXFLAGS=$(CXXFLAGS) +liborcus_CXXFLAGS=$(CXXFLAGS) $(gb_VISIBILITY_FLAGS) $(gb_VISIBILITY_FLAGS_CXX) liborcus_LDFLAGS=$(LDFLAGS) $(gb_LTOFLAGS) ifeq ($(COM),MSC) liborcus_CXXFLAGS+=$(BOOST_CXXFLAGS) diff --git a/external/liborcus/UnpackedTarball_liborcus.mk b/external/liborcus/UnpackedTarball_liborcus.mk index 66022d5..126f250 100644 --- a/external/liborcus/UnpackedTarball_liborcus.mk +++ b/external/liborcus/UnpackedTarball_liborcus.mk @@ -21,9 +21,9 @@ liborcus_patches := # don't use dllimport liborcus_patches += liborcus_0.1.0-dllimport.patch -ifneq ($(HAVE_GCC_VISIBILITY_FEATURE),TRUE) +# Any -fvisibility= etc. settings are passed into liborcus' CXXFLAGS via +# gb_VISIBILITY_FLAGS[_CXX]: liborcus_patches += visibility.patch -endif # <https://gitorious.org/orcus/orcus/merge_requests/2# # f60d6eecee72349993a392a9a63ddf3383d3b8c8- diff --git a/external/libwpd/ExternalProject_libwpd.mk b/external/libwpd/ExternalProject_libwpd.mk index ce60e89..8d721b1 100644 --- a/external/libwpd/ExternalProject_libwpd.mk +++ b/external/libwpd/ExternalProject_libwpd.mk @@ -32,7 +32,7 @@ $(call gb_ExternalProject_get_state_target,libwpd,build) : --disable-debug \ $(if $(filter MACOSX,$(OS)),--disable-werror) \ $(if $(VERBOSE)$(verbose),--disable-silent-rules,--enable-silent-rules) \ - $(if $(filter TRUE,$(DISABLE_DYNLOADING)),CFLAGS="$(CFLAGS) $(gb_VISIBILITY_FLAGS) $(gb_COMPILEROPTFLAGS)" CXXFLAGS="$(CXXFLAGS) $(gb_VISIBILITY_FLAGS) $(gb_COMPILEROPTFLAGS)") \ + $(if $(filter TRUE,$(DISABLE_DYNLOADING)),CFLAGS="$(CFLAGS) $(gb_VISIBILITY_FLAGS) $(gb_COMPILEROPTFLAGS)" CXXFLAGS="$(CXXFLAGS) $(gb_VISIBILITY_FLAGS) $(gb_VISIBILITY_FLAGS_CXX) $(gb_COMPILEROPTFLAGS)") \ $(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ && $(MAKE) \ ) diff --git a/external/poppler/ExternalProject_poppler.mk b/external/poppler/ExternalProject_poppler.mk index 278807e..55d8416 100644 --- a/external/poppler/ExternalProject_poppler.mk +++ b/external/poppler/ExternalProject_poppler.mk @@ -17,7 +17,7 @@ $(eval $(call gb_ExternalProject_register_targets,poppler,\ $(call gb_ExternalProject_get_state_target,poppler,build) : $(call gb_ExternalProject_run,build,\ - $(if $(filter TRUE,$(DISABLE_DYNLOADING)),CFLAGS="$(CFLAGS) $(gb_VISIBILITY_FLAGS) $(gb_COMPILEROPTFLAGS)" CXXFLAGS="$(CXXFLAGS) $(gb_VISIBILITY_FLAGS) $(gb_COMPILEROPTFLAGS)") \ + $(if $(filter TRUE,$(DISABLE_DYNLOADING)),CFLAGS="$(CFLAGS) $(gb_VISIBILITY_FLAGS) $(gb_COMPILEROPTFLAGS)" CXXFLAGS="$(CXXFLAGS) $(gb_VISIBILITY_FLAGS) $(gb_VISIBILITY_FLAGS_CXX) $(gb_COMPILEROPTFLAGS)") \ MAKE=$(MAKE) ./configure \ --with-pic \ --enable-static \ diff --git a/solenv/gbuild/platform/com_GCC_defs.mk b/solenv/gbuild/platform/com_GCC_defs.mk index 89f1512..7f8b617 100644 --- a/solenv/gbuild/platform/com_GCC_defs.mk +++ b/solenv/gbuild/platform/com_GCC_defs.mk @@ -92,9 +92,10 @@ ifeq (,$(filter -fvisibility=hidden,$(CC))) gb_VISIBILITY_FLAGS += -fvisibility=hidden endif ifneq ($(HAVE_GCC_VISIBILITY_BROKEN),TRUE) -gb_CXXFLAGS_COMMON += -fvisibility-inlines-hidden +gb_VISIBILITY_FLAGS_CXX := -fvisibility-inlines-hidden endif endif +gb_CXXFLAGS_COMMON += $(gb_VISIBILITY_FLAGS_CXX) ifeq ($(HAVE_GCC_STACK_PROTECTOR_STRONG),TRUE) gb_CFLAGS_COMMON += -fstack-protector-strong _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
