diff options
| author |   Sam James <sam@gentoo.org> | 2021-04-07 06:11:07 +0100 |
|---|---|---|
| committer | Sam James <sam@gentoo.org> | 2021-04-13 00:26:01 +0000 |
| commit | 5b8909f23c0a764a9a481adbb27bfa161229775e (patch) | |
| tree | 331a504f58896eced7c1bbcaef8dec94946e23cb /app-arch | |
| parent | sys-libs/binutils-libs: Stabilize 2.35.2 arm, #779805 (diff) | |
| download | gentoo-5b8909f23c0a764a9a481adbb27bfa161229775e.tar.gz gentoo-5b8909f23c0a764a9a481adbb27bfa161229775e.tar.bz2 gentoo-5b8909f23c0a764a9a481adbb27bfa161229775e.zip | |
app-arch/xar: 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 <sam@gentoo.org>
Diffstat (limited to 'app-arch')
| -rw-r--r-- | app-arch/xar/xar-1.8-r2.ebuild | 9 | ||||
| -rw-r--r-- | app-arch/xar/xar-1.8-r3.ebuild | 9 | ||||
| -rw-r--r-- | app-arch/xar/xar-1.8-r4.ebuild | 5 |
3 files changed, 15 insertions, 8 deletions
diff --git a/app-arch/xar/xar-1.8-r2.ebuild b/app-arch/xar/xar-1.8-r2.ebuild index 1b681345aa51..ba228b74359a 100644 --- a/app-arch/xar/xar-1.8-r2.ebuild +++ b/app-arch/xar/xar-1.8-r2.ebuild @@ -14,7 +14,7 @@ SLOT="0" KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="libressl kernel_Darwin" -DEPEND=" +RDEPEND=" !kernel_Darwin? ( !kernel_SunOS? ( virtual/acl ) !libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] ) @@ -24,7 +24,10 @@ DEPEND=" sys-libs/zlib[${MULTILIB_USEDEP}] dev-libs/libxml2[${MULTILIB_USEDEP}] " -RDEPEND="${DEPEND}" +DEPEND=" + ${RDEPEND} + virtual/pkgconfig +" PATCHES=( "${FILESDIR}"/${PN}-1.6.1-ext2.patch @@ -36,7 +39,7 @@ PATCHES=( S=${WORKDIR}/${PN}-${APPLE_PV}/${PN} multilib_src_configure() { - use kernel_Darwin || append-libs $(pkg-config --libs openssl) + use kernel_Darwin || append-libs $($(tc-getPKG_CONFIG) --libs openssl) ECONF_SOURCE=${S} \ econf \ --disable-static diff --git a/app-arch/xar/xar-1.8-r3.ebuild b/app-arch/xar/xar-1.8-r3.ebuild index a93682518b97..fc7d03e52011 100644 --- a/app-arch/xar/xar-1.8-r3.ebuild +++ b/app-arch/xar/xar-1.8-r3.ebuild @@ -14,7 +14,7 @@ SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="libressl kernel_Darwin" -DEPEND=" +RDEPEND=" !kernel_Darwin? ( !kernel_SunOS? ( virtual/acl ) !libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] ) @@ -24,7 +24,10 @@ DEPEND=" sys-libs/zlib[${MULTILIB_USEDEP}] dev-libs/libxml2[${MULTILIB_USEDEP}] " -RDEPEND="${DEPEND}" +DEPEND=" + ${RDEPEND} + virtual/pkgconfig +" PATCHES=( "${FILESDIR}"/${PN}-1.6.1-ext2.patch @@ -54,7 +57,7 @@ src_prepare() { } multilib_src_configure() { - use kernel_Darwin || append-libs $(pkg-config --libs openssl) + use kernel_Darwin || append-libs $($(tc-getPKG_CONFIG) --libs openssl) ECONF_SOURCE=${S} \ econf \ --disable-static diff --git a/app-arch/xar/xar-1.8-r4.ebuild b/app-arch/xar/xar-1.8-r4.ebuild index 75c3815b66cd..3f0e98d4b6ab 100644 --- a/app-arch/xar/xar-1.8-r4.ebuild +++ b/app-arch/xar/xar-1.8-r4.ebuild @@ -24,6 +24,7 @@ DEPEND=" dev-libs/libxml2[${MULTILIB_USEDEP}] " RDEPEND="${DEPEND}" +BDEPEND="virtual/pkgconfig" PATCHES=( "${FILESDIR}"/${PN}-1.6.1-ext2.patch @@ -65,8 +66,8 @@ src_prepare() { } multilib_src_configure() { - append-libs $(pkg-config --libs openssl) - use elibc_musl && append-libs $(pkg-config --libs fts-standalone) + append-libs $($(tc_getPKG_CONFIG) --libs openssl) + use elibc_musl && append-libs $($(tc-getPKG_CONFIG) --libs fts-standalone) ECONF_SOURCE=${S} \ econf \ --disable-static |