From 0e4a36d2146f20372a69359487e8660dd00a27fb Mon Sep 17 00:00:00 2001 From: Arfrever Frehtes Taifersar Arahesis Date: Mon, 29 Apr 2019 01:45:58 +0000 Subject: [PATCH] xorg-2.eclass, xorg-3.eclass: Depend on virtual/pkgconfig[${MULTILIB_USEDEP}] when multilib support is enabled. Fixes: https://bugs.gentoo.org/684494 Signed-off-by: Arfrever Frehtes Taifersar Arahesis Signed-off-by: Matt Turner --- eclass/xorg-2.eclass | 8 ++++++-- eclass/xorg-3.eclass | 6 +++++- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/eclass/xorg-2.eclass b/eclass/xorg-2.eclass index 0bba5bb7a369c..6034da49bc325 100644 --- a/eclass/xorg-2.eclass +++ b/eclass/xorg-2.eclass @@ -172,7 +172,7 @@ fi # QA: configure: WARNING: unrecognized options: --disable-static : ${XORG_STATIC:="yes"} -# Add static-libs useflag where usefull. +# Add static-libs useflag where useful. if [[ ${XORG_STATIC} == yes \ && ${FONT} != yes \ && ${CATEGORY} != app-doc \ @@ -186,7 +186,11 @@ if [[ ${XORG_STATIC} == yes \ IUSE+=" static-libs" fi -DEPEND+=" virtual/pkgconfig" +if [[ ${XORG_MULTILIB} == yes ]]; then + DEPEND+=" virtual/pkgconfig[${MULTILIB_USEDEP}]" +else + DEPEND+=" virtual/pkgconfig" +fi # @ECLASS-VARIABLE: XORG_DRI # @DESCRIPTION: diff --git a/eclass/xorg-3.eclass b/eclass/xorg-3.eclass index 557a65233cb7e..6ac90a64d59d9 100644 --- a/eclass/xorg-3.eclass +++ b/eclass/xorg-3.eclass @@ -140,7 +140,11 @@ if [[ ${XORG_STATIC} == yes \ IUSE+=" static-libs" fi -BDEPEND+=" virtual/pkgconfig" +if [[ ${XORG_MULTILIB} == yes ]]; then + BDEPEND+=" virtual/pkgconfig[${MULTILIB_USEDEP}]" +else + BDEPEND+=" virtual/pkgconfig" +fi # @ECLASS-VARIABLE: XORG_DRI # @DESCRIPTION: