From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <gentoo-commits+bounces-1225315-garchives=archives.gentoo.org@lists.gentoo.org> 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 B8E9113835A for <garchives@archives.gentoo.org>; Wed, 25 Nov 2020 17:46:43 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0DDD0E08BB; Wed, 25 Nov 2020 17:46:43 +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 E97C6E08BB for <gentoo-commits@lists.gentoo.org>; Wed, 25 Nov 2020 17:46:42 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 48C6F3410BD for <gentoo-commits@lists.gentoo.org>; Wed, 25 Nov 2020 17:46:41 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C3007468 for <gentoo-commits@lists.gentoo.org>; Wed, 25 Nov 2020 17:46:39 +0000 (UTC) From: "Mike Gilbert" <floppym@gentoo.org> 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" <floppym@gentoo.org> Message-ID: <1606326343.f80c1bfe84e86a802ee892d9800225c978dca59d.floppym@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/pkgconf/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-util/pkgconf/pkgconf-1.7.3-r1.ebuild dev-util/pkgconf/pkgconf-1.7.3.ebuild dev-util/pkgconf/pkgconf-9999.ebuild X-VCS-Directories: dev-util/pkgconf/ X-VCS-Committer: floppym X-VCS-Committer-Name: Mike Gilbert X-VCS-Revision: f80c1bfe84e86a802ee892d9800225c978dca59d X-VCS-Branch: master Date: Wed, 25 Nov 2020 17:46:39 +0000 (UTC) Precedence: bulk List-Post: <mailto:gentoo-commits@lists.gentoo.org> List-Help: <mailto:gentoo-commits+help@lists.gentoo.org> List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org> List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org> List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org> X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 88eb90ee-ea03-44cb-a1ec-39eafb7a2d35 X-Archives-Hash: 6a172e7cc313474ca0dcccb02410ea10 commit: f80c1bfe84e86a802ee892d9800225c978dca59d Author: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org> AuthorDate: Mon Nov 23 23:00:00 2020 +0000 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> CommitDate: Wed Nov 25 17:45:43 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f80c1bfe dev-util/pkgconf: Include /$(get_libdir) in default system libdir. Bug: https://bugs.gentoo.org/756238 Signed-off-by: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache.Org> Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> dev-util/pkgconf/{pkgconf-1.7.3.ebuild => pkgconf-1.7.3-r1.ebuild} | 7 ++++++- dev-util/pkgconf/pkgconf-9999.ebuild | 7 ++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dev-util/pkgconf/pkgconf-1.7.3.ebuild b/dev-util/pkgconf/pkgconf-1.7.3-r1.ebuild similarity index 89% rename from dev-util/pkgconf/pkgconf-1.7.3.ebuild rename to dev-util/pkgconf/pkgconf-1.7.3-r1.ebuild index a801ef026bf..e1d94a66add 100644 --- a/dev-util/pkgconf/pkgconf-1.7.3.ebuild +++ b/dev-util/pkgconf/pkgconf-1.7.3-r1.ebuild @@ -54,7 +54,12 @@ src_prepare() { multilib_src_configure() { local ECONF_SOURCE="${S}" - econf --disable-static + local args=( + --disable-static + --with-system-includedir="${EPREFIX}/usr/include" + --with-system-libdir="${EPREFIX}/$(get_libdir):${EPREFIX}/usr/$(get_libdir)" + ) + econf "${args[@]}" } multilib_src_test() { diff --git a/dev-util/pkgconf/pkgconf-9999.ebuild b/dev-util/pkgconf/pkgconf-9999.ebuild index 40e4e28319d..d592b7e54f1 100644 --- a/dev-util/pkgconf/pkgconf-9999.ebuild +++ b/dev-util/pkgconf/pkgconf-9999.ebuild @@ -54,7 +54,12 @@ src_prepare() { multilib_src_configure() { local ECONF_SOURCE="${S}" - econf --disable-static + local args=( + --disable-static + --with-system-includedir="${EPREFIX}/usr/include" + --with-system-libdir="${EPREFIX}/$(get_libdir):${EPREFIX}/usr/$(get_libdir)" + ) + econf "${args[@]}" } multilib_src_test() {