[pkg-d-commits] [ldc] 03/06: Drop phobos-ldc-enable-shlibs.diff: Applied upstream
Matthias Klumpp
mak at moszumanska.debian.org
Tue Jun 20 22:48:52 UTC 2017
This is an automated email from the git hooks/post-receive script.
mak pushed a commit to branch master
in repository ldc.
commit beb9483e222a8215432ba4292e327c946efe9608
Author: Matthias Klumpp <mak at debian.org>
Date: Tue Jun 20 22:41:52 2017 +0200
Drop phobos-ldc-enable-shlibs.diff: Applied upstream
---
debian/patches/01_no-zlib-embed.patch | 17 +++++++++++
debian/patches/01_phobos-ldc-enable-shlibs.diff | 38 -------------------------
debian/patches/03_static-PIC.patch | 2 +-
debian/patches/04_pass-d-compiler-flags.patch | 4 +--
debian/patches/series | 2 +-
5 files changed, 21 insertions(+), 42 deletions(-)
diff --git a/debian/patches/01_no-zlib-embed.patch b/debian/patches/01_no-zlib-embed.patch
new file mode 100644
index 0000000..c909112
--- /dev/null
+++ b/debian/patches/01_no-zlib-embed.patch
@@ -0,0 +1,17 @@
+Description: Remove embedded zlib
+Author: Konstantinos Margaritis <markos at debian.org>
+
+--- a/runtime/CMakeLists.txt
++++ b/runtime/CMakeLists.txt
+@@ -397,9 +397,9 @@
+
+ if(BUILD_SHARED_LIBS)
+ 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/01_phobos-ldc-enable-shlibs.diff b/debian/patches/01_phobos-ldc-enable-shlibs.diff
deleted file mode 100644
index 6db7e81..0000000
--- a/debian/patches/01_phobos-ldc-enable-shlibs.diff
+++ /dev/null
@@ -1,38 +0,0 @@
-Description: Enable configurable shared libs building, remove embedded zlib
-Author: Konstantinos Margaritis <markos at debian.org>
-
---- a/runtime/CMakeLists.txt
-+++ b/runtime/CMakeLists.txt
-@@ -10,8 +10,8 @@
-
- set(MULTILIB OFF CACHE BOOL "Build both 32/64 bit runtime libraries")
- 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(INCLUDE_INSTALL_DIR ${INCLUDE_INSTALL_DIR} CACHE PATH "Path to install D modules to")
-+set(BUILD_SHARED_LIBS ${BUILD_SHARED_LIBS} CACHE BOOL "Whether to build the runtime as a shared library")
- set(D_FLAGS -w 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 ;")
-@@ -420,7 +420,7 @@
- if(${CMAKE_SYSTEM} MATCHES "FreeBSD")
- set(dso_system_libs "m" "pthread")
- else()
-- set(dso_system_libs "m" "pthread" "rt" "dl")
-+ set(dso_system_libs "z" "m" "pthread" "rt" "dl")
- endif()
- target_link_libraries(druntime-ldc${target_suffix} ${dso_system_libs})
- endif()
-@@ -432,7 +432,11 @@
- 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})
-+ if(NOT BUILD_SHARED_LIBS)
-+ add_library(phobos2-ldc${target_suffix} ${D_LIBRARY_TYPE} ${ZLIB_C} ${phobos2_o})
-+ else()
-+ add_library(phobos2-ldc${target_suffix} ${D_LIBRARY_TYPE} ${phobos2_o})
-+ endif()
- set_target_properties(
- phobos2-ldc${target_suffix} PROPERTIES
- OUTPUT_NAME phobos2-ldc${lib_suffix}
diff --git a/debian/patches/03_static-PIC.patch b/debian/patches/03_static-PIC.patch
index fd544e6..6e9a4ea 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
-@@ -117,7 +117,7 @@
+@@ -118,7 +118,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 bbd36c1..06bd300 100644
--- a/debian/patches/04_pass-d-compiler-flags.patch
+++ b/debian/patches/04_pass-d-compiler-flags.patch
@@ -11,8 +11,8 @@ Subject: pass D_COMPILER_FLAGS
+++ 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 ${INCLUDE_INSTALL_DIR} CACHE PATH "Path to install D modules to")
- set(BUILD_SHARED_LIBS ${BUILD_SHARED_LIBS} CACHE BOOL "Whether to build the runtime as a shared library")
+ 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(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 ;")
diff --git a/debian/patches/series b/debian/patches/series
index cad82c0..c0a3f57 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,4 @@
-01_phobos-ldc-enable-shlibs.diff
+01_no-zlib-embed.patch
02_ldc_include_path.diff
03_static-PIC.patch
04_pass-d-compiler-flags.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-d/ldc.git
More information about the pkg-d-commits
mailing list