[Libreoffice-commits] core.git: external/zlib

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Wed Mar 6 17:37:27 UTC 2019


 external/zlib/StaticLibrary_zlib.mk     |    4 ++++
 external/zlib/StaticLibrary_zlib_x64.mk |    4 ++++
 2 files changed, 8 insertions(+)

New commits:
commit 7f2dd5bfb31bdfecce424e5a36cc41650c8811a3
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Wed Mar 6 16:21:00 2019 +0100
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Wed Mar 6 18:36:58 2019 +0100

    Pass ENABLE_DEBUG into external/zlib
    
    Change-Id: I3aea7c64acfc933e4df901d4de349708a3331bcd
    Reviewed-on: https://gerrit.libreoffice.org/68811
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/external/zlib/StaticLibrary_zlib.mk b/external/zlib/StaticLibrary_zlib.mk
index 3071e614e722..eb309dcc5b7e 100644
--- a/external/zlib/StaticLibrary_zlib.mk
+++ b/external/zlib/StaticLibrary_zlib.mk
@@ -29,4 +29,8 @@ $(eval $(call gb_StaticLibrary_add_generated_cobjects,zlib,\
 	UnpackedTarball/zlib/zutil \
 ))
 
+ifeq ($(ENABLE_DEBUG),TRUE)
+$(eval $(call gb_StaticLibrary_add_cflags,zlib,-DZLIB_DEBUG))
+endif
+
 # vim: set noet sw=4 ts=4:
diff --git a/external/zlib/StaticLibrary_zlib_x64.mk b/external/zlib/StaticLibrary_zlib_x64.mk
index 99a08d55ded5..dd16655d1949 100644
--- a/external/zlib/StaticLibrary_zlib_x64.mk
+++ b/external/zlib/StaticLibrary_zlib_x64.mk
@@ -32,4 +32,8 @@ $(eval $(call gb_StaticLibrary_add_x64_generated_cobjects,zlib_x64,\
 	UnpackedTarball/zlib/x64/zutil \
 ))
 
+ifeq ($(ENABLE_DEBUG),TRUE)
+$(eval $(call gb_StaticLibrary_add_cflags,zlib_x64,-DZLIB_DEBUG))
+endif
+
 # vim: set noet sw=4 ts=4:


More information about the Libreoffice-commits mailing list