commit: b3e6f910ef8cf28cbbfecc0bd98844082c856657 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Sat May 3 04:57:35 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sat May 3 04:58:14 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b3e6f910
www-apps/cgit: build w/ -std=gnu17 These can be dropped w/ newer git but not going to test that right now. Closes: https://bugs.gentoo.org/951555 Signed-off-by: Sam James <sam <AT> gentoo.org> www-apps/cgit/cgit-1.2.3-r203.ebuild | 7 +++++-- www-apps/cgit/cgit-1.2.3_p20240802.ebuild | 5 ++++- www-apps/cgit/cgit-9999-r1.ebuild | 8 ++++++-- www-apps/cgit/cgit-9999.ebuild | 8 ++++++-- 4 files changed, 21 insertions(+), 7 deletions(-) diff --git a/www-apps/cgit/cgit-1.2.3-r203.ebuild b/www-apps/cgit/cgit-1.2.3-r203.ebuild index 10bd2be664b3..78ee22ac8b71 100644 --- a/www-apps/cgit/cgit-1.2.3-r203.ebuild +++ b/www-apps/cgit/cgit-1.2.3-r203.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -9,7 +9,7 @@ PYTHON_COMPAT=( python3_{10..12} ) WEBAPP_MANUAL_SLOT="yes" -inherit lua-single python-single-r1 tmpfiles toolchain-funcs webapp +inherit flag-o-matic lua-single python-single-r1 tmpfiles toolchain-funcs webapp [[ -z "${CGIT_CACHEDIR}" ]] && CGIT_CACHEDIR="/var/cache/${PN}/" @@ -61,6 +61,9 @@ src_configure() { mv "${WORKDIR}"/git-"${GIT_V}" git || die fi + # bug #951555 + append-cflags -std=gnu17 + echo "prefix = ${EPREFIX}/usr" >> cgit.conf || die "echo prefix failed" echo "libdir = ${EPREFIX}/usr/$(get_libdir)" >> cgit.conf || die "echo libdir failed" echo "CGIT_SCRIPT_PATH = ${MY_CGIBINDIR}" >> cgit.conf || die "echo CGIT_SCRIPT_PATH failed" diff --git a/www-apps/cgit/cgit-1.2.3_p20240802.ebuild b/www-apps/cgit/cgit-1.2.3_p20240802.ebuild index 7b4f19a25e7e..8380152773c3 100644 --- a/www-apps/cgit/cgit-1.2.3_p20240802.ebuild +++ b/www-apps/cgit/cgit-1.2.3_p20240802.ebuild @@ -9,7 +9,7 @@ PYTHON_COMPAT=( python3_{10..13} ) WEBAPP_MANUAL_SLOT="yes" -inherit lua-single python-single-r1 tmpfiles toolchain-funcs webapp +inherit flag-o-matic lua-single python-single-r1 tmpfiles toolchain-funcs webapp [[ -z "${CGIT_CACHEDIR}" ]] && CGIT_CACHEDIR="/var/cache/${PN}/" @@ -66,6 +66,9 @@ src_configure() { mv "${WORKDIR}"/git-"${GIT_V}" git || die fi + # bug #951555 + append-cflags -std=gnu17 + echo "prefix = ${EPREFIX}/usr" >> cgit.conf || die "echo prefix failed" echo "libdir = ${EPREFIX}/usr/$(get_libdir)" >> cgit.conf || die "echo libdir failed" echo "CGIT_SCRIPT_PATH = ${MY_CGIBINDIR}" >> cgit.conf || die "echo CGIT_SCRIPT_PATH failed" diff --git a/www-apps/cgit/cgit-9999-r1.ebuild b/www-apps/cgit/cgit-9999-r1.ebuild index 8b6fded5c051..648f5145540e 100644 --- a/www-apps/cgit/cgit-9999-r1.ebuild +++ b/www-apps/cgit/cgit-9999-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -9,7 +9,7 @@ PYTHON_COMPAT=( python3_{10..12} ) WEBAPP_MANUAL_SLOT="yes" -inherit lua-single python-single-r1 tmpfiles toolchain-funcs webapp git-r3 +inherit flag-o-matic lua-single python-single-r1 tmpfiles toolchain-funcs webapp git-r3 [[ -z "${CGIT_CACHEDIR}" ]] && CGIT_CACHEDIR="/var/cache/${PN}/" @@ -68,6 +68,10 @@ src_configure() { rmdir git || die mv "${WORKDIR}"/git-"${GIT_V}" git || die fi + + # bug #951555 + append-cflags -std=gnu17 + echo "prefix = ${EPREFIX}/usr" >> cgit.conf || die "echo prefix failed" echo "libdir = ${EPREFIX}/usr/$(get_libdir)" >> cgit.conf || die "echo libdir failed" echo "CGIT_SCRIPT_PATH = ${MY_CGIBINDIR}" >> cgit.conf || die "echo CGIT_SCRIPT_PATH failed" diff --git a/www-apps/cgit/cgit-9999.ebuild b/www-apps/cgit/cgit-9999.ebuild index 1fab1a1e34a9..8412f8c1677a 100644 --- a/www-apps/cgit/cgit-9999.ebuild +++ b/www-apps/cgit/cgit-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -9,7 +9,7 @@ PYTHON_COMPAT=( python3_{10..12} ) WEBAPP_MANUAL_SLOT="yes" -inherit lua-single python-single-r1 tmpfiles toolchain-funcs webapp git-r3 +inherit flag-o-matic lua-single python-single-r1 tmpfiles toolchain-funcs webapp git-r3 [[ -z "${CGIT_CACHEDIR}" ]] && CGIT_CACHEDIR="/var/cache/${PN}/" @@ -65,6 +65,10 @@ src_configure() { rmdir git || die mv "${WORKDIR}"/git-"${GIT_V}" git || die fi + + # bug #951555 + append-cflags -std=gnu17 + echo "prefix = ${EPREFIX}/usr" >> cgit.conf || die "echo prefix failed" echo "libdir = ${EPREFIX}/usr/$(get_libdir)" >> cgit.conf || die "echo libdir failed" echo "CGIT_SCRIPT_PATH = ${MY_CGIBINDIR}" >> cgit.conf || die "echo CGIT_SCRIPT_PATH failed"
