commit: bd671b6a38c006f4ecf98fe84d0d5ac7321464de Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Sun Aug 15 20:56:14 2021 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sun Aug 15 20:56:58 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd671b6a
dev-util/premake: respect CC, MAKEOPTS Closes: https://bugs.gentoo.org/773505 Signed-off-by: Sam James <sam <AT> gentoo.org> ...emake-5.0.0_alpha16-respect-MAKEOPTS-jobs.patch | 63 ++++++++++++++++++++++ dev-util/premake/premake-5.0.0_alpha16.ebuild | 10 +++- 2 files changed, 71 insertions(+), 2 deletions(-) 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 new file mode 100644 index 00000000000..766d2aea71b --- /dev/null +++ b/dev-util/premake/files/premake-5.0.0_alpha16-respect-MAKEOPTS-jobs.patch @@ -0,0 +1,63 @@ +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_alpha16.ebuild index 810df764722..5d2e996ad5e 100644 --- a/dev-util/premake/premake-5.0.0_alpha16.ebuild +++ b/dev-util/premake/premake-5.0.0_alpha16.ebuild @@ -3,21 +3,27 @@ EAPI=8 +inherit toolchain-funcs + MY_PV=${PV/_/-} DESCRIPTION="A makefile generation tool" HOMEPAGE="https://premake.github.io"; SRC_URI="https://github.com/premake/premake-core/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz" - S="${WORKDIR}/${PN}-core-${MY_PV}" LICENSE="BSD" SLOT="5" KEYWORDS="~amd64 ~ppc ~x86" -BDEPEND="" +PATCHES=( + "${FILESDIR}"/${PN}-5.0.0_alpha16-respect-MAKEOPTS-jobs.patch +) src_compile() { + # bug #773505 + tc-export CC + emake -f Bootstrap.mak linux }
