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

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

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,
},

View File

@@ -4,9 +4,9 @@ Describe your software project with a full-featured scripting language and \
let Premake write the build scripts for you. With one file your project can \
support both IDE-addicted Windows coders and Linux command-line junkies!"
HOMEPAGE="http://industriousone.com/premake"
COPYRIGHT="2012 Industrious One, LLC"
LICENSE="BSD (2-clause)"
REVISION="2"
COPYRIGHT="2003-2013 Jason Perkins and individual contributors"
LICENSE="BSD (3-clause)"
REVISION="3"
SOURCE_URI="http://sourceforge.net/projects/premake/files/Premake/4.4/premake-4.4-beta5-src.zip"
CHECKSUM_SHA256="0fa1ed02c5229d931e87995123cdb11d44fcc8bd99bba8e8bb1bbc0aaa798161"
SOURCE_DIR="premake-4.4-beta5"
@@ -15,7 +15,7 @@ ARCHITECTURES="all !x86_gcc2"
SECONDARY_ARCHITECTURES="x86"
PROVIDES="
premake$secondaryArchSuffix = $portVersion
premake4$secondaryArchSuffix = $portVersion
cmd:premake4$secondaryArchSuffix = $portVersion
"
REQUIRES="

View File

@@ -3,12 +3,13 @@ DESCRIPTION="Describe your software project with a full-featured scripting \
language and let Premake write the build scripts for you. With one file your \
project can support both IDE-addicted Windows coders and Linux command-line junkies!"
HOMEPAGE="http://industriousone.com/premake"
COPYRIGHT="2012 Industrious One, LLC"
LICENSE="BSD (2-clause)"
COPYRIGHT="2003-2022 Jason Perkins and individual contributors"
LICENSE="BSD (3-clause)"
REVISION="1"
SOURCE_URI="https://github.com/premake/premake-core/releases/download/v${portVersion%%~alpha*}-${portVersion##*.*.*~}/premake-${portVersion%%~alpha*}-${portVersion##*.*.*~}-src.zip"
CHECKSUM_SHA256="880f56e7cb9f4945d1cb879f059189462c1b7bf62ef43ac7d25842dfb177dd53"
SOURCE_DIR="premake-${portVersion%%~alpha*}-${portVersion##*.*.*~}"
SOURCE_URI="https://github.com/premake/premake-core/releases/download/v${portVersion%%~beta*}-${portVersion##*.*.*~}/premake-${portVersion%%~beta*}-${portVersion##*.*.*~}-src.zip"
CHECKSUM_SHA256="4c1100f5170ae1c3bd1b4fd9458b3b02ae841aefbfc41514887b80996436dee2"
SOURCE_DIR="premake-${portVersion/\~/-}-src"
PATCHES="premake-5.0.0-remove-hardcoded-libpath.patch"
ARCHITECTURES="all !x86_gcc2"
SECONDARY_ARCHITECTURES="x86"
@@ -19,12 +20,15 @@ if [ "$targetArchitecture" = x86_gcc2 ]; then
fi
PROVIDES="
premake$secondaryArchSuffix = $portVersion
premake5$secondaryArchSuffix = $portVersion
cmd:premake5 = $portVersion
"
REQUIRES="
haiku$secondaryArchSuffix
"
REPLACES="
premake$secondaryArchSuffix
"
BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel
@@ -36,6 +40,12 @@ BUILD_PREREQUIRES="
cmd:make
"
PATCH()
{
sed -i '/-lm/d' build/gmake2.unix/Premake5.make
sed -i 's/-rdynamic//g' build/gmake2.unix/Premake5.make
}
BUILD()
{
make -f Bootstrap.mak haiku
@@ -47,3 +57,8 @@ INSTALL()
mkdir -p $commandBinDir
install -m 0755 premake5 $commandBinDir
}
TEST()
{
bin/release/premake5 test
}