Skip to content

Commit 01ad09c

Browse files
authored
physfs: don't set CMAKE_SKIP_RPATH (NixOS#346169)
2 parents c0e7638 + e445971 commit 01ad09c

File tree

3 files changed

+33
-0
lines changed

3 files changed

+33
-0
lines changed

pkgs/development/libraries/physfs/default.nix

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,10 @@ let
1313
inherit sha256;
1414
};
1515

16+
patches = [
17+
./dont-set-cmake-skip-rpath-${version}.patch
18+
];
19+
1620
nativeBuildInputs = [ cmake doxygen ];
1721

1822
buildInputs = [ zlib ]
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
diff --git a/CMakeLists.txt b/CMakeLists.txt
2+
index b4ef61e..7b2f26c 100644
3+
--- a/CMakeLists.txt
4+
+++ b/CMakeLists.txt
5+
@@ -29,11 +29,6 @@ if(APPLE)
6+
set(PHYSFS_M_SRCS src/physfs_platform_apple.m)
7+
endif()
8+
9+
-if(CMAKE_COMPILER_IS_GNUCC)
10+
- # Don't use -rpath.
11+
- set(CMAKE_SKIP_RPATH ON CACHE BOOL "Skip RPATH" FORCE)
12+
-endif()
13+
-
14+
if(CMAKE_C_COMPILER_ID STREQUAL "SunPro")
15+
add_definitions(-erroff=E_EMPTY_TRANSLATION_UNIT)
16+
add_definitions(-xldscope=hidden)
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
diff --git a/CMakeLists.txt b/CMakeLists.txt
2+
index b3291cc..11e7ad1 100644
3+
--- a/CMakeLists.txt
4+
+++ b/CMakeLists.txt
5+
@@ -32,8 +32,6 @@ endif()
6+
7+
if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_C_COMPILER_ID MATCHES "Clang")
8+
add_compile_options(-Wall)
9+
- # Don't use -rpath.
10+
- set(CMAKE_SKIP_RPATH ON CACHE BOOL "Skip RPATH" FORCE)
11+
endif()
12+
13+
if(CMAKE_C_COMPILER_ID STREQUAL "SunPro")

0 commit comments

Comments
 (0)