bridges/Library_cpp_uno.mk | 2 +-
external/curl/ExternalProject_curl.mk | 2 +-
external/firebird/ExternalProject_firebird.mk | 2 +-
external/gpgmepp/ExternalProject_gpgmepp.mk | 6 +++---
external/harfbuzz/ExternalProject_harfbuzz.mk | 2 +-
external/icu/ExternalProject_icu.mk | 4 ++--
external/liblangtag/ExternalProject_liblangtag.mk | 2 +-
7 files changed, 10 insertions(+), 10 deletions(-)
New commits:
commit 1334c2bf93a4ea7168718a3a2678fbf9848ec469
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Sat May 4 17:48:51 2019 +0200
Commit: Luboš Luňák <l.lu...@collabora.com>
CommitDate: Sun May 5 17:43:11 2019 +0200
Fix remaining uses of gb_SYMBOL
...after eeeec33ada5923f1f534334b22c15d6e2c6f1d35 "merge
--enable-selective-debuginfo into --enable-symbols" had removed it
Change-Id: I83aed6e21c4b983d8645707daa65bd85ec16ff6b
Reviewed-on: https://gerrit.libreoffice.org/71798
Tested-by: Jenkins
Reviewed-by: Luboš Luňák <l.lu...@collabora.com>
diff --git a/bridges/Library_cpp_uno.mk b/bridges/Library_cpp_uno.mk
index 421483f08f42..eded406d3f35 100644
--- a/bridges/Library_cpp_uno.mk
+++ b/bridges/Library_cpp_uno.mk
@@ -219,7 +219,7 @@ bridges_NON_CALL_EXCEPTIONS_FLAGS := -fnon-call-exceptions
endif
endif
-bridges_DEBUGINFO_FLAGS := $(if $(filter
$(true),$(gb_SYMBOL)),$(gb_DEBUGINFO_FLAGS))
+bridges_DEBUGINFO_FLAGS := $(if $(call
gb_LinkTarget__symbols_enabled,Library_$(gb_CPPU_ENV)_uno),$(gb_DEBUGINFO_FLAGS))
$(eval $(call gb_Library_use_libraries,$(gb_CPPU_ENV)_uno,\
cppu \
diff --git a/external/curl/ExternalProject_curl.mk
b/external/curl/ExternalProject_curl.mk
index 86e22aa2fa19..366ff1e39d95 100644
--- a/external/curl/ExternalProject_curl.mk
+++ b/external/curl/ExternalProject_curl.mk
@@ -78,7 +78,7 @@ $(call gb_ExternalProject_get_state_target,curl,build):
mode=dll \
VC=12 \
$(if $(filter
X86_64,$(CPUNAME)),MACHINE=x64,MACHINE=x86) \
- GEN_PDB=$(if $(gb_SYMBOL),yes,no) \
+ GEN_PDB=$(if $(call
gb_Module__symbols_enabled,curl),yes,no) \
DEBUG=$(if $(MSVC_USE_DEBUG_RUNTIME),yes,no) \
ENABLE_IPV6=yes \
ENABLE_SSPI=yes \
diff --git a/external/firebird/ExternalProject_firebird.mk
b/external/firebird/ExternalProject_firebird.mk
index 3b444397442d..a70a53d0e9d5 100644
--- a/external/firebird/ExternalProject_firebird.mk
+++ b/external/firebird/ExternalProject_firebird.mk
@@ -74,7 +74,7 @@ $(call gb_ExternalProject_get_state_target,firebird,build):
) \
$(CXXFLAGS_CXX11) \
$(firebird_NO_CXX11_NARROWING) \
- $(if $(filter
$(true),$(gb_SYMBOL)),$(gb_DEBUGINFO_FLAGS)) \
+ $(if $(call
gb_Module__symbols_enabled,firebird),$(gb_DEBUGINFO_FLAGS)) \
" \
&& export LDFLAGS=" \
$(if $(SYSTEM_ICU),$(ICU_LIBS), \
diff --git a/external/gpgmepp/ExternalProject_gpgmepp.mk
b/external/gpgmepp/ExternalProject_gpgmepp.mk
index 6ee9b568980b..8ecdf60e6f87 100644
--- a/external/gpgmepp/ExternalProject_gpgmepp.mk
+++ b/external/gpgmepp/ExternalProject_gpgmepp.mk
@@ -37,7 +37,7 @@ $(call gb_ExternalProject_get_state_target,gpgmepp,build):
$(call gb_Executable_
CFLAGS='$(CFLAGS) \
$(if $(ENABLE_OPTIMIZED), \
$(gb_COMPILEROPTFLAGS),$(gb_COMPILERNOOPTFLAGS)) \
- $(if $(filter
$(true),$(gb_SYMBOL)),$(gb_DEBUGINFO_FLAGS))' \
+ $(if $(call
gb_Module__symbols_enabled,gpgmepp),$(gb_DEBUGINFO_FLAGS))' \
--host=$(gb_ExternalProject_gpgmepp_host) \
RC='windres -O COFF
--target=$(gb_ExternalProject_gpgmepp_target) --preprocessor='\''$(call
gb_Executable_get_target,cpp) -+ -DRC_INVOKED -DWINAPI_FAMILY=0 $(SOLARINC)'\' \
MAKE=$(MAKE) \
@@ -57,12 +57,12 @@ $(call gb_ExternalProject_get_state_target,gpgmepp,build):
CFLAGS='$(CFLAGS) \
$(if $(ENABLE_OPTIMIZED), \
$(gb_COMPILEROPTFLAGS),$(gb_COMPILERNOOPTFLAGS)) \
- $(if $(filter
$(true),$(gb_SYMBOL)),$(gb_DEBUGINFO_FLAGS))' \
+ $(if $(call
gb_Module__symbols_enabled,gpgmepp),$(gb_DEBUGINFO_FLAGS))' \
CXXFLAGS='$(CXXFLAGS) \
$(if $(ENABLE_OPTIMIZED), \
$(gb_COMPILEROPTFLAGS),$(gb_COMPILERNOOPTFLAGS)) \
$(if $(ENABLE_DBGUTIL),-D_GLIBCXX_DEBUG) \
- $(if $(filter
$(true),$(gb_SYMBOL)),$(gb_DEBUGINFO_FLAGS))' \
+ $(if $(call
gb_Module__symbols_enabled,gpgmepp),$(gb_DEBUGINFO_FLAGS))' \
$(if $(filter LINUX,$(OS)), \
'LDFLAGS=-Wl$(COMMA)-z$(COMMA)origin \
-Wl$(COMMA)-rpath$(COMMA)\$$$$ORIGIN') \
diff --git a/external/harfbuzz/ExternalProject_harfbuzz.mk
b/external/harfbuzz/ExternalProject_harfbuzz.mk
index b0bcc301cd66..6a8b46f722ea 100644
--- a/external/harfbuzz/ExternalProject_harfbuzz.mk
+++ b/external/harfbuzz/ExternalProject_harfbuzz.mk
@@ -43,7 +43,7 @@ $(call gb_ExternalProject_get_state_target,harfbuzz,build) :
$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM)
--host=$(HOST_PLATFORM)) \
CXXFLAGS=' \
$(if $(filter ANDROID,$(OS)),-DHB_NO_MMAP=1,) \
- $(if $(filter
$(true),$(gb_SYMBOL)),$(gb_DEBUGINFO_FLAGS)) \
+ $(if $(call
gb_Module__symbols_enabled,harfbuzz),$(gb_DEBUGINFO_FLAGS)) \
$(if $(ENABLE_OPTIMIZED), \
$(gb_COMPILEROPTFLAGS),$(gb_COMPILERNOOPTFLAGS)) \
$(if $(ENABLE_RUNTIME_OPTIMIZATIONS),,-frtti) \
diff --git a/external/icu/ExternalProject_icu.mk
b/external/icu/ExternalProject_icu.mk
index 71f4f643bb45..806db1535e4b 100644
--- a/external/icu/ExternalProject_icu.mk
+++ b/external/icu/ExternalProject_icu.mk
@@ -37,7 +37,7 @@ icu_CFLAGS:=" \
$(if
$(ENABLE_OPTIMIZED),$(gb_COMPILEROPTFLAGS),$(gb_COMPILERNOOPTFLAGS)) \
$(if $(ENABLE_LTO),$(gb_LTOFLAGS)) \
$(if $(filter GCC,$(COM)),-fno-strict-aliasing) \
- $(if $(filter $(true),$(gb_SYMBOL)),$(gb_DEBUGINFO_FLAGS)) \
+ $(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)"
icu_CXXFLAGS:="$(CXXFLAGS) $(CXXFLAGS_CXX11) \
@@ -45,7 +45,7 @@ icu_CXXFLAGS:="$(CXXFLAGS) $(CXXFLAGS_CXX11) \
$(if
$(ENABLE_OPTIMIZED),$(gb_COMPILEROPTFLAGS),$(gb_COMPILERNOOPTFLAGS)) \
$(if $(ENABLE_LTO),$(gb_LTOFLAGS)) \
$(if $(filter GCC,$(COM)),-fno-strict-aliasing) \
- $(if $(filter $(true),$(gb_SYMBOL)),$(gb_DEBUGINFO_FLAGS)) \
+ $(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))"
icu_LDFLAGS:=" \
diff --git a/external/liblangtag/ExternalProject_liblangtag.mk
b/external/liblangtag/ExternalProject_liblangtag.mk
index 028d8229e7e5..3fb5618f7fc1 100644
--- a/external/liblangtag/ExternalProject_liblangtag.mk
+++ b/external/liblangtag/ExternalProject_liblangtag.mk
@@ -31,7 +31,7 @@ $(call gb_ExternalProject_get_state_target,liblangtag,build):
CFLAGS='$(CFLAGS) \
$(if $(ENABLE_OPTIMIZED), \
$(gb_COMPILEROPTFLAGS),$(gb_COMPILERNOOPTFLAGS)) \
- $(if $(filter
$(true),$(gb_SYMBOL)),$(gb_DEBUGINFO_FLAGS))' \
+ $(if $(call
gb_Module__symbols_enabled,liblangtag),$(gb_DEBUGINFO_FLAGS))' \
$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM)
--host=$(HOST_PLATFORM) "ac_cv_va_copy=no") \
LIBXML2_CFLAGS="$(LIBXML_CFLAGS)" \
LIBXML2_LIBS="$(if $(filter WNT,$(OS)),-L$(call
gb_UnpackedTarball_get_dir,libxml2)/win32/bin.msvc -llibxml2,$(LIBXML_LIBS))" \
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
