[pkg-d-commits] [ldc] 05/06: Really build without embedded zlib

[Matthias Klumpp]

This is an automated email from the git hooks/post-receive script.

mak pushed a commit to branch master
in repository ldc.

commit b0283348907b76ec735e661718fcbf4525265723
Author: Matthias Klumpp <mak at debian.org>
Date:   Tue Jun 20 23:53:24 2017 +0200

    Really build without embedded zlib
---
 debian/patches/01_no-zlib-embed.patch | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/debian/patches/01_no-zlib-embed.patch b/debian/patches/01_no-zlib-embed.patch
index c909112..2ff8593 100644
--- a/debian/patches/01_no-zlib-embed.patch
+++ b/debian/patches/01_no-zlib-embed.patch
@@ -3,7 +3,21 @@ Author: Konstantinos Margaritis <markos at debian.org>
 
 --- a/runtime/CMakeLists.txt
 +++ b/runtime/CMakeLists.txt
-@@ -397,9 +397,9 @@
+@@ -160,6 +160,13 @@
+     # remove some obsolete zlib modules
+     list(REMOVE_ITEM PHOBOS2_C ${PHOBOS2_DIR}/etc/c/zlib/minigzip.c ${PHOBOS2_DIR}/etc/c/zlib/example.c)
+ 
++    # don't embed zlib
++    foreach(item ${PHOBOS2_C})
++      if(${item} MATCHES ".*/c/zlib/.*.c")
++        list(REMOVE_ITEM PHOBOS2_C ${item})
++      endif()
++    endforeach()
++
+     set(CONFIG_NAME ${LDC_EXE}_phobos)
+ else()
+     set(CONFIG_NAME ${LDC_EXE})
+@@ -397,9 +404,9 @@
  
      if(BUILD_SHARED_LIBS)
          if(${CMAKE_SYSTEM} MATCHES "Linux")

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-d/ldc.git