diff options
| author |   Fabian Groffen <grobian@gentoo.org> | 2021-01-06 12:52:04 +0100 |
|---|---|---|
| committer | Fabian Groffen <grobian@gentoo.org> | 2021-01-06 12:52:04 +0100 |
| commit | 1ca0cee88f932ecc4c863add9f881bcede9a486d (patch) | |
| tree | 40e2a0df446f672f8a5cfe5e0e32d83654ef9f1e /dev-util/pkgconfig | |
| parent | x11-libs/libXdmcp: drop x86-macos (diff) | |
| download | gentoo-1ca0cee88f932ecc4c863add9f881bcede9a486d.tar.gz gentoo-1ca0cee88f932ecc4c863add9f881bcede9a486d.tar.bz2 gentoo-1ca0cee88f932ecc4c863add9f881bcede9a486d.zip | |
dev-util/pkgconfig-0.29.2: sync latest Prefix changes for Solaris
Package-Manager: Portage-3.0.12.0.2-prefix, Repoman-3.0.2
Signed-off-by: Fabian Groffen <grobian@gentoo.org>
Diffstat (limited to 'dev-util/pkgconfig')
| -rw-r--r-- | dev-util/pkgconfig/pkgconfig-0.29.2.ebuild | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/dev-util/pkgconfig/pkgconfig-0.29.2.ebuild b/dev-util/pkgconfig/pkgconfig-0.29.2.ebuild index 980d368b7395..71fc2cdea857 100644 --- a/dev-util/pkgconfig/pkgconfig-0.29.2.ebuild +++ b/dev-util/pkgconfig/pkgconfig-0.29.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -50,11 +50,15 @@ src_prepare() { fi if [[ ${CHOST} == *-solaris* ]] ; then - # fix standards conflicts - sed -i -e 's/\(_XOPEN_SOURCE\(_EXTENDED\)\?\|__EXTENSIONS__\)/ \1_DISABLED/' \ - glib/configure || die - sed -i -e '/#define\s\+_POSIX_SOURCE/d' \ - glib/glib/giounix.c || die + # fix standards conflict, since gcc-4.5 default is gnu90 + if tc-is-gcc && [[ $(gcc-major-version) -gt 4 || \ + ( $(gcc-major-version) -eq 4 && $(gcc-minor-version) -ge 5 ) ]] ; + then + sed -i \ + -e 's/\<\(_XOPEN_SOURCE_EXTENDED\)\>/\1_DISABLED/' \ + -e '/\<_XOPEN_SOURCE\>/s/2/600/' \ + glib/configure || die + fi fi } |