commit:     f7d3b09f3ae752b89362a2dbb2f891cae9464145
Author:     Matija Skala <mskala <AT> gmx <DOT> com>
AuthorDate: Mon Nov  4 20:15:49 2019 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Mon Jul 13 15:10:49 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f7d3b09f

dev-util/pkgconf: add support for windows

Signed-off-by: Matija Skala <mskala <AT> gmx.com>
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
Closes: https://github.com/gentoo/gentoo/pull/13549

 dev-util/pkgconf/pkgconf-1.6.3.ebuild | 8 ++++----
 dev-util/pkgconf/pkgconf-1.7.2.ebuild | 8 ++++----
 dev-util/pkgconf/pkgconf-1.7.3.ebuild | 8 ++++----
 dev-util/pkgconf/pkgconf-9999.ebuild  | 8 ++++----
 4 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/dev-util/pkgconf/pkgconf-1.6.3.ebuild 
b/dev-util/pkgconf/pkgconf-1.6.3.ebuild
index da69ae46ca8..114a0bfd9d0 100644
--- a/dev-util/pkgconf/pkgconf-1.6.3.ebuild
+++ b/dev-util/pkgconf/pkgconf-1.6.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit multilib-minimal
+inherit multilib multilib-minimal
 
 if [[ ${PV} == "9999" ]] ; then
        inherit autotools git-r3
@@ -38,7 +38,7 @@ RDEPEND="
 "
 
 MULTILIB_CHOST_TOOLS=(
-       /usr/bin/pkgconf
+       /usr/bin/pkgconf$(get_exeext)
 )
 
 src_prepare() {
@@ -47,7 +47,7 @@ src_prepare() {
        [[ ${PV} == "9999" ]] && eautoreconf
        if use pkg-config; then
                MULTILIB_CHOST_TOOLS+=(
-                       /usr/bin/pkg-config
+                       /usr/bin/pkg-config$(get_exeext)
                )
        fi
 }
@@ -66,7 +66,7 @@ multilib_src_install() {
        default
 
        if use pkg-config; then
-               dosym pkgconf /usr/bin/pkg-config
+               dosym pkgconf$(get_exeext) /usr/bin/pkg-config$(get_exeext)
                dosym pkgconf.1 /usr/share/man/man1/pkg-config.1
        else
                rm "${ED}"/usr/share/aclocal/pkg.m4 || die

diff --git a/dev-util/pkgconf/pkgconf-1.7.2.ebuild 
b/dev-util/pkgconf/pkgconf-1.7.2.ebuild
index c5741a92475..40e4e28319d 100644
--- a/dev-util/pkgconf/pkgconf-1.7.2.ebuild
+++ b/dev-util/pkgconf/pkgconf-1.7.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit multilib-minimal
+inherit multilib multilib-minimal
 
 if [[ ${PV} == "9999" ]] ; then
        inherit autotools git-r3
@@ -38,7 +38,7 @@ RDEPEND="
 "
 
 MULTILIB_CHOST_TOOLS=(
-       /usr/bin/pkgconf
+       /usr/bin/pkgconf$(get_exeext)
 )
 
 src_prepare() {
@@ -47,7 +47,7 @@ src_prepare() {
        [[ ${PV} == "9999" ]] && eautoreconf
        if use pkg-config; then
                MULTILIB_CHOST_TOOLS+=(
-                       /usr/bin/pkg-config
+                       /usr/bin/pkg-config$(get_exeext)
                )
        fi
 }
@@ -66,7 +66,7 @@ multilib_src_install() {
        default
 
        if use pkg-config; then
-               dosym pkgconf /usr/bin/pkg-config
+               dosym pkgconf$(get_exeext) /usr/bin/pkg-config$(get_exeext)
                dosym pkgconf.1 /usr/share/man/man1/pkg-config.1
        else
                rm "${ED}"/usr/share/aclocal/pkg.m4 || die

diff --git a/dev-util/pkgconf/pkgconf-1.7.3.ebuild 
b/dev-util/pkgconf/pkgconf-1.7.3.ebuild
index c5741a92475..40e4e28319d 100644
--- a/dev-util/pkgconf/pkgconf-1.7.3.ebuild
+++ b/dev-util/pkgconf/pkgconf-1.7.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit multilib-minimal
+inherit multilib multilib-minimal
 
 if [[ ${PV} == "9999" ]] ; then
        inherit autotools git-r3
@@ -38,7 +38,7 @@ RDEPEND="
 "
 
 MULTILIB_CHOST_TOOLS=(
-       /usr/bin/pkgconf
+       /usr/bin/pkgconf$(get_exeext)
 )
 
 src_prepare() {
@@ -47,7 +47,7 @@ src_prepare() {
        [[ ${PV} == "9999" ]] && eautoreconf
        if use pkg-config; then
                MULTILIB_CHOST_TOOLS+=(
-                       /usr/bin/pkg-config
+                       /usr/bin/pkg-config$(get_exeext)
                )
        fi
 }
@@ -66,7 +66,7 @@ multilib_src_install() {
        default
 
        if use pkg-config; then
-               dosym pkgconf /usr/bin/pkg-config
+               dosym pkgconf$(get_exeext) /usr/bin/pkg-config$(get_exeext)
                dosym pkgconf.1 /usr/share/man/man1/pkg-config.1
        else
                rm "${ED}"/usr/share/aclocal/pkg.m4 || die

diff --git a/dev-util/pkgconf/pkgconf-9999.ebuild 
b/dev-util/pkgconf/pkgconf-9999.ebuild
index c5741a92475..40e4e28319d 100644
--- a/dev-util/pkgconf/pkgconf-9999.ebuild
+++ b/dev-util/pkgconf/pkgconf-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit multilib-minimal
+inherit multilib multilib-minimal
 
 if [[ ${PV} == "9999" ]] ; then
        inherit autotools git-r3
@@ -38,7 +38,7 @@ RDEPEND="
 "
 
 MULTILIB_CHOST_TOOLS=(
-       /usr/bin/pkgconf
+       /usr/bin/pkgconf$(get_exeext)
 )
 
 src_prepare() {
@@ -47,7 +47,7 @@ src_prepare() {
        [[ ${PV} == "9999" ]] && eautoreconf
        if use pkg-config; then
                MULTILIB_CHOST_TOOLS+=(
-                       /usr/bin/pkg-config
+                       /usr/bin/pkg-config$(get_exeext)
                )
        fi
 }
@@ -66,7 +66,7 @@ multilib_src_install() {
        default
 
        if use pkg-config; then
-               dosym pkgconf /usr/bin/pkg-config
+               dosym pkgconf$(get_exeext) /usr/bin/pkg-config$(get_exeext)
                dosym pkgconf.1 /usr/share/man/man1/pkg-config.1
        else
                rm "${ED}"/usr/share/aclocal/pkg.m4 || die

Reply via email to