[gentoo-commits] repo/gentoo:master commit in: sys-libs/pkgcraft/

["Sam James" <sam@gentoo.org>]

commit:     44a801e369a951ee8580e975bf7fbd0b989aab7d
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Dec  9 05:48:10 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Dec  9 05:48:51 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=44a801e3

sys-libs/pkgcraft: build w/ -std=gnu17, sync live

C17 for the bundled/modified fork of bash (scallop).

Closes: https://bugs.gentoo.org/945254
Signed-off-by: Sam James <sam <AT> gentoo.org>

 sys-libs/pkgcraft/pkgcraft-0.0.16-r1.ebuild | 5 ++++-
 sys-libs/pkgcraft/pkgcraft-9999.ebuild      | 8 +++++++-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/sys-libs/pkgcraft/pkgcraft-0.0.16-r1.ebuild b/sys-libs/pkgcraft/pkgcraft-0.0.16-r1.ebuild
index 0fe19eb425da..4f268ebdc188 100644
--- a/sys-libs/pkgcraft/pkgcraft-0.0.16-r1.ebuild
+++ b/sys-libs/pkgcraft/pkgcraft-0.0.16-r1.ebuild
@@ -7,7 +7,7 @@ CRATES=" "
 
 RUST_MIN_VER="1.77.1"
 
-inherit edo cargo toolchain-funcs
+inherit edo cargo flag-o-matic toolchain-funcs
 
 DESCRIPTION="C library for pkgcraft"
 HOMEPAGE="https://pkgcraft.github.io/"
@@ -62,6 +62,9 @@ src_compile() {
 	# For scallop building bash
 	tc-export AR CC
 
+	# scallop uses modified bash-5.2 which relies on unprotoyped functions
+	append-cflags -std=gnu17
+
 	# Can pass -vv if need more output from e.g. scallop configure
 	edo cargo cbuild "${cargoargs[@]}"
 }

diff --git a/sys-libs/pkgcraft/pkgcraft-9999.ebuild b/sys-libs/pkgcraft/pkgcraft-9999.ebuild
index 024776672574..4f268ebdc188 100644
--- a/sys-libs/pkgcraft/pkgcraft-9999.ebuild
+++ b/sys-libs/pkgcraft/pkgcraft-9999.ebuild
@@ -4,7 +4,10 @@
 EAPI=8
 
 CRATES=" "
-inherit edo cargo toolchain-funcs
+
+RUST_MIN_VER="1.77.1"
+
+inherit edo cargo flag-o-matic toolchain-funcs
 
 DESCRIPTION="C library for pkgcraft"
 HOMEPAGE="https://pkgcraft.github.io/"
@@ -59,6 +62,9 @@ src_compile() {
 	# For scallop building bash
 	tc-export AR CC
 
+	# scallop uses modified bash-5.2 which relies on unprotoyped functions
+	append-cflags -std=gnu17
+
 	# Can pass -vv if need more output from e.g. scallop configure
 	edo cargo cbuild "${cargoargs[@]}"
 }