dev-util/pkgconf: add support for windows

Signed-off-by: Matija Skala <[email protected]> Signed-off-by: Mike Gilbert <[email protected]> Closes: gentoo#13549
hanetzer · Jul 13, 2020 · f7d3b09 · f7d3b09
1 parent 80d032b
commit f7d3b09
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 16 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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