[pkg-d-commits] [ldc] 08/12: refresh patches

[Konstantinos Margaritis]

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

markos pushed a commit to branch master
in repository ldc.

commit 447e14ddbbb22b45cefba476994c8dfbd27e43d2
Author: Konstantinos Margaritis <markos at freevec.org>
Date:   Thu Aug 17 20:37:20 2017 +0300

    refresh patches
---
 debian/patches/01_no-zlib-embed.patch         | 6 +++---
 debian/patches/02_ldc_include_path.diff       | 6 +++---
 debian/patches/03_static-PIC.patch            | 2 +-
 debian/patches/04_pass-d-compiler-flags.patch | 4 ++--
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/debian/patches/01_no-zlib-embed.patch b/debian/patches/01_no-zlib-embed.patch
index 2ff8593..7499154 100644
--- a/debian/patches/01_no-zlib-embed.patch
+++ b/debian/patches/01_no-zlib-embed.patch
@@ -3,7 +3,7 @@ Author: Konstantinos Margaritis <markos at debian.org>
 
 --- a/runtime/CMakeLists.txt
 +++ b/runtime/CMakeLists.txt
-@@ -160,6 +160,13 @@
+@@ -174,6 +174,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)
  
@@ -17,9 +17,9 @@ Author: Konstantinos Margaritis <markos at debian.org>
      set(CONFIG_NAME ${LDC_EXE}_phobos)
  else()
      set(CONFIG_NAME ${LDC_EXE})
-@@ -397,9 +404,9 @@
+@@ -405,9 +412,9 @@
  
-     if(BUILD_SHARED_LIBS)
+     if("${is_shared}" STREQUAL "ON")
          if(${CMAKE_SYSTEM} MATCHES "Linux")
 -            set(dso_system_libs "m" "pthread" "rt" "dl")
 +            set(dso_system_libs "m" "pthread" "rt" "dl" "z")
diff --git a/debian/patches/02_ldc_include_path.diff b/debian/patches/02_ldc_include_path.diff
index bd399a5..f60cf17 100644
--- a/debian/patches/02_ldc_include_path.diff
+++ b/debian/patches/02_ldc_include_path.diff
@@ -9,9 +9,9 @@ Bug-Debian: https://bugs.debian.org/827211
 
 --- a/ldc2_install.conf.in
 +++ b/ldc2_install.conf.in
-@@ -7,6 +7,7 @@
-     // 'switches' holds array of string that are appends to the command line
-     // arguments before they are parsed.
+@@ -6,6 +6,7 @@
+ {
+     // default switches injected before all explicit command-line switches
      switches = [
 +        "-I/usr/include/d",
          "-I at INCLUDE_INSTALL_DIR@/ldc",
diff --git a/debian/patches/03_static-PIC.patch b/debian/patches/03_static-PIC.patch
index 6e9a4ea..14444fb 100644
--- a/debian/patches/03_static-PIC.patch
+++ b/debian/patches/03_static-PIC.patch
@@ -3,7 +3,7 @@ Author: Gianfranco Costamagna <locutusofborg at debian.org>
 
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -118,7 +118,7 @@
+@@ -115,7 +115,7 @@
  endif()
  
  # Setup D compiler flags (DMD syntax, which also works with LDMD).
diff --git a/debian/patches/04_pass-d-compiler-flags.patch b/debian/patches/04_pass-d-compiler-flags.patch
index 06bd300..964258f 100644
--- a/debian/patches/04_pass-d-compiler-flags.patch
+++ b/debian/patches/04_pass-d-compiler-flags.patch
@@ -12,9 +12,9 @@ Subject: pass D_COMPILER_FLAGS
 @@ -12,7 +12,7 @@
  set(BUILD_BC_LIBS         OFF                                       CACHE BOOL    "Build the runtime as LLVM bitcode libraries")
  set(INCLUDE_INSTALL_DIR   ${CMAKE_INSTALL_PREFIX}/include/d         CACHE PATH    "Path to install D modules to")
- set(BUILD_SHARED_LIBS     OFF                                       CACHE BOOL    "Whether to build the runtime as a shared library")
+ set(BUILD_SHARED_LIBS     AUTO                                      CACHE STRING  "Whether to build the runtime as a shared library (ON|OFF|BOTH)")
 -set(D_FLAGS               -w                                        CACHE STRING  "Runtime build flags, separated by ;")
 +set(D_FLAGS               ${D_COMPILER_FLAGS}                       CACHE STRING  "Runtime build flags, separated by ;")
  set(D_FLAGS_DEBUG         -g;-link-debuglib                         CACHE STRING  "Runtime build flags (debug libraries), separated by ;")
  set(D_FLAGS_RELEASE       -O3;-release                              CACHE STRING  "Runtime build flags (release libraries), separated by ;")
- if(MSVC)
+ 

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