mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-08-05 12:38:09 -07:00
a71f049b47
Currrently premake hardcoded -L/usr/lib64 as LDFLAG on linux 64 bit platform, and -L/usr/lib for 32 bit. This should be removed. This also benefits running premake on Gentoo prefix. Test on Gentoo prefix: [==========] 2137 tests from 191 test suites ran. (1558 ms total) [ PASSED ] 2137 tests. Signed-off-by: YiyangWu <xgreenlandforwyy@gmail.com> Signed-off-by: Sam James <sam@gentoo.org>
114 lines
3.3 KiB
Diff
114 lines
3.3 KiB
Diff
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,
|
|
},
|