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 984221382C5 for ; Tue, 13 Apr 2021 00:27:00 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 53D78E0BBC; Tue, 13 Apr 2021 00:26:58 +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 38FFDE0BBC for ; Tue, 13 Apr 2021 00:26:58 +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 4E18B335DB8 for ; Tue, 13 Apr 2021 00:26:57 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 879D172D for ; Tue, 13 Apr 2021 00:26:53 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1618273589.e296bca1e7c776f65b62a5288f9074769471767b.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-cluster/ipvsadm/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-cluster/ipvsadm/ipvsadm-1.27-r1.ebuild sys-cluster/ipvsadm/ipvsadm-1.28.ebuild X-VCS-Directories: sys-cluster/ipvsadm/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: e296bca1e7c776f65b62a5288f9074769471767b X-VCS-Branch: master Date: Tue, 13 Apr 2021 00:26:53 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: dd5bd5eb-97a1-4894-8442-15fcd7f3c1cc X-Archives-Hash: 9068d4f922b28f29ed5a6eae53af4111 commit: e296bca1e7c776f65b62a5288f9074769471767b Author: Sam James gentoo org> AuthorDate: Wed Apr 7 05:14:39 2021 +0000 Commit: Sam James gentoo org> CommitDate: Tue Apr 13 00:26:29 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e296bca1 sys-cluster/ipvsadm: call pkg-config via toolchain-funcs.eclass helper This ensures we call the correct pkg-config in e.g. cross. Package-Manager: Portage-3.0.14-prefix, Repoman-3.0.2 Signed-off-by: Sam James gentoo.org> sys-cluster/ipvsadm/ipvsadm-1.27-r1.ebuild | 6 +++--- sys-cluster/ipvsadm/ipvsadm-1.28.ebuild | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/sys-cluster/ipvsadm/ipvsadm-1.27-r1.ebuild b/sys-cluster/ipvsadm/ipvsadm-1.27-r1.ebuild index a9729a137de..b37bfb8058e 100644 --- a/sys-cluster/ipvsadm/ipvsadm-1.27-r1.ebuild +++ b/sys-cluster/ipvsadm/ipvsadm-1.27-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -39,7 +39,7 @@ src_prepare() { src_compile() { local libnl_include if has_version ">=dev-libs/libnl-3.0"; then - libnl_include=$(pkg-config --cflags libnl-3.0) + libnl_include=$($(tc-getPKG_CONFIG) --cflags libnl-3.0) else libnl_include="" fi @@ -48,7 +48,7 @@ src_compile() { CC="$(tc-getCC)" \ HAVE_NL=1 \ STATIC=${STATIC} \ - POPT_LIB="$(pkg-config --libs popt)" + POPT_LIB="$($(tc-getPKG_CONFIG) --libs popt)" } src_install() { diff --git a/sys-cluster/ipvsadm/ipvsadm-1.28.ebuild b/sys-cluster/ipvsadm/ipvsadm-1.28.ebuild index 39f351f5ae9..ed048c1f31b 100644 --- a/sys-cluster/ipvsadm/ipvsadm-1.28.ebuild +++ b/sys-cluster/ipvsadm/ipvsadm-1.28.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -37,7 +37,7 @@ src_prepare() { src_compile() { local libnl_include if has_version ">=dev-libs/libnl-3.0"; then - libnl_include=$(pkg-config --cflags libnl-3.0) + libnl_include=$($(tc-getPKG_CONFIG) --cflags libnl-3.0) else libnl_include="" fi @@ -46,7 +46,7 @@ src_compile() { CC="$(tc-getCC)" \ HAVE_NL=1 \ STATIC=${STATIC} \ - POPT_LIB="$(pkg-config --libs popt)" + POPT_LIB="$($(tc-getPKG_CONFIG)--libs popt)" } src_install() {