From d9fb83dcccebd8596483389bd769caff2a1e67a1 Mon Sep 17 00:00:00 2001 From: Tobiasz Laskowski Date: Sun, 28 Jul 2024 09:42:57 +0100 Subject: [PATCH] Try CMAKE_SKIP_INSTALL_RPATH to avoid rpath issue --- debian/patches/rpath.patch | 27 --------------------------- debian/patches/series | 1 - debian/rules | 1 + 3 files changed, 1 insertion(+), 28 deletions(-) delete mode 100644 debian/patches/rpath.patch delete mode 100644 debian/patches/series diff --git a/debian/patches/rpath.patch b/debian/patches/rpath.patch deleted file mode 100644 index e48f988..0000000 --- a/debian/patches/rpath.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 9638b62fd42fcfd4c21499b6531dccf7d35f82ae Mon Sep 17 00:00:00 2001 -From: Andy Li -Date: Sat, 27 Jul 2024 22:28:43 +0100 -Subject: [PATCH] append CMAKE_INSTALL_FULL_LIBDIR to CMAKE_INSTALL_RPATH only - on macOS -Applied-Upstream: https://github.com/HaxeFoundation/neko/commit/9638b62fd42fcfd4c21499b6531dccf7d35f82ae - ---- - CMakeLists.txt | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 52f4d5fd..918db6cd 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -169,7 +169,10 @@ if (RELOCATABLE) - endif() - endif() - --list(APPEND CMAKE_INSTALL_RPATH ${CMAKE_INSTALL_FULL_LIBDIR}) -+# https://github.com/HaxeFoundation/neko/pull/288#issuecomment-2102504348 -+if(APPLE) -+ list(APPEND CMAKE_INSTALL_RPATH ${CMAKE_INSTALL_FULL_LIBDIR}) -+endif() - - if(UNIX AND NOT APPLE) - add_definitions(-DABI_ELF) diff --git a/debian/patches/series b/debian/patches/series deleted file mode 100644 index da8b790..0000000 --- a/debian/patches/series +++ /dev/null @@ -1 +0,0 @@ -rpath.patch diff --git a/debian/rules b/debian/rules index b91de9c..cd8d6bb 100755 --- a/debian/rules +++ b/debian/rules @@ -22,6 +22,7 @@ override_dh_auto_configure: -DCMAKE_INSTALL_INCLUDEDIR=include/$(DEB_HOST_MULTIARCH) \ -DCMAKE_INSTALL_LIBDIR=lib/$(DEB_HOST_MULTIARCH) \ -DRELOCATABLE=OFF \ + -DCMAKE_SKIP_INSTALL_RPATH=ON \ -DRUN_LDCONFIG=OFF echo "LoadModule neko_module /usr/lib/$(DEB_HOST_MULTIARCH)/neko/mod_neko2.ndll" > debian/neko.load