commit: 7cae05e8682461e0af1990606bc37353bf7a9f43
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 18 17:47:47 2025 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Nov 18 17:48:13 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7cae05e8
dev-vcs/git: forward-port Solaris fix
Forward-port the fix from 6408827516c5afef669e079322efdb8fd48cba62. I'd
lost it as I had a 2.52.0 ebuild that I started but didn't finish yesterday.
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-vcs/git/git-2.52.0.ebuild | 4 +++-
dev-vcs/git/git-9999-r1.ebuild | 4 +++-
dev-vcs/git/git-9999-r2.ebuild | 4 +++-
dev-vcs/git/git-9999-r3.ebuild | 4 +++-
dev-vcs/git/git-9999.ebuild | 4 +++-
5 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/dev-vcs/git/git-2.52.0.ebuild b/dev-vcs/git/git-2.52.0.ebuild
index 38de93464194..d83716458f02 100644
--- a/dev-vcs/git/git-2.52.0.ebuild
+++ b/dev-vcs/git/git-2.52.0.ebuild
@@ -8,7 +8,8 @@ GENTOO_DEPEND_ON_PERL=no
# bug #329479: git-remote-testgit is not multiple-version aware
PYTHON_COMPAT=( python3_{11..14} )
RUST_OPTIONAL=1
-inherit toolchain-funcs perl-module shell-completion optfeature plocale
python-single-r1 rust systemd meson
+inherit flag-o-matic toolchain-funcs perl-module shell-completion optfeature
+inherit plocale python-single-r1 rust systemd meson
PLOCALES="bg ca de es fr is it ko pt_PT ru sv vi zh_CN"
@@ -242,6 +243,7 @@ src_configure() {
)
[[ ${CHOST} == *-darwin* ]] && emesonargs+=( -Dfsmonitor=false )
+ [[ ${CHOST} == *-solaris* ]] && append-flags -D__EXTENSIONS__
# For non-live, we use a downloaded docs tarball instead.
if [[ ${PV} == *9999 ]] || use doc ; then
diff --git a/dev-vcs/git/git-9999-r1.ebuild b/dev-vcs/git/git-9999-r1.ebuild
index 38de93464194..d83716458f02 100644
--- a/dev-vcs/git/git-9999-r1.ebuild
+++ b/dev-vcs/git/git-9999-r1.ebuild
@@ -8,7 +8,8 @@ GENTOO_DEPEND_ON_PERL=no
# bug #329479: git-remote-testgit is not multiple-version aware
PYTHON_COMPAT=( python3_{11..14} )
RUST_OPTIONAL=1
-inherit toolchain-funcs perl-module shell-completion optfeature plocale
python-single-r1 rust systemd meson
+inherit flag-o-matic toolchain-funcs perl-module shell-completion optfeature
+inherit plocale python-single-r1 rust systemd meson
PLOCALES="bg ca de es fr is it ko pt_PT ru sv vi zh_CN"
@@ -242,6 +243,7 @@ src_configure() {
)
[[ ${CHOST} == *-darwin* ]] && emesonargs+=( -Dfsmonitor=false )
+ [[ ${CHOST} == *-solaris* ]] && append-flags -D__EXTENSIONS__
# For non-live, we use a downloaded docs tarball instead.
if [[ ${PV} == *9999 ]] || use doc ; then
diff --git a/dev-vcs/git/git-9999-r2.ebuild b/dev-vcs/git/git-9999-r2.ebuild
index 38de93464194..d83716458f02 100644
--- a/dev-vcs/git/git-9999-r2.ebuild
+++ b/dev-vcs/git/git-9999-r2.ebuild
@@ -8,7 +8,8 @@ GENTOO_DEPEND_ON_PERL=no
# bug #329479: git-remote-testgit is not multiple-version aware
PYTHON_COMPAT=( python3_{11..14} )
RUST_OPTIONAL=1
-inherit toolchain-funcs perl-module shell-completion optfeature plocale
python-single-r1 rust systemd meson
+inherit flag-o-matic toolchain-funcs perl-module shell-completion optfeature
+inherit plocale python-single-r1 rust systemd meson
PLOCALES="bg ca de es fr is it ko pt_PT ru sv vi zh_CN"
@@ -242,6 +243,7 @@ src_configure() {
)
[[ ${CHOST} == *-darwin* ]] && emesonargs+=( -Dfsmonitor=false )
+ [[ ${CHOST} == *-solaris* ]] && append-flags -D__EXTENSIONS__
# For non-live, we use a downloaded docs tarball instead.
if [[ ${PV} == *9999 ]] || use doc ; then
diff --git a/dev-vcs/git/git-9999-r3.ebuild b/dev-vcs/git/git-9999-r3.ebuild
index 38de93464194..d83716458f02 100644
--- a/dev-vcs/git/git-9999-r3.ebuild
+++ b/dev-vcs/git/git-9999-r3.ebuild
@@ -8,7 +8,8 @@ GENTOO_DEPEND_ON_PERL=no
# bug #329479: git-remote-testgit is not multiple-version aware
PYTHON_COMPAT=( python3_{11..14} )
RUST_OPTIONAL=1
-inherit toolchain-funcs perl-module shell-completion optfeature plocale
python-single-r1 rust systemd meson
+inherit flag-o-matic toolchain-funcs perl-module shell-completion optfeature
+inherit plocale python-single-r1 rust systemd meson
PLOCALES="bg ca de es fr is it ko pt_PT ru sv vi zh_CN"
@@ -242,6 +243,7 @@ src_configure() {
)
[[ ${CHOST} == *-darwin* ]] && emesonargs+=( -Dfsmonitor=false )
+ [[ ${CHOST} == *-solaris* ]] && append-flags -D__EXTENSIONS__
# For non-live, we use a downloaded docs tarball instead.
if [[ ${PV} == *9999 ]] || use doc ; then
diff --git a/dev-vcs/git/git-9999.ebuild b/dev-vcs/git/git-9999.ebuild
index 38de93464194..d83716458f02 100644
--- a/dev-vcs/git/git-9999.ebuild
+++ b/dev-vcs/git/git-9999.ebuild
@@ -8,7 +8,8 @@ GENTOO_DEPEND_ON_PERL=no
# bug #329479: git-remote-testgit is not multiple-version aware
PYTHON_COMPAT=( python3_{11..14} )
RUST_OPTIONAL=1
-inherit toolchain-funcs perl-module shell-completion optfeature plocale
python-single-r1 rust systemd meson
+inherit flag-o-matic toolchain-funcs perl-module shell-completion optfeature
+inherit plocale python-single-r1 rust systemd meson
PLOCALES="bg ca de es fr is it ko pt_PT ru sv vi zh_CN"
@@ -242,6 +243,7 @@ src_configure() {
)
[[ ${CHOST} == *-darwin* ]] && emesonargs+=( -Dfsmonitor=false )
+ [[ ${CHOST} == *-solaris* ]] && append-flags -D__EXTENSIONS__
# For non-live, we use a downloaded docs tarball instead.
if [[ ${PV} == *9999 ]] || use doc ; then
