| 1 |
commit: 1d6d88abf31d2b8cbe45b298f9c7fb7a37e96ca1 |
| 2 |
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Jul 13 18:11:20 2016 +0000 |
| 4 |
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Jul 13 18:13:05 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1d6d88ab |
| 7 |
|
| 8 |
media-libs/phonon: fix multilib build by explicitly specifying the path to qmake |
| 9 |
|
| 10 |
Gentoo-bug: 580304 |
| 11 |
|
| 12 |
Package-Manager: portage-2.3.0 |
| 13 |
|
| 14 |
media-libs/phonon/phonon-4.9.0.ebuild | 1 + |
| 15 |
media-libs/phonon/phonon-9999.ebuild | 1 + |
| 16 |
2 files changed, 2 insertions(+) |
| 17 |
|
| 18 |
diff --git a/media-libs/phonon/phonon-4.9.0.ebuild b/media-libs/phonon/phonon-4.9.0.ebuild |
| 19 |
index ae53534..761ddd3 100644 |
| 20 |
--- a/media-libs/phonon/phonon-4.9.0.ebuild |
| 21 |
+++ b/media-libs/phonon/phonon-4.9.0.ebuild |
| 22 |
@@ -70,6 +70,7 @@ multilib_src_configure() { |
| 23 |
-DWITH_GLIB2=$(usex pulseaudio) |
| 24 |
-DWITH_PulseAudio=$(usex pulseaudio) |
| 25 |
$(multilib_is_native_abi && echo -DWITH_QZeitgeist=$(usex zeitgeist) || echo -DWITH_QZeitgeist=OFF) |
| 26 |
+ -DQT_QMAKE_EXECUTABLE="$(${QT_MULTIBUILD_VARIANT}_get_bindir)"/qmake |
| 27 |
) |
| 28 |
|
| 29 |
if [[ ${QT_MULTIBUILD_VARIANT} = qt4 ]]; then |
| 30 |
|
| 31 |
diff --git a/media-libs/phonon/phonon-9999.ebuild b/media-libs/phonon/phonon-9999.ebuild |
| 32 |
index ae53534..761ddd3 100644 |
| 33 |
--- a/media-libs/phonon/phonon-9999.ebuild |
| 34 |
+++ b/media-libs/phonon/phonon-9999.ebuild |
| 35 |
@@ -70,6 +70,7 @@ multilib_src_configure() { |
| 36 |
-DWITH_GLIB2=$(usex pulseaudio) |
| 37 |
-DWITH_PulseAudio=$(usex pulseaudio) |
| 38 |
$(multilib_is_native_abi && echo -DWITH_QZeitgeist=$(usex zeitgeist) || echo -DWITH_QZeitgeist=OFF) |
| 39 |
+ -DQT_QMAKE_EXECUTABLE="$(${QT_MULTIBUILD_VARIANT}_get_bindir)"/qmake |
| 40 |
) |
| 41 |
|
| 42 |
if [[ ${QT_MULTIBUILD_VARIANT} = qt4 ]]; then |
Archives