summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFabian Groffen <grobian@gentoo.org>2019-01-10 09:18:28 +0100
committerFabian Groffen <grobian@gentoo.org>2019-01-10 09:19:35 +0100
commita448bbafc6e2952550090a4b11b7b9feedf6d93f (patch)
tree7937413b0a4c5d8f464a4016de2047ea2091ab64 /dev-util/pkgconfig/pkgconfig-0.29.2.ebuild
parentscripts/bootstrap-prefix: don't remove LDFLAGS too soon in stage3 (diff)
downloadprefix-a448bbafc6e2952550090a4b11b7b9feedf6d93f.tar.gz
prefix-a448bbafc6e2952550090a4b11b7b9feedf6d93f.tar.bz2
prefix-a448bbafc6e2952550090a4b11b7b9feedf6d93f.zip
dev-util/pkgconfig: fix compilation during bootstrap phase
Package-Manager: Portage-2.3.54-prefix, Repoman-2.3.12 Signed-off-by: Fabian Groffen <grobian@gentoo.org>
Diffstat (limited to 'dev-util/pkgconfig/pkgconfig-0.29.2.ebuild')
-rw-r--r--dev-util/pkgconfig/pkgconfig-0.29.2.ebuild18
1 files changed, 11 insertions, 7 deletions
diff --git a/dev-util/pkgconfig/pkgconfig-0.29.2.ebuild b/dev-util/pkgconfig/pkgconfig-0.29.2.ebuild
index ab762b945c..2b64945433 100644
--- a/dev-util/pkgconfig/pkgconfig-0.29.2.ebuild
+++ b/dev-util/pkgconfig/pkgconfig-0.29.2.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
# Do not inherit autotools in non-live ebuild - causes circular dependency, bug #550856
-inherit eutils flag-o-matic libtool multilib multilib-minimal
+inherit eutils flag-o-matic libtool multilib multilib-minimal toolchain-funcs
MY_P=pkg-config-${PV}
@@ -62,11 +62,15 @@ src_prepare() {
fi
if [[ ${CHOST} == *-solaris* ]] ; then
- # fix standards conflicts
- sed -i \
- -e 's/\<\(_XOPEN_SOURCE_EXTENDED\)\>/\1_DISABLED/' \
- -e '/\<_XOPEN_SOURCE\>/s/2/600/' \
- glib/configure || 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
}