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 1BFF1139694 for ; Tue, 11 Apr 2017 01:52:45 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D035621C1F3; Tue, 11 Apr 2017 01:52:42 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id AF93521C1F3 for ; Tue, 11 Apr 2017 01:52:42 +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 7933E340A23 for ; Tue, 11 Apr 2017 01:52:41 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D595B742B for ; Tue, 11 Apr 2017 01:52:39 +0000 (UTC) From: "Mart Raudsepp" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mart Raudsepp" Message-ID: <1491875522.cd4ccb9ea11b995ec9ecc751ab57241fbef78195.leio@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/glib/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-libs/glib/glib-2.50.3-r1.ebuild X-VCS-Directories: dev-libs/glib/ X-VCS-Committer: leio X-VCS-Committer-Name: Mart Raudsepp X-VCS-Revision: cd4ccb9ea11b995ec9ecc751ab57241fbef78195 X-VCS-Branch: master Date: Tue, 11 Apr 2017 01:52:39 +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: 992bc908-ec4b-4be9-8714-9b98ee5e93b5 X-Archives-Hash: 7f2bb01ec9c7ae5fc8a4a3a3d01fb616 commit: cd4ccb9ea11b995ec9ecc751ab57241fbef78195 Author: Mart Raudsepp gentoo org> AuthorDate: Tue Apr 11 01:35:10 2017 +0000 Commit: Mart Raudsepp gentoo org> CommitDate: Tue Apr 11 01:52:02 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cd4ccb9e dev-libs/glib: Export PCRE_LIBS in the no-pkgconfig case We have by now started to use the system libpcre unconditionally, instead of the bundled version, but this needs pkgconfig to be found. So we need to handle this in the no-pkgconfig case as well, alongside FFI. However this suggests there is no point in this case anymore and we should just build depend on pkgconfig, as we can't get a working pkgconfig anymore without bootstrapping it via USE=internal-glib as libpcre currently needs pkgconfig as a build dependency already. Until this is still in the pondering phase, this PCRE_LIBS exporting should at least fix the cases where pkgconfig got depcleaned inbetween but libpcre exists on system. Gentoo-bug: 615092 dev-libs/glib/glib-2.50.3-r1.ebuild | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dev-libs/glib/glib-2.50.3-r1.ebuild b/dev-libs/glib/glib-2.50.3-r1.ebuild index 6ba56d741c2..deabfe82c59 100644 --- a/dev-libs/glib/glib-2.50.3-r1.ebuild +++ b/dev-libs/glib/glib-2.50.3-r1.ebuild @@ -148,6 +148,8 @@ multilib_src_configure() { fi export LIBFFI_CFLAGS="-I$(echo /usr/$(get_libdir)/libffi-*/include)" export LIBFFI_LIBS="-lffi" + export PCRE_CFLAGS="" + export PCRE_LIBS="-lpcre" fi # These configure tests don't work when cross-compiling.