From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 8101A1396D0 for ; Tue, 5 Sep 2017 16:07:23 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C7F9DE0D47; Tue, 5 Sep 2017 16:07:22 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A8973E0D47 for ; Tue, 5 Sep 2017 16:07:22 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id CD7643402FE for ; Tue, 5 Sep 2017 16:07:21 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 413AF8D3D for ; Tue, 5 Sep 2017 16:07:20 +0000 (UTC) From: "Mike Gilbert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Gilbert" Message-ID: <1504627636.bff9578a1607d924e2d978f024a73abcd941247c.floppym@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/pkgconfig/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-util/pkgconfig/pkgconfig-9999.ebuild X-VCS-Directories: dev-util/pkgconfig/ X-VCS-Committer: floppym X-VCS-Committer-Name: Mike Gilbert X-VCS-Revision: bff9578a1607d924e2d978f024a73abcd941247c X-VCS-Branch: master Date: Tue, 5 Sep 2017 16:07:20 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 267e904d-93f1-4a58-af48-ef80947fd63c X-Archives-Hash: 6f8f1ad2043bc13f24bd969e8c222e62 commit: bff9578a1607d924e2d978f024a73abcd941247c Author: Mike Gilbert gentoo org> AuthorDate: Tue Sep 5 16:07:07 2017 +0000 Commit: Mike Gilbert gentoo org> CommitDate: Tue Sep 5 16:07:16 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bff9578a dev-util/pkgconfig: update live ebuild Package-Manager: Portage-2.3.6_p39, Repoman-2.3.3_p17 dev-util/pkgconfig/pkgconfig-9999.ebuild | 25 ++++++++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-) diff --git a/dev-util/pkgconfig/pkgconfig-9999.ebuild b/dev-util/pkgconfig/pkgconfig-9999.ebuild index 90e416b25b2..31f6de36737 100644 --- a/dev-util/pkgconfig/pkgconfig-9999.ebuild +++ b/dev-util/pkgconfig/pkgconfig-9999.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=6 # Do not inherit autotools in non-live ebuild - causes circular dependency, bug #550856 inherit eutils flag-o-matic libtool multilib multilib-minimal @@ -30,7 +30,8 @@ IUSE="elibc_FreeBSD elibc_glibc hardened internal-glib" RDEPEND="!internal-glib? ( >=dev-libs/glib-2.34.3[${MULTILIB_USEDEP}] ) !dev-util/pkgconf[pkg-config] !dev-util/pkg-config-lite - !dev-util/pkgconfig-openbsd[pkg-config]" + !dev-util/pkgconfig-openbsd[pkg-config] + virtual/libintl" DEPEND="${RDEPEND}" S=${WORKDIR}/${MY_P} @@ -40,13 +41,21 @@ DOCS=( AUTHORS NEWS README ) src_prepare() { sed -i -e "s|^prefix=/usr\$|prefix=${EPREFIX}/usr|" check/simple.pc || die #434320 - epatch_user + eapply_user if [[ ${PV} == *9999* ]]; then eautoreconf else elibtoolize # Required for FreeMiNT wrt #333429 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 + fi } multilib_src_configure() { @@ -62,6 +71,16 @@ multilib_src_configure() { # add the libdir for libtool, otherwise it'll make love with system # installed libiconv append-ldflags "-L${EPREFIX}/usr/$(get_libdir)" + # the glib objects reference symbols from these frameworks, + # not good, esp. since Carbon should be deprecated + [[ ${CHOST} == *-darwin* ]] && \ + append-ldflags -framework CoreFoundation -framework Carbon + if [[ ${CHOST} == *-solaris* ]] ; then + # required due to __EXTENSIONS__ + append-cppflags -DENABLE_NLS + # similar to Darwin + append-ldflags -lintl + fi fi else if ! has_version dev-util/pkgconfig; then