rpms
/
0ad
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

update rpath patch 

Signed-off-by: Igor Gnatenko <i.gnatenko.brain@gmail.com>
This commit is contained in:
Igor Gnatenko 2016-11-09 06:50:08 +01:00
parent e70d647a6b
commit 6f3eb4c38f
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
0ad-rpath.patch
View File

@ -1,11 +1,10 @@
diff -up build/premake/premake4.lua.orig build/premake/premake4.lua
--- build/premake/premake4.lua.orig 2015-03-14 13:29:39.458872061 -0300
+++ build/premake/premake4.lua 2015-03-14 13:30:04.556873022 -0300
@@ -365,27 +365,6 @@ function project_set_build_flags()
if _OPTIONS["libdir"] then
diff -uNr 0ad-0.0.21-alpha.orig/build/premake/premake4.lua 0ad-0.0.21-alpha/build/premake/premake4.lua
--- 0ad-0.0.21-alpha.orig/build/premake/premake4.lua 2016-09-18 10:54:27.000000000 +0200
+++ 0ad-0.0.21-alpha/build/premake/premake4.lua 2016-11-09 06:47:02.330099676 +0100
@@ -368,26 +368,6 @@
defines { "INSTALLED_LIBDIR=" .. _OPTIONS["libdir"] }
end
-
- if os.is("linux") or os.is("bsd") then
- -- To use our local shared libraries, they need to be found in the
- -- runtime dynamic linker path. Add their path to -rpath.
@ -19,7 +18,7 @@ diff -up build/premake/premake4.lua.orig build/premake/premake4.lua
-
- -- Adding the executable path and taking care of correct escaping
- if _ACTION == "gmake" then
- linkoptions { "-Wl,-rpath,'$$ORIGIN'" }
- linkoptions { "-Wl,-rpath,'$$ORIGIN'" }
- elseif _ACTION == "codeblocks" then
- linkoptions { "-Wl,-R\\\\$$$ORIGIN" }
- end