diff --git a/0ad-rpath.patch b/0ad-rpath.patch index 45596ca..a27f3c0 100644 --- a/0ad-rpath.patch +++ b/0ad-rpath.patch @@ -1,7 +1,7 @@ -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 @@ +diff -uNr 0ad-0.0.23-alpha.orig/build/premake/premake4.lua 0ad-0.0.23-alpha/build/premake/premake4.lua +--- 0ad-0.0.23-alpha.orig/build/premake/premake4.lua 2018-04-29 17:44:48.000000000 +0200 ++++ 0ad-0.0.23-alpha/build/premake/premake4.lua 2018-05-22 13:23:25.238894337 +0200 +@@ -356,26 +356,6 @@ defines { "INSTALLED_LIBDIR=" .. _OPTIONS["libdir"] } end @@ -28,3 +28,33 @@ diff -uNr 0ad-0.0.21-alpha.orig/build/premake/premake4.lua 0ad-0.0.21-alpha/buil end end +diff -uNr 0ad-0.0.23-alpha.orig/build/premake/premake5.lua 0ad-0.0.23-alpha/build/premake/premake5.lua +--- 0ad-0.0.23-alpha.orig/build/premake/premake5.lua 2018-04-22 20:14:45.000000000 +0200 ++++ 0ad-0.0.23-alpha/build/premake/premake5.lua 2018-05-22 13:23:29.022903711 +0200 +@@ -344,26 +344,6 @@ + defines { "INSTALLED_LIBDIR=" .. _OPTIONS["libdir"] } + end + +- if os.istarget("linux") or os.istarget("bsd") then +- -- To use our local shared libraries, they need to be found in the +- -- runtime dynamic linker path. Add their path to -rpath. +- if _OPTIONS["libdir"] then +- linkoptions {"-Wl,-rpath," .. _OPTIONS["libdir"] } +- else +- -- On FreeBSD we need to allow use of $ORIGIN +- if os.istarget("bsd") then +- linkoptions { "-Wl,-z,origin" } +- end +- +- -- Adding the executable path and taking care of correct escaping +- if _ACTION == "gmake" then +- linkoptions { "-Wl,-rpath,'$$ORIGIN'" } +- elseif _ACTION == "codeblocks" then +- linkoptions { "-Wl,-R\\\\$$$ORIGIN" } +- end +- end +- end +- + end + end + diff --git a/0ad-valgrind.patch b/0ad-valgrind.patch index 9c48d8d..76a1bd8 100644 --- a/0ad-valgrind.patch +++ b/0ad-valgrind.patch @@ -1,12 +1,24 @@ +diff -uNr 0ad-0.0.23-alpha.orig/build/premake/extern_libs4.lua 0ad-0.0.23-alpha/build/premake/extern_libs4.lua +--- 0ad-0.0.23-alpha.orig/build/premake/extern_libs4.lua 2018-04-08 23:41:31.000000000 +0200 ++++ 0ad-0.0.23-alpha/build/premake/extern_libs4.lua 2018-05-22 13:24:21.468033629 +0200 +@@ -655,7 +655,7 @@ + }, + valgrind = { + compile_settings = function() +- add_source_include_paths("valgrind") ++ pkgconfig_cflags("valgrind") + end, + }, + vorbis = { diff -uNr 0ad-0.0.23-alpha.orig/build/premake/extern_libs5.lua 0ad-0.0.23-alpha/build/premake/extern_libs5.lua --- 0ad-0.0.23-alpha.orig/build/premake/extern_libs5.lua 2018-04-29 17:44:48.000000000 +0200 -+++ 0ad-0.0.23-alpha/build/premake/extern_libs5.lua 2018-05-21 14:06:35.981320529 +0200 ++++ 0ad-0.0.23-alpha/build/premake/extern_libs5.lua 2018-05-22 13:24:21.468033629 +0200 @@ -620,7 +620,7 @@ }, valgrind = { compile_settings = function() - add_source_include_paths("valgrind") -+ pkgconfig.cflags("valgrind") ++ pkgconfig.add_includes("valgrind") end, }, vorbis = {