| 1 |
commit: a448bbafc6e2952550090a4b11b7b9feedf6d93f |
| 2 |
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Jan 10 08:18:28 2019 +0000 |
| 4 |
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Jan 10 08:19:35 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=a448bbaf |
| 7 |
|
| 8 |
dev-util/pkgconfig: fix compilation during bootstrap phase |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.54-prefix, Repoman-2.3.12 |
| 11 |
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org> |
| 12 |
|
| 13 |
dev-util/pkgconfig/Manifest | 2 +- |
| 14 |
dev-util/pkgconfig/pkgconfig-0.29.2.ebuild | 18 +++++++++++------- |
| 15 |
2 files changed, 12 insertions(+), 8 deletions(-) |
| 16 |
|
| 17 |
diff --git a/dev-util/pkgconfig/Manifest b/dev-util/pkgconfig/Manifest |
| 18 |
index 97b65ff5a0..fb5b277c62 100644 |
| 19 |
--- a/dev-util/pkgconfig/Manifest |
| 20 |
+++ b/dev-util/pkgconfig/Manifest |
| 21 |
@@ -1,3 +1,3 @@ |
| 22 |
DIST pkg-config-0.29.1.tar.gz 2013454 BLAKE2B 5f33022b2df83de1c9202e090ea9be926d1f2b796152969d46ad45772ceb792c3f2bb95714cf1def28393b32db1b4052c3fdfe9f71076d130a57172987c04d0e SHA512 d2963355929d7aae0fbadad445d67b5c6762934fc4963a10a4b72ae90f7f6df4e6a38694884b924ff37eedaf636b49f3f521fe4eb3009e0322a402f330f1b4c2 |
| 23 |
DIST pkg-config-0.29.2.tar.gz 2016830 BLAKE2B e8f0420033524ad768cac3c82138546e4cd76c47f5835b7b98662ab01eaf3feef08f495a69c04980d51b57935567ab1d465ef4e1d0529735ad0031c828585324 SHA512 4861ec6428fead416f5cbbbb0bbad10b9152967e481d4b0ff2eb396a9f297f552984c9bb72f6864a37dcd8fca1d9ccceda3ef18d8f121938dbe4fdf2b870fe75 |
| 24 |
-DIST pkgconfig-glib-cygwin-patches-2.38.2.zip 7057 SHA256 08a006bc73175cb942179be3cfc38656e855c71c012aaf284271237a4803db13 SHA512 a9b8c0bfec83b022cfb74a4a4b53b17f29ea3b3b0cb12fed8e34a27258b5524c87ddbae1e2d88e452408948795a09506e6782dc87916cb4748a455261f583b62 WHIRLPOOL 390b040d9d1f16a427ffa04a8820cd7de9a756ba9c1f32cbe22d560b385f9eb38441569b68ec1ac38319123bd585f82dd52d19764e6a2520b74bbc9dcd37c631 |
| 25 |
+DIST pkgconfig-glib-cygwin-patches-2.38.2.zip 7057 BLAKE2B fcbda5c93cbb05f00a1e81df6fda6fb1907ffdabe8125511fcdee11305b015f3d5f5c3778f43a24e26f1f7fe426a877734ff49d2ebf8382e70c53850ed44d3bc SHA512 a9b8c0bfec83b022cfb74a4a4b53b17f29ea3b3b0cb12fed8e34a27258b5524c87ddbae1e2d88e452408948795a09506e6782dc87916cb4748a455261f583b62 |
| 26 |
|
| 27 |
diff --git a/dev-util/pkgconfig/pkgconfig-0.29.2.ebuild b/dev-util/pkgconfig/pkgconfig-0.29.2.ebuild |
| 28 |
index ab762b945c..2b64945433 100644 |
| 29 |
--- a/dev-util/pkgconfig/pkgconfig-0.29.2.ebuild |
| 30 |
+++ b/dev-util/pkgconfig/pkgconfig-0.29.2.ebuild |
| 31 |
@@ -1,10 +1,10 @@ |
| 32 |
-# Copyright 1999-2017 Gentoo Foundation |
| 33 |
+# Copyright 1999-2019 Gentoo Authors |
| 34 |
# Distributed under the terms of the GNU General Public License v2 |
| 35 |
|
| 36 |
EAPI=6 |
| 37 |
|
| 38 |
# Do not inherit autotools in non-live ebuild - causes circular dependency, bug #550856 |
| 39 |
-inherit eutils flag-o-matic libtool multilib multilib-minimal |
| 40 |
+inherit eutils flag-o-matic libtool multilib multilib-minimal toolchain-funcs |
| 41 |
|
| 42 |
MY_P=pkg-config-${PV} |
| 43 |
|
| 44 |
@@ -62,11 +62,15 @@ src_prepare() { |
| 45 |
fi |
| 46 |
|
| 47 |
if [[ ${CHOST} == *-solaris* ]] ; then |
| 48 |
- # fix standards conflicts |
| 49 |
- sed -i \ |
| 50 |
- -e 's/\<\(_XOPEN_SOURCE_EXTENDED\)\>/\1_DISABLED/' \ |
| 51 |
- -e '/\<_XOPEN_SOURCE\>/s/2/600/' \ |
| 52 |
- glib/configure || die |
| 53 |
+ # fix standards conflict, since gcc-4.5 default is gnu90 |
| 54 |
+ if tc-is-gcc && [[ $(gcc-major-version) -gt 4 || \ |
| 55 |
+ ( $(gcc-major-version) -eq 4 && $(gcc-minor-version) -ge 5 ) ]] ; |
| 56 |
+ then |
| 57 |
+ sed -i \ |
| 58 |
+ -e 's/\<\(_XOPEN_SOURCE_EXTENDED\)\>/\1_DISABLED/' \ |
| 59 |
+ -e '/\<_XOPEN_SOURCE\>/s/2/600/' \ |
| 60 |
+ glib/configure || die |
| 61 |
+ fi |
| 62 |
fi |
| 63 |
} |
Archives