haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-23 04:00:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

premake, bump version 5, rename both so both can be installed (#9313)

Browse Source
This commit is contained in:
Schrijvers Luc
2023-08-31 13:44:55 +00:00
committed by GitHub
parent 1f3241716a
commit 7c848d7c70
3 changed files with 138 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

113
dev-util/premake/patches/premake-5.0.0-remove-hardcoded-libpath.patch Normal file
View File

@@ -0,0 +1,113 @@
Remove the hardcoded -L/usr/lib and -L/usr/lib64
This is not needed, and will cause issues:
https://github.com/gentoo/gentoo/pull/25825#issuecomment-1179497476
Index: premake-core-5.0.0-beta2/modules/d/tools/dmd.lua
===================================================================
--- premake-core-5.0.0-beta2.orig/modules/d/tools/dmd.lua
+++ premake-core-5.0.0-beta2/modules/d/tools/dmd.lua
@@ -52,8 +52,8 @@
tdmd.gcc.libraryDirectories = {
architecture = {
- x86 = "-L-L/usr/lib",
- x86_64 = "-L-L/usr/lib64",
+ x86 = "",
+ x86_64 = "",
}
}
Index: premake-core-5.0.0-beta2/modules/d/tools/gdc.lua
===================================================================
--- premake-core-5.0.0-beta2.orig/modules/d/tools/gdc.lua
+++ premake-core-5.0.0-beta2/modules/d/tools/gdc.lua
@@ -228,8 +228,8 @@
gdc.libraryDirectories = {
architecture = {
- x86 = "-L/usr/lib",
- x86_64 = "-L/usr/lib64",
+ x86 = "",
+ x86_64 = "",
}
}
Index: premake-core-5.0.0-beta2/modules/d/tools/ldc.lua
===================================================================
--- premake-core-5.0.0-beta2.orig/modules/d/tools/ldc.lua
+++ premake-core-5.0.0-beta2/modules/d/tools/ldc.lua
@@ -323,8 +323,8 @@
ldc.libraryDirectories = {
architecture = {
- x86 = "-L=-L/usr/lib",
- x86_64 = "-L=-L/usr/lib64",
+ x86 = "",
+ x86_64 = "",
}
}
Index: premake-core-5.0.0-beta2/modules/gmake/tests/cpp/test_ldflags.lua
===================================================================
--- premake-core-5.0.0-beta2.orig/modules/gmake/tests/cpp/test_ldflags.lua
+++ premake-core-5.0.0-beta2/modules/gmake/tests/cpp/test_ldflags.lua
@@ -55,7 +55,7 @@
system (p.LINUX)
prepare()
test.capture [[
- ALL_LDFLAGS += $(LDFLAGS) -L/usr/lib64 -m64
+ ALL_LDFLAGS += $(LDFLAGS) -m64
]]
end
@@ -64,7 +64,7 @@
system (p.LINUX)
prepare()
test.capture [[
- ALL_LDFLAGS += $(LDFLAGS) -L/usr/lib32 -m32
+ ALL_LDFLAGS += $(LDFLAGS) -m32
]]
end
Index: premake-core-5.0.0-beta2/modules/gmake2/tests/test_gmake2_ldflags.lua
===================================================================
--- premake-core-5.0.0-beta2.orig/modules/gmake2/tests/test_gmake2_ldflags.lua
+++ premake-core-5.0.0-beta2/modules/gmake2/tests/test_gmake2_ldflags.lua
@@ -56,7 +56,7 @@ ALL_LDFLAGS += $(LDFLAGS) -L../libs -Lli
system (p.LINUX)
prepare()
test.capture [[
-ALL_LDFLAGS += $(LDFLAGS) -L/usr/lib64 -m64
+ALL_LDFLAGS += $(LDFLAGS) -m64
]]
end
@@ -65,7 +65,7 @@ ALL_LDFLAGS += $(LDFLAGS) -L/usr/lib64 -
system (p.LINUX)
prepare()
test.capture [[
-ALL_LDFLAGS += $(LDFLAGS) -L/usr/lib32 -m32
+ALL_LDFLAGS += $(LDFLAGS) -m32
]]
end
Index: premake-core-5.0.0-beta2/src/tools/gcc.lua
===================================================================
--- premake-core-5.0.0-beta2.orig/src/tools/gcc.lua
+++ premake-core-5.0.0-beta2/src/tools/gcc.lua
@@ -477,16 +477,10 @@
architecture = {
x86 = function (cfg)
local r = {}
- if not table.contains(os.getSystemTags(cfg.system), "darwin") then
- table.insert (r, "-L/usr/lib32")
- end
return r
end,
x86_64 = function (cfg)
local r = {}
- if not table.contains(os.getSystemTags(cfg.system), "darwin") then
- table.insert (r, "-L/usr/lib64")
- end
return r
end,
},