[pkg-d-commits] [ldc] 03/05: bootstrap-no-zlib-embed.patch: No zlib embedding in bootstrap compiler

[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 8b6c948efbe1f2fc445b94fe4d86f440186abd01
Author: Matthias Klumpp <mak at debian.org>
Date:   Wed Aug 30 23:54:12 2017 +0200

    bootstrap-no-zlib-embed.patch: No zlib embedding in bootstrap compiler
---
 debian/patches/02_bootstrap-no-zlib-embed.patch    | 44 ++++++++++++++++++++++
 ..._include_path.diff => 03_ldc_include_path.diff} |  0
 .../{03_static-PIC.patch => 04_static-PIC.patch}   |  0
 ...-flags.patch => 05_pass-d-compiler-flags.patch} |  0
 ...efault.patch => 06_bootstrap-pic-default.patch} |  0
 debian/patches/series                              |  9 +++--
 6 files changed, 49 insertions(+), 4 deletions(-)

diff --git a/debian/patches/02_bootstrap-no-zlib-embed.patch b/debian/patches/02_bootstrap-no-zlib-embed.patch
new file mode 100644
index 0000000..dacc9c2
--- /dev/null
+++ b/debian/patches/02_bootstrap-no-zlib-embed.patch
@@ -0,0 +1,44 @@
+Description:  Remove embedded zlib from bootstrap compiler
+Author: Matthias Klumpp <mak at debian.org>
+--- a/bootstrap/runtime/CMakeLists.txt
++++ b/bootstrap/runtime/CMakeLists.txt
+@@ -155,12 +155,6 @@
+     elseif(WIN32)
+         file(GLOB PHOBOS2_D_C_SYS ${PHOBOS2_DIR}/std/c/windows/*.d)
+     endif()
+-    file(GLOB ZLIB_C ${PHOBOS2_DIR}/etc/c/zlib/*.c)
+-    list(REMOVE_ITEM ZLIB_C
+-        ${PHOBOS2_DIR}/etc/c/zlib/minigzip.c
+-        ${PHOBOS2_DIR}/etc/c/zlib/example.c
+-        ${PHOBOS2_DIR}/etc/c/zlib/gzio.c
+-    )
+     if(WIN32)
+         file(GLOB PHOBOS2_D_WIN ${PHOBOS2_DIR}/std/windows/*.d)
+     endif()
+@@ -401,7 +395,7 @@
+         LIBRARY_OUTPUT_DIRECTORY    ${output_path}
+         RUNTIME_OUTPUT_DIRECTORY    ${output_path}
+         COMPILE_FLAGS               "${c_flags}"
+-        LINK_FLAGS                  "${ld_flags}"
++        LINK_FLAGS                  "${ld_flags} z"
+     )
+ 
+     # When building a shared library, we need to link in all the default
+@@ -421,7 +415,7 @@
+         set(phobos2_bc "")
+         compile_phobos2("${d_flags}" "${lib_suffix}" "${path_suffix}" phobos2_o phobos2_bc)
+ 
+-        add_library(phobos2-ldc${target_suffix} ${D_LIBRARY_TYPE} ${ZLIB_C} ${phobos2_o})
++        add_library(phobos2-ldc${target_suffix} ${D_LIBRARY_TYPE} ${phobos2_o})
+         set_target_properties(
+             phobos2-ldc${target_suffix} PROPERTIES
+             OUTPUT_NAME                 phobos2-ldc${lib_suffix}
+@@ -679,7 +673,7 @@
+             compile_phobos2("${flags}" "-unittest${name_suffix}" "" phobos2_o phobos2_bc)
+ 
+             set(phobos2-casm phobos2-ldc-casm${name_suffix})
+-            add_library(${phobos2-casm} STATIC ${ZLIB_C})
++            add_library(${phobos2-casm} STATIC)
+             set_target_properties(
+                 ${phobos2-casm} PROPERTIES
+                 LINKER_LANGUAGE             C
diff --git a/debian/patches/02_ldc_include_path.diff b/debian/patches/03_ldc_include_path.diff
similarity index 100%
rename from debian/patches/02_ldc_include_path.diff
rename to debian/patches/03_ldc_include_path.diff
diff --git a/debian/patches/03_static-PIC.patch b/debian/patches/04_static-PIC.patch
similarity index 100%
rename from debian/patches/03_static-PIC.patch
rename to debian/patches/04_static-PIC.patch
diff --git a/debian/patches/04_pass-d-compiler-flags.patch b/debian/patches/05_pass-d-compiler-flags.patch
similarity index 100%
rename from debian/patches/04_pass-d-compiler-flags.patch
rename to debian/patches/05_pass-d-compiler-flags.patch
diff --git a/debian/patches/05_bootstrap-pic-default.patch b/debian/patches/06_bootstrap-pic-default.patch
similarity index 100%
rename from debian/patches/05_bootstrap-pic-default.patch
rename to debian/patches/06_bootstrap-pic-default.patch
diff --git a/debian/patches/series b/debian/patches/series
index c0a3f57..a56b08f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,6 @@
 01_no-zlib-embed.patch
-02_ldc_include_path.diff
-03_static-PIC.patch
-04_pass-d-compiler-flags.patch
-05_bootstrap-pic-default.patch
+02_bootstrap-no-zlib-embed.patch
+03_ldc_include_path.diff
+04_static-PIC.patch
+05_pass-d-compiler-flags.patch
+06_bootstrap-pic-default.patch

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