[pkg-d-commits] [ldc] 03/07: Update patches

[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 608b4669f0f7fe02a370ecba17ef74890b61d7aa
Author: Matthias Klumpp <mak at debian.org>
Date:   Fri Sep 15 00:33:34 2017 +0200

    Update patches
---
 debian/patches/01_no-zlib-embed.patch         | 34 +++++++++++++--------------
 debian/patches/03_ldc_include_path.diff       |  2 +-
 debian/patches/04_static-PIC.patch            |  4 ++--
 debian/patches/05_pass-d-compiler-flags.patch | 18 +++++++-------
 4 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/debian/patches/01_no-zlib-embed.patch b/debian/patches/01_no-zlib-embed.patch
index 7499154..f0a87e2 100644
--- a/debian/patches/01_no-zlib-embed.patch
+++ b/debian/patches/01_no-zlib-embed.patch
@@ -3,29 +3,29 @@ Author: Konstantinos Margaritis <markos at debian.org>
 
 --- a/runtime/CMakeLists.txt
 +++ b/runtime/CMakeLists.txt
-@@ -174,6 +174,13 @@
+@@ -125,9 +125,9 @@
+     if("${TARGET_SYSTEM}" MATCHES "Android")
+         set(C_SYSTEM_LIBS m c)
+     elseif("${TARGET_SYSTEM}" MATCHES "Linux")
+-        set(C_SYSTEM_LIBS m pthread rt dl)
++        set(C_SYSTEM_LIBS m pthread rt dl z)
+     else()
+-        set(C_SYSTEM_LIBS m pthread)
++        set(C_SYSTEM_LIBS m pthread z)
+     endif()
+ endif()
+ 
+@@ -249,6 +249,13 @@
+     file(GLOB_RECURSE PHOBOS2_C ${PHOBOS2_DIR}/*.c)
      # 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})
-@@ -405,9 +412,9 @@
+ endif()
  
-     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")
-         else()
--            set(dso_system_libs "m" "pthread")
-+            set(dso_system_libs "m" "pthread" "z")
-         endif()
-         target_link_libraries(druntime-ldc${target_suffix} ${dso_system_libs})
-     endif()
+ #
diff --git a/debian/patches/03_ldc_include_path.diff b/debian/patches/03_ldc_include_path.diff
index f60cf17..15be762 100644
--- a/debian/patches/03_ldc_include_path.diff
+++ b/debian/patches/03_ldc_include_path.diff
@@ -16,4 +16,4 @@ Bug-Debian: https://bugs.debian.org/827211
 +        "-I/usr/include/d",
          "-I at INCLUDE_INSTALL_DIR@/ldc",
          "-I at INCLUDE_INSTALL_DIR@",
-         "-L-L at CMAKE_INSTALL_LIBDIR@", @MULTILIB_ADDITIONAL_INSTALL_PATH@
+         "-defaultlib=phobos2-ldc,druntime-ldc",
diff --git a/debian/patches/04_static-PIC.patch b/debian/patches/04_static-PIC.patch
index 14444fb..26f1edb 100644
--- a/debian/patches/04_static-PIC.patch
+++ b/debian/patches/04_static-PIC.patch
@@ -3,8 +3,8 @@ Author: Gianfranco Costamagna <locutusofborg at debian.org>
 
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -115,7 +115,7 @@
- endif()
+@@ -109,7 +109,7 @@
+ )
  
  # Setup D compiler flags (DMD syntax, which also works with LDMD).
 -set(DDMD_DFLAGS "-wi")
diff --git a/debian/patches/05_pass-d-compiler-flags.patch b/debian/patches/05_pass-d-compiler-flags.patch
index 964258f..4419177 100644
--- a/debian/patches/05_pass-d-compiler-flags.patch
+++ b/debian/patches/05_pass-d-compiler-flags.patch
@@ -9,12 +9,12 @@ Subject: pass D_COMPILER_FLAGS
 
 --- a/runtime/CMakeLists.txt
 +++ b/runtime/CMakeLists.txt
-@@ -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     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 ;")
- 
+@@ -37,7 +37,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     AUTO                                CACHE STRING "Whether to build the runtime as a shared library (ON|OFF|BOTH)")
+-set(D_FLAGS               -w                                  CACHE STRING "Runtime D compiler flags, separated by ';'")
++set(D_FLAGS               ${D_COMPILER_FLAGS}                 CACHE STRING "Runtime D compiler flags, separated by ';'")
+ set(D_FLAGS_DEBUG         -g;-link-debuglib                   CACHE STRING "Runtime D compiler flags (debug libraries), separated by ';'")
+ set(D_FLAGS_RELEASE       -O3;-release                        CACHE STRING "Runtime D compiler flags (release libraries), separated by ';'")
+ set(COMPILE_ALL_D_FILES_AT_ONCE ON                            CACHE BOOL   "Compile all D files for a lib in a single command line instead of separately")

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