| 1 |
commit: 0e4a36d2146f20372a69359487e8660dd00a27fb |
| 2 |
Author: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org> |
| 3 |
AuthorDate: Mon Apr 29 01:45:58 2019 +0000 |
| 4 |
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Apr 29 19:57:19 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e4a36d2 |
| 7 |
|
| 8 |
xorg-2.eclass, xorg-3.eclass: Depend on virtual/pkgconfig[${MULTILIB_USEDEP}] when multilib support is enabled. |
| 9 |
|
| 10 |
Fixes: https://bugs.gentoo.org/684494 |
| 11 |
Signed-off-by: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache.Org> |
| 12 |
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> |
| 13 |
|
| 14 |
eclass/xorg-2.eclass | 8 ++++++-- |
| 15 |
eclass/xorg-3.eclass | 6 +++++- |
| 16 |
2 files changed, 11 insertions(+), 3 deletions(-) |
| 17 |
|
| 18 |
diff --git a/eclass/xorg-2.eclass b/eclass/xorg-2.eclass |
| 19 |
index 0bba5bb7a36..6034da49bc3 100644 |
| 20 |
--- a/eclass/xorg-2.eclass |
| 21 |
+++ b/eclass/xorg-2.eclass |
| 22 |
@@ -172,7 +172,7 @@ fi |
| 23 |
# QA: configure: WARNING: unrecognized options: --disable-static |
| 24 |
: ${XORG_STATIC:="yes"} |
| 25 |
|
| 26 |
-# Add static-libs useflag where usefull. |
| 27 |
+# Add static-libs useflag where useful. |
| 28 |
if [[ ${XORG_STATIC} == yes \ |
| 29 |
&& ${FONT} != yes \ |
| 30 |
&& ${CATEGORY} != app-doc \ |
| 31 |
@@ -186,7 +186,11 @@ if [[ ${XORG_STATIC} == yes \ |
| 32 |
IUSE+=" static-libs" |
| 33 |
fi |
| 34 |
|
| 35 |
-DEPEND+=" virtual/pkgconfig" |
| 36 |
+if [[ ${XORG_MULTILIB} == yes ]]; then |
| 37 |
+ DEPEND+=" virtual/pkgconfig[${MULTILIB_USEDEP}]" |
| 38 |
+else |
| 39 |
+ DEPEND+=" virtual/pkgconfig" |
| 40 |
+fi |
| 41 |
|
| 42 |
# @ECLASS-VARIABLE: XORG_DRI |
| 43 |
# @DESCRIPTION: |
| 44 |
|
| 45 |
diff --git a/eclass/xorg-3.eclass b/eclass/xorg-3.eclass |
| 46 |
index 557a65233cb..6ac90a64d59 100644 |
| 47 |
--- a/eclass/xorg-3.eclass |
| 48 |
+++ b/eclass/xorg-3.eclass |
| 49 |
@@ -140,7 +140,11 @@ if [[ ${XORG_STATIC} == yes \ |
| 50 |
IUSE+=" static-libs" |
| 51 |
fi |
| 52 |
|
| 53 |
-BDEPEND+=" virtual/pkgconfig" |
| 54 |
+if [[ ${XORG_MULTILIB} == yes ]]; then |
| 55 |
+ BDEPEND+=" virtual/pkgconfig[${MULTILIB_USEDEP}]" |
| 56 |
+else |
| 57 |
+ BDEPEND+=" virtual/pkgconfig" |
| 58 |
+fi |
| 59 |
|
| 60 |
# @ECLASS-VARIABLE: XORG_DRI |
| 61 |
# @DESCRIPTION: |
Archives