Drop static-PIC.patch: Seems to be no longer needed
This patch also triggers a cmake config issue which causes the build to
fail, annoyingly.
Matthias Klumpp
3 years ago
|
0 |
Description: Don't set a default rpath in global LDC configuration.
|
|
1 |
Author: Matthias Klumpp <mak@debian.org>
|
|
2 |
|
|
3 |
--- a/runtime/CMakeLists.txt
|
|
4 |
+++ b/runtime/CMakeLists.txt
|
|
5 |
@@ -247,7 +247,7 @@
|
|
6 |
# Default -rpath linker option when linking against shared libraries.
|
|
7 |
if(SHARED_LIBS_SUPPORTED)
|
|
8 |
set(SHARED_LIBS_RPATH "${CMAKE_BINARY_DIR}/lib${LIB_SUFFIX}")
|
|
9 |
- set(SHARED_LIBS_INSTALL_RPATH "${CMAKE_INSTALL_LIBDIR}")
|
|
10 |
+ set(SHARED_LIBS_INSTALL_RPATH "")
|
|
11 |
endif()
|
|
12 |
|
|
13 |
# Only have either shared or static libs?
|
debian/patches/03_static-PIC.patch
less
more
| 0 | |
Description: pass fPIC to the static build
|
| 1 | |
Author: Gianfranco Costamagna <locutusofborg@debian.org>
|
| 2 | |
|
| 3 | |
--- a/CMakeLists.txt
|
| 4 | |
+++ b/CMakeLists.txt
|
| 5 | |
@@ -157,7 +157,7 @@
|
| 6 | |
set(LDMD_EXE_NAME ${PROGRAM_PREFIX}${LDMD_EXE}${PROGRAM_SUFFIX})
|
| 7 | |
|
| 8 | |
# Setup D compiler flags (DMD syntax, which also works with LDMD).
|
| 9 | |
-set(DFLAGS_BASE "-wi")
|
| 10 | |
+set(DFLAGS_BASE "-wi" "-fPIC")
|
| 11 | |
set(DFLAGS_BUILD_TYPE "") # DFLAGS derived from CMAKE_BUILD_TYPE
|
| 12 | |
if(NOT MSVC_IDE)
|
| 13 | |
# for multi-config builds, these options have to be added later to the custom command
|
debian/patches/04_ldc-no-default-rpath.patch
less
more
| 0 | |
Description: Don't set a default rpath in global LDC configuration.
|
| 1 | |
Author: Matthias Klumpp <mak@debian.org>
|
| 2 | |
|
| 3 | |
--- a/runtime/CMakeLists.txt
|
| 4 | |
+++ b/runtime/CMakeLists.txt
|
| 5 | |
@@ -247,7 +247,7 @@
|
| 6 | |
# Default -rpath linker option when linking against shared libraries.
|
| 7 | |
if(SHARED_LIBS_SUPPORTED)
|
| 8 | |
set(SHARED_LIBS_RPATH "${CMAKE_BINARY_DIR}/lib${LIB_SUFFIX}")
|
| 9 | |
- set(SHARED_LIBS_INSTALL_RPATH "${CMAKE_INSTALL_LIBDIR}")
|
| 10 | |
+ set(SHARED_LIBS_INSTALL_RPATH "")
|
| 11 | |
endif()
|
| 12 | |
|
| 13 | |
# Only have either shared or static libs?
|
| 0 | 0 |
01_no-zlib-embed.patch
|
| 1 | 1 |
02_ldc_include_path.diff
|
| 2 | |
03_static-PIC.patch
|
| 3 | |
04_ldc-no-default-rpath.patch
|
|
2 |
03_ldc-no-default-rpath.patch
|