[Libreoffice-commits] core.git: external/gpgme
Stephan Bergmann
sbergman at redhat.com
Tue Sep 5 12:29:47 UTC 2017
external/gpgme/ExternalProject_gpgme.mk | 5 +++++
1 file changed, 5 insertions(+)
New commits:
commit 1f66a258f2371d516b6a031a46ab4ef5d973796b
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Tue Sep 5 12:39:01 2017 +0200
Pass optimization/debug flags into external/gpgme
Change-Id: I583ae3156448a8556891a80e188989010bf2732f
Reviewed-on: https://gerrit.libreoffice.org/41931
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman at redhat.com>
diff --git a/external/gpgme/ExternalProject_gpgme.mk b/external/gpgme/ExternalProject_gpgme.mk
index 768aef9a7a27..5c2407c1c771 100644
--- a/external/gpgme/ExternalProject_gpgme.mk
+++ b/external/gpgme/ExternalProject_gpgme.mk
@@ -29,6 +29,11 @@ $(call gb_ExternalProject_get_state_target,gpgme,build):
GPG_ERROR_LIBS="$(GPG_ERROR_LIBS)" \
LIBASSUAN_CFLAGS="$(LIBASSUAN_CFLAGS)" \
LIBASSUAN_LIBS="$(LIBASSUAN_LIBS)" \
+ CFLAGS='$(CFLAGS) \
+ $(if $(ENABLE_OPTIMIZED), \
+ $(gb_COMPILEROPTFLAGS),$(gb_COMPILERNOOPTFLAGS)) \
+ $(if $(ENABLE_DEBUG),$(gb_DEBUG_CFLAGS)) \
+ $(if $(filter $(true),$(gb_SYMBOL)),$(gb_DEBUGINFO_FLAGS))' \
$(if $(filter LINUX,$(OS)), \
'LDFLAGS=-Wl$(COMMA)-z$(COMMA)origin \
-Wl$(COMMA)-rpath$(COMMA)\$$$$ORIGIN') \
More information about the Libreoffice-commits
mailing list