commit: 5c63bc104e206423f7794c35a87a3c2a0674d848 Author: Alexey Sokolov <alexey+gentoo <AT> asokolov <DOT> org> AuthorDate: Sun Jun 22 08:26:57 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Fri Jul 4 20:01:50 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5c63bc10
dev-build/icmake: make AR, RANLIB overrideable, fix on prefix Signed-off-by: Alexey Sokolov <alexey+gentoo <AT> asokolov.org> Part-of: https://github.com/gentoo/gentoo/pull/42687 Signed-off-by: Sam James <sam <AT> gentoo.org> dev-build/icmake/files/icmake-9.03.01-ar.patch | 17 +++++++++++++++++ .../{icmake-9.03.01.ebuild => icmake-9.03.01-r1.ebuild} | 7 ++++--- 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/dev-build/icmake/files/icmake-9.03.01-ar.patch b/dev-build/icmake/files/icmake-9.03.01-ar.patch new file mode 100644 index 000000000000..944cca939746 --- /dev/null +++ b/dev-build/icmake/files/icmake-9.03.01-ar.patch @@ -0,0 +1,17 @@ +https://gitlab.com/fbb-git/icmake/-/merge_requests/12 + +diff --git a/scripts/ib/staticlibrary b/scripts/ib/staticlibrary +index f051569..e33084f 100644 +--- a/scripts/ib/staticlibrary ++++ b/scripts/ib/staticlibrary +@@ -4,8 +4,8 @@ void static_library() + + if (g_compiled) + { +- system("ar cr ../lib" LIBRARY + ".a *" OBJ_EXT); +- system("ranlib ../lib" LIBRARY + ".a"); ++ system("${AR:-ar} cr ../lib" LIBRARY + ".a *" OBJ_EXT); ++ system("${RANLIB:-ar} ../lib" LIBRARY + ".a"); + system("rm *" OBJ_EXT); + } + } diff --git a/dev-build/icmake/icmake-9.03.01.ebuild b/dev-build/icmake/icmake-9.03.01-r1.ebuild similarity index 89% rename from dev-build/icmake/icmake-9.03.01.ebuild rename to dev-build/icmake/icmake-9.03.01-r1.ebuild index f6e27f88a3f8..fbd0e15b0459 100644 --- a/dev-build/icmake/icmake-9.03.01.ebuild +++ b/dev-build/icmake/icmake-9.03.01-r1.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit toolchain-funcs flag-o-matic @@ -18,6 +18,7 @@ PATCHES=( "${FILESDIR}"/${PN}-9.00.00-ar.patch "${FILESDIR}"/${PN}-9.02.02-verbose-build.patch "${FILESDIR}"/${PN}-9.03.01-compressed-docs.patch + "${FILESDIR}"/${PN}-9.03.01-ar.patch ) src_prepare() { @@ -43,5 +44,5 @@ src_compile() { } src_install() { - ./icm_install all "${ED}" || die + ./icm_install all "${D}" || die }
