| 1 |
commit: 7b1a9e472142eb6c29f6d215372e15453f2711bd |
| 2 |
Author: Michael Haubenwallner <haubi <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Dec 30 22:29:06 2017 +0000 |
| 4 |
Commit: Michael Haubenwallner <haubi <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Dec 30 22:32:39 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=7b1a9e47 |
| 7 |
|
| 8 |
dev-util/pkgconfig: sync |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.13, Repoman-2.3.3 |
| 11 |
|
| 12 |
dev-util/pkgconfig/Manifest | 1 + |
| 13 |
...gconfig-9999.ebuild => pkgconfig-0.29.2.ebuild} | 32 +++++++++++++++++----- |
| 14 |
dev-util/pkgconfig/pkgconfig-9999.ebuild | 32 +++++++++++++++++----- |
| 15 |
3 files changed, 51 insertions(+), 14 deletions(-) |
| 16 |
|
| 17 |
diff --git a/dev-util/pkgconfig/Manifest b/dev-util/pkgconfig/Manifest |
| 18 |
index 03a6f1f6bb..97b65ff5a0 100644 |
| 19 |
--- a/dev-util/pkgconfig/Manifest |
| 20 |
+++ b/dev-util/pkgconfig/Manifest |
| 21 |
@@ -1,2 +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 |
|
| 26 |
diff --git a/dev-util/pkgconfig/pkgconfig-9999.ebuild b/dev-util/pkgconfig/pkgconfig-0.29.2.ebuild |
| 27 |
similarity index 77% |
| 28 |
copy from dev-util/pkgconfig/pkgconfig-9999.ebuild |
| 29 |
copy to dev-util/pkgconfig/pkgconfig-0.29.2.ebuild |
| 30 |
index ddebd33447..ab762b945c 100644 |
| 31 |
--- a/dev-util/pkgconfig/pkgconfig-9999.ebuild |
| 32 |
+++ b/dev-util/pkgconfig/pkgconfig-0.29.2.ebuild |
| 33 |
@@ -1,8 +1,7 @@ |
| 34 |
# Copyright 1999-2017 Gentoo Foundation |
| 35 |
# Distributed under the terms of the GNU General Public License v2 |
| 36 |
-# $Id$ |
| 37 |
|
| 38 |
-EAPI=5 |
| 39 |
+EAPI=6 |
| 40 |
|
| 41 |
# Do not inherit autotools in non-live ebuild - causes circular dependency, bug #550856 |
| 42 |
inherit eutils flag-o-matic libtool multilib multilib-minimal |
| 43 |
@@ -13,11 +12,11 @@ if [[ ${PV} == *9999* ]]; then |
| 44 |
# 1.12 is only needed for tests due to some am__check_pre / LOG_DRIVER |
| 45 |
# weirdness with "/bin/bash /bin/sh" in arguments chain with >=1.13 |
| 46 |
WANT_AUTOMAKE=1.12 |
| 47 |
- EGIT_REPO_URI="git://anongit.freedesktop.org/pkg-config" |
| 48 |
+ EGIT_REPO_URI="https://anongit.freedesktop.org/git/pkg-config.git" |
| 49 |
EGIT_CHECKOUT_DIR=${WORKDIR}/${MY_P} |
| 50 |
inherit autotools git-r3 |
| 51 |
else |
| 52 |
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
| 53 |
+ KEYWORDS="~ppc-aix ~x64-cygwin ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
| 54 |
SRC_URI="https://pkgconfig.freedesktop.org/releases/${MY_P}.tar.gz" |
| 55 |
INTERNAL_GLIB_CYGWIN_PATCHES=2.38.2 |
| 56 |
fi |
| 57 |
@@ -38,7 +37,8 @@ IUSE="elibc_FreeBSD elibc_glibc elibc_Cygwin hardened internal-glib" |
| 58 |
RDEPEND="!internal-glib? ( >=dev-libs/glib-2.34.3[${MULTILIB_USEDEP}] ) |
| 59 |
!dev-util/pkgconf[pkg-config] |
| 60 |
!dev-util/pkg-config-lite |
| 61 |
- !dev-util/pkgconfig-openbsd[pkg-config]" |
| 62 |
+ !dev-util/pkgconfig-openbsd[pkg-config] |
| 63 |
+ virtual/libintl" |
| 64 |
DEPEND="${RDEPEND}" |
| 65 |
|
| 66 |
S=${WORKDIR}/${MY_P} |
| 67 |
@@ -53,13 +53,21 @@ src_prepare() { |
| 68 |
EPATCH_FORCE=yes EPATCH_SUFFIX=patch \ |
| 69 |
epatch "${WORKDIR}"/pkgconfig-glib-cygwin-patches-${INTERNAL_GLIB_CYGWIN_PATCHES} |
| 70 |
|
| 71 |
- epatch_user |
| 72 |
+ eapply_user |
| 73 |
|
| 74 |
if [[ ${PV} == *9999* ]]; then |
| 75 |
eautoreconf |
| 76 |
else |
| 77 |
elibtoolize # Required for FreeMiNT wrt #333429 |
| 78 |
fi |
| 79 |
+ |
| 80 |
+ if [[ ${CHOST} == *-solaris* ]] ; then |
| 81 |
+ # fix standards conflicts |
| 82 |
+ sed -i \ |
| 83 |
+ -e 's/\<\(_XOPEN_SOURCE_EXTENDED\)\>/\1_DISABLED/' \ |
| 84 |
+ -e '/\<_XOPEN_SOURCE\>/s/2/600/' \ |
| 85 |
+ glib/configure || die |
| 86 |
+ fi |
| 87 |
} |
| 88 |
|
| 89 |
multilib_src_configure() { |
| 90 |
@@ -75,9 +83,19 @@ multilib_src_configure() { |
| 91 |
# add the libdir for libtool, otherwise it'll make love with system |
| 92 |
# installed libiconv |
| 93 |
append-ldflags "-L${EPREFIX}/usr/$(get_libdir)" |
| 94 |
+ # the glib objects reference symbols from these frameworks, |
| 95 |
+ # not good, esp. since Carbon should be deprecated |
| 96 |
+ [[ ${CHOST} == *-darwin* ]] && \ |
| 97 |
+ append-ldflags -framework CoreFoundation -framework Carbon |
| 98 |
+ if [[ ${CHOST} == *-solaris* ]] ; then |
| 99 |
+ # required due to __EXTENSIONS__ |
| 100 |
+ append-cppflags -DENABLE_NLS |
| 101 |
+ # similar to Darwin |
| 102 |
+ append-ldflags -lintl |
| 103 |
+ fi |
| 104 |
fi |
| 105 |
else |
| 106 |
- if ! has_version dev-util/pkgconfig; then |
| 107 |
+ if ! has_version --host-root dev-util/pkgconfig; then |
| 108 |
export GLIB_CFLAGS="-I${EPREFIX}/usr/include/glib-2.0 -I${EPREFIX}/usr/$(get_libdir)/glib-2.0/include" |
| 109 |
export GLIB_LIBS="-lglib-2.0" |
| 110 |
fi |
| 111 |
|
| 112 |
diff --git a/dev-util/pkgconfig/pkgconfig-9999.ebuild b/dev-util/pkgconfig/pkgconfig-9999.ebuild |
| 113 |
index ddebd33447..ab762b945c 100644 |
| 114 |
--- a/dev-util/pkgconfig/pkgconfig-9999.ebuild |
| 115 |
+++ b/dev-util/pkgconfig/pkgconfig-9999.ebuild |
| 116 |
@@ -1,8 +1,7 @@ |
| 117 |
# Copyright 1999-2017 Gentoo Foundation |
| 118 |
# Distributed under the terms of the GNU General Public License v2 |
| 119 |
-# $Id$ |
| 120 |
|
| 121 |
-EAPI=5 |
| 122 |
+EAPI=6 |
| 123 |
|
| 124 |
# Do not inherit autotools in non-live ebuild - causes circular dependency, bug #550856 |
| 125 |
inherit eutils flag-o-matic libtool multilib multilib-minimal |
| 126 |
@@ -13,11 +12,11 @@ if [[ ${PV} == *9999* ]]; then |
| 127 |
# 1.12 is only needed for tests due to some am__check_pre / LOG_DRIVER |
| 128 |
# weirdness with "/bin/bash /bin/sh" in arguments chain with >=1.13 |
| 129 |
WANT_AUTOMAKE=1.12 |
| 130 |
- EGIT_REPO_URI="git://anongit.freedesktop.org/pkg-config" |
| 131 |
+ EGIT_REPO_URI="https://anongit.freedesktop.org/git/pkg-config.git" |
| 132 |
EGIT_CHECKOUT_DIR=${WORKDIR}/${MY_P} |
| 133 |
inherit autotools git-r3 |
| 134 |
else |
| 135 |
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
| 136 |
+ KEYWORDS="~ppc-aix ~x64-cygwin ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
| 137 |
SRC_URI="https://pkgconfig.freedesktop.org/releases/${MY_P}.tar.gz" |
| 138 |
INTERNAL_GLIB_CYGWIN_PATCHES=2.38.2 |
| 139 |
fi |
| 140 |
@@ -38,7 +37,8 @@ IUSE="elibc_FreeBSD elibc_glibc elibc_Cygwin hardened internal-glib" |
| 141 |
RDEPEND="!internal-glib? ( >=dev-libs/glib-2.34.3[${MULTILIB_USEDEP}] ) |
| 142 |
!dev-util/pkgconf[pkg-config] |
| 143 |
!dev-util/pkg-config-lite |
| 144 |
- !dev-util/pkgconfig-openbsd[pkg-config]" |
| 145 |
+ !dev-util/pkgconfig-openbsd[pkg-config] |
| 146 |
+ virtual/libintl" |
| 147 |
DEPEND="${RDEPEND}" |
| 148 |
|
| 149 |
S=${WORKDIR}/${MY_P} |
| 150 |
@@ -53,13 +53,21 @@ src_prepare() { |
| 151 |
EPATCH_FORCE=yes EPATCH_SUFFIX=patch \ |
| 152 |
epatch "${WORKDIR}"/pkgconfig-glib-cygwin-patches-${INTERNAL_GLIB_CYGWIN_PATCHES} |
| 153 |
|
| 154 |
- epatch_user |
| 155 |
+ eapply_user |
| 156 |
|
| 157 |
if [[ ${PV} == *9999* ]]; then |
| 158 |
eautoreconf |
| 159 |
else |
| 160 |
elibtoolize # Required for FreeMiNT wrt #333429 |
| 161 |
fi |
| 162 |
+ |
| 163 |
+ if [[ ${CHOST} == *-solaris* ]] ; then |
| 164 |
+ # fix standards conflicts |
| 165 |
+ sed -i \ |
| 166 |
+ -e 's/\<\(_XOPEN_SOURCE_EXTENDED\)\>/\1_DISABLED/' \ |
| 167 |
+ -e '/\<_XOPEN_SOURCE\>/s/2/600/' \ |
| 168 |
+ glib/configure || die |
| 169 |
+ fi |
| 170 |
} |
| 171 |
|
| 172 |
multilib_src_configure() { |
| 173 |
@@ -75,9 +83,19 @@ multilib_src_configure() { |
| 174 |
# add the libdir for libtool, otherwise it'll make love with system |
| 175 |
# installed libiconv |
| 176 |
append-ldflags "-L${EPREFIX}/usr/$(get_libdir)" |
| 177 |
+ # the glib objects reference symbols from these frameworks, |
| 178 |
+ # not good, esp. since Carbon should be deprecated |
| 179 |
+ [[ ${CHOST} == *-darwin* ]] && \ |
| 180 |
+ append-ldflags -framework CoreFoundation -framework Carbon |
| 181 |
+ if [[ ${CHOST} == *-solaris* ]] ; then |
| 182 |
+ # required due to __EXTENSIONS__ |
| 183 |
+ append-cppflags -DENABLE_NLS |
| 184 |
+ # similar to Darwin |
| 185 |
+ append-ldflags -lintl |
| 186 |
+ fi |
| 187 |
fi |
| 188 |
else |
| 189 |
- if ! has_version dev-util/pkgconfig; then |
| 190 |
+ if ! has_version --host-root dev-util/pkgconfig; then |
| 191 |
export GLIB_CFLAGS="-I${EPREFIX}/usr/include/glib-2.0 -I${EPREFIX}/usr/$(get_libdir)/glib-2.0/include" |
| 192 |
export GLIB_LIBS="-lglib-2.0" |
| 193 |
fi |
Archives