commit: a71f049b4729191d5d0f796211a063ef575c3364 Author: YiyangWu <xgreenlandforwyy <AT> gmail <DOT> com> AuthorDate: Thu Jun 9 07:30:13 2022 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sun Mar 19 04:22:13 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a71f049b
dev-util/premake: bump version, remove hard-coded -L/usr/lib64 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 <AT> gmail.com> Signed-off-by: Sam James <sam <AT> gentoo.org> dev-util/premake/Manifest | 2 +- .../premake-5.0.0-remove-hardcoded-libpath.patch | 113 +++++++++++++++++++++ ...emake-5.0.0_alpha16-respect-MAKEOPTS-jobs.patch | 63 ------------ ...0_alpha16.ebuild => premake-5.0.0_beta2.ebuild} | 6 +- 4 files changed, 116 insertions(+), 68 deletions(-) diff --git a/dev-util/premake/Manifest b/dev-util/premake/Manifest index 7ed7cd054ada..afe7721bf87c 100644 --- a/dev-util/premake/Manifest +++ b/dev-util/premake/Manifest @@ -1,4 +1,4 @@ DIST premake-4.3-src.zip 514366 BLAKE2B 5079f9d7c5dbe46d60149ec7c01523eaca5ab3cccce9f2f66d05905152ceb0b8bddaf181624288b722dd1534da6aef256ed5bb997db448f1499c8ab989277bc6 SHA512 df3a4f1e04afb6ae9acf06c063b084a4bcc7c48a98eebeb242eafef40de4097c6a6fe549369d9538b93efea35244222b9d26c15824f126a67b8f80abaecdf001 DIST premake-4.4-beta5-src.zip 596883 BLAKE2B f4bf2b75946b6a442aced79f1f29b08e61bfa34c1e30c64aa59a6fed9c4c35aaca996fd0e8b728e839c24e74eae9f23ac3c99406361a061f0fa5dc04ce3ce9aa SHA512 47a2c26d3c45578cb2cbae96ec1b647298824d08584e2610aacd038e21069297a1f5b3366340cf781d29827555ff4d955651f70cdc2d36b99808fddf52e7a242 -DIST premake-5.0.0_alpha16.tar.gz 6462956 BLAKE2B 27c27eeef77986f6e8244ecd1a08e19d753dafcd0292d593ac758e04c2cb2307e05aaf325d2afc6ad8936ab2bbd97af6269841b9b7489b50dd4ce56e39120f05 SHA512 7ddb5ffe48484157336c7309fb611d34ff670fb20f92da309af3a4ae6f664a4b8abd2c0575036abbed1e346b155a03bf6fbac0587b47d5c97d9a22f08dd2deea +DIST premake-5.0.0_beta2.tar.gz 6491805 BLAKE2B 1e5245ded3c36b61afd9339351ae2250cebd488a3723c1844b98a8bcf257a3a33102483d5b830a264aff7371b40edcac7dca18dbaacb0dffeb6e43d69e5d6a4c SHA512 0385e2859ed8873f78e2e8e4a57112c9ec5ff5ef6c456caa7a96b9fc372f148cec9c745e19cac7daee6c55820e86e55224737aa172e2134c169303829c1080eb DIST premake-src-3.7.zip 427727 BLAKE2B 2f9cc7b045f75ceb52a8e71507cb5576f042a93be4f6c097e8bc1166e3bbb9e271a02f5fbd648f79e0d24867a09bba9ac72a268fdc47140219c5d6a36cda1a16 SHA512 351b26b9ee738e97b1828e7c26fe1538fb1509fbdc030da3d87fc28b1daa7966bc50ba8043062d35b37fa3929d909533b723241e1f98e438a039c6f9d61a46f4 diff --git a/dev-util/premake/files/premake-5.0.0-remove-hardcoded-libpath.patch b/dev-util/premake/files/premake-5.0.0-remove-hardcoded-libpath.patch new file mode 100644 index 000000000000..4c7a377ba6c7 --- /dev/null +++ b/dev-util/premake/files/premake-5.0.0-remove-hardcoded-libpath.patch @@ -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, + }, diff --git a/dev-util/premake/files/premake-5.0.0_alpha16-respect-MAKEOPTS-jobs.patch b/dev-util/premake/files/premake-5.0.0_alpha16-respect-MAKEOPTS-jobs.patch deleted file mode 100644 index 766d2aea71b4..000000000000 --- a/dev-util/premake/files/premake-5.0.0_alpha16-respect-MAKEOPTS-jobs.patch +++ /dev/null @@ -1,63 +0,0 @@ -https://bugs.gentoo.org/773505 - -From 89d8c74f0c9ba77aaa12799a9d2dc397eac4ece6 Mon Sep 17 00:00:00 2001 -From: Sam James <s...@gentoo.org> -Date: Sun, 15 Aug 2021 21:47:20 +0100 -Subject: [PATCH] Respect MAKEOPTS jobs - ---- - Bootstrap.mak | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - -diff --git a/Bootstrap.mak b/Bootstrap.mak -index 06e0f20..2d59068 100644 ---- a/Bootstrap.mak -+++ b/Bootstrap.mak -@@ -101,7 +101,7 @@ osx: osx-clean - $(CC) -o build/bootstrap/premake_bootstrap -DPREMAKE_NO_BUILTIN_SCRIPTS -DLUA_USE_MACOSX -I"$(LUA_DIR)" -I"$(LUASHIM_DIR)" -framework CoreServices -framework Foundation -framework Security -lreadline $(SRC) - ./build/bootstrap/premake_bootstrap embed - ./build/bootstrap/premake_bootstrap --to=build/bootstrap gmake2 -- $(MAKE) -C build/bootstrap -j`getconf _NPROCESSORS_ONLN` config=$(CONFIG) -+ $(MAKE) -C build/bootstrap config=$(CONFIG) - - linux-clean: nix-clean - -@@ -110,7 +110,7 @@ linux: linux-clean - $(CC) -o build/bootstrap/premake_bootstrap -DPREMAKE_NO_BUILTIN_SCRIPTS -DLUA_USE_POSIX -DLUA_USE_DLOPEN -I"$(LUA_DIR)" -I"$(LUASHIM_DIR)" $(SRC) -lm -ldl -lrt - ./build/bootstrap/premake_bootstrap embed - ./build/bootstrap/premake_bootstrap --to=build/bootstrap gmake2 -- $(MAKE) -C build/bootstrap -j`getconf _NPROCESSORS_ONLN` config=$(CONFIG) -+ $(MAKE) -C build/bootstrap config=$(CONFIG) - - bsd-clean: nix-clean - -@@ -119,7 +119,7 @@ bsd: bsd-clean - $(CC) -o build/bootstrap/premake_bootstrap -DPREMAKE_NO_BUILTIN_SCRIPTS -DLUA_USE_POSIX -DLUA_USE_DLOPEN -I"$(LUA_DIR)" -I"$(LUASHIM_DIR)" $(SRC) -lm - ./build/bootstrap/premake_bootstrap embed - ./build/bootstrap/premake_bootstrap --to=build/bootstrap gmake2 -- $(MAKE) -C build/bootstrap -j`getconf NPROCESSORS_ONLN` config=$(CONFIG) -+ $(MAKE) -C build/bootstrap config=$(CONFIG) - - solaris-clean: nix-clean - -@@ -128,7 +128,7 @@ solaris: solaris-clean - $(CC) -o build/bootstrap/premake_bootstrap -DPREMAKE_NO_BUILTIN_SCRIPTS -DLUA_USE_POSIX -DLUA_USE_DLOPEN -I"$(LUA_DIR)" -I"$(LUASHIM_DIR)" $(SRC) -lm - ./build/bootstrap/premake_bootstrap embed - ./build/bootstrap/premake_bootstrap --to=build/bootstrap gmake2 -- $(MAKE) -C build/bootstrap -j`getconf NPROCESSORS_ONLN` config=$(CONFIG) -+ $(MAKE) -C build/bootstrap config=$(CONFIG) - - haiku-clean: nix-clean - -@@ -137,7 +137,7 @@ haiku: haiku-clean - $(CC) -o build/bootstrap/premake_bootstrap -DPREMAKE_NO_BUILTIN_SCRIPTS -DLUA_USE_POSIX -DLUA_USE_DLOPEN -D_BSD_SOURCE -I"$(LUA_DIR)" -I"$(LUASHIM_DIR)" $(SRC) -lbsd - ./build/bootstrap/premake_bootstrap embed - ./build/bootstrap/premake_bootstrap --to=build/bootstrap gmake2 -- $(MAKE) -C build/bootstrap -j`getconf _NPROCESSORS_ONLN` config=$(CONFIG) -+ $(MAKE) -C build/bootstrap config=$(CONFIG) - - windows-base: windows-clean - if not exist build\bootstrap (mkdir build\bootstrap) --- -2.32.0 - diff --git a/dev-util/premake/premake-5.0.0_alpha16.ebuild b/dev-util/premake/premake-5.0.0_beta2.ebuild similarity index 83% rename from dev-util/premake/premake-5.0.0_alpha16.ebuild rename to dev-util/premake/premake-5.0.0_beta2.ebuild index eea76fb7ca0e..56b499a53419 100644 --- a/dev-util/premake/premake-5.0.0_alpha16.ebuild +++ b/dev-util/premake/premake-5.0.0_beta2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -16,9 +16,7 @@ LICENSE="BSD" SLOT="5" KEYWORDS="~amd64 ~arm64 ~ppc ~x86" -PATCHES=( - "${FILESDIR}"/${PN}-5.0.0_alpha16-respect-MAKEOPTS-jobs.patch -) +PATCHES=( "${FILESDIR}/${PN}-5.0.0-remove-hardcoded-libpath.patch" ) src_compile() { # bug #773505
