From e445971f487b50f9ed3f4bd77df8b77c64405990 Mon Sep 17 00:00:00 2001 From: Nadia Holmquist Pedersen Date: Thu, 3 Oct 2024 14:29:08 +0200 Subject: [PATCH] physfs: don't set CMAKE_SKIP_RPATH --- pkgs/development/libraries/physfs/default.nix | 4 ++++ .../physfs/dont-set-cmake-skip-rpath-2.1.1.patch | 16 ++++++++++++++++ .../physfs/dont-set-cmake-skip-rpath-3.2.0.patch | 13 +++++++++++++ 3 files changed, 33 insertions(+) create mode 100644 pkgs/development/libraries/physfs/dont-set-cmake-skip-rpath-2.1.1.patch create mode 100644 pkgs/development/libraries/physfs/dont-set-cmake-skip-rpath-3.2.0.patch diff --git a/pkgs/development/libraries/physfs/default.nix b/pkgs/development/libraries/physfs/default.nix index e00be9c841f9..efe5b4bc6a27 100644 --- a/pkgs/development/libraries/physfs/default.nix +++ b/pkgs/development/libraries/physfs/default.nix @@ -13,6 +13,10 @@ let inherit sha256; }; + patches = [ + ./dont-set-cmake-skip-rpath-${version}.patch + ]; + nativeBuildInputs = [ cmake doxygen ]; buildInputs = [ zlib ] diff --git a/pkgs/development/libraries/physfs/dont-set-cmake-skip-rpath-2.1.1.patch b/pkgs/development/libraries/physfs/dont-set-cmake-skip-rpath-2.1.1.patch new file mode 100644 index 000000000000..fbd048499cf3 --- /dev/null +++ b/pkgs/development/libraries/physfs/dont-set-cmake-skip-rpath-2.1.1.patch @@ -0,0 +1,16 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index b4ef61e..7b2f26c 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -29,11 +29,6 @@ if(APPLE) + set(PHYSFS_M_SRCS src/physfs_platform_apple.m) + endif() + +-if(CMAKE_COMPILER_IS_GNUCC) +- # Don't use -rpath. +- set(CMAKE_SKIP_RPATH ON CACHE BOOL "Skip RPATH" FORCE) +-endif() +- + if(CMAKE_C_COMPILER_ID STREQUAL "SunPro") + add_definitions(-erroff=E_EMPTY_TRANSLATION_UNIT) + add_definitions(-xldscope=hidden) diff --git a/pkgs/development/libraries/physfs/dont-set-cmake-skip-rpath-3.2.0.patch b/pkgs/development/libraries/physfs/dont-set-cmake-skip-rpath-3.2.0.patch new file mode 100644 index 000000000000..3811d1bd2e9d --- /dev/null +++ b/pkgs/development/libraries/physfs/dont-set-cmake-skip-rpath-3.2.0.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index b3291cc..11e7ad1 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -32,8 +32,6 @@ endif() + + if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_C_COMPILER_ID MATCHES "Clang") + add_compile_options(-Wall) +- # Don't use -rpath. +- set(CMAKE_SKIP_RPATH ON CACHE BOOL "Skip RPATH" FORCE) + endif() + + if(CMAKE_C_COMPILER_ID STREQUAL "SunPro")