diff options
| author |   Henrik Brix Andersen <brix@gentoo.org> | 2006-06-24 16:35:52 +0000 |
|---|---|---|
| committer | Henrik Brix Andersen <brix@gentoo.org> | 2006-06-24 16:35:52 +0000 |
| commit | 32e3934504c5040f0a301c772d1154c8854d9db0 (patch) | |
| tree | 9bdfc468b130b352f2e7f1ce830a20bf03505021 /net-wireless/wpa_supplicant | |
| parent | Version bump on CPAN (diff) | |
| download | gentoo-2-32e3934504c5040f0a301c772d1154c8854d9db0.tar.gz gentoo-2-32e3934504c5040f0a301c772d1154c8854d9db0.tar.bz2 gentoo-2-32e3934504c5040f0a301c772d1154c8854d9db0.zip | |
Fix compilation with USE=qt3 when Qt-4 is installed.
(Portage version: 2.1)
Diffstat (limited to 'net-wireless/wpa_supplicant')
5 files changed, 22 insertions, 9 deletions
diff --git a/net-wireless/wpa_supplicant/ChangeLog b/net-wireless/wpa_supplicant/ChangeLog index 417f516cc5b0..85a95b0738e0 100644 --- a/net-wireless/wpa_supplicant/ChangeLog +++ b/net-wireless/wpa_supplicant/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for net-wireless/wpa_supplicant # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/ChangeLog,v 1.62 2006/06/24 16:10:09 brix Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/ChangeLog,v 1.63 2006/06/24 16:35:52 brix Exp $ + + 24 Jun 2006; Henrik Brix Andersen <brix@gentoo.org> + wpa_supplicant-0.4.7.ebuild, wpa_supplicant-0.4.8.ebuild, + wpa_supplicant-0.4.9.ebuild, wpa_supplicant-0.5.4.ebuild: + Fix compilation with USE=qt3 when Qt-4 is installed. 24 Jun 2006; Henrik Brix Andersen <brix@gentoo.org> -files/wpa_supplicant-0.5.2-wpa_cli.sh, diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-0.4.7.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-0.4.7.ebuild index 156d6a6172af..3b243434d11e 100644 --- a/net-wireless/wpa_supplicant/wpa_supplicant-0.4.7.ebuild +++ b/net-wireless/wpa_supplicant/wpa_supplicant-0.4.7.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/wpa_supplicant-0.4.7.ebuild,v 1.7 2006/06/24 16:10:09 brix Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/wpa_supplicant-0.4.7.ebuild,v 1.8 2006/06/24 16:35:52 brix Exp $ inherit eutils toolchain-funcs @@ -93,7 +93,9 @@ src_compile() { emake || die "emake wpa_gui-qt4 failed" elif use qt3; then [[ -d ${QTDIR}/etc/settings ]] && addwrite ${QTDIR}/etc/settings - emake wpa_gui || die "emake wpa_gui failed" + /usr/qt/3/bin/qmake -o "${S}"/wpa_gui/Makefile "${S}"/wpa_gui/wpa_gui.pro + cd "${S}"/wpa_gui + emake || die "emake wpa_gui failed" fi } diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-0.4.8.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-0.4.8.ebuild index 5d3c8a44e9ef..4a0cb95525d5 100644 --- a/net-wireless/wpa_supplicant/wpa_supplicant-0.4.8.ebuild +++ b/net-wireless/wpa_supplicant/wpa_supplicant-0.4.8.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/wpa_supplicant-0.4.8.ebuild,v 1.7 2006/06/24 16:10:09 brix Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/wpa_supplicant-0.4.8.ebuild,v 1.8 2006/06/24 16:35:52 brix Exp $ inherit eutils toolchain-funcs @@ -100,7 +100,9 @@ src_compile() { emake || die "emake wpa_gui-qt4 failed" elif use qt3; then [[ -d ${QTDIR}/etc/settings ]] && addwrite ${QTDIR}/etc/settings - emake wpa_gui || die "emake wpa_gui failed" + /usr/qt/3/bin/qmake -o "${S}"/wpa_gui/Makefile "${S}"/wpa_gui/wpa_gui.pro + cd "${S}"/wpa_gui + emake || die "emake wpa_gui failed" fi } diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-0.4.9.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-0.4.9.ebuild index 794421c5dc1c..d78a0a8f678b 100644 --- a/net-wireless/wpa_supplicant/wpa_supplicant-0.4.9.ebuild +++ b/net-wireless/wpa_supplicant/wpa_supplicant-0.4.9.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/wpa_supplicant-0.4.9.ebuild,v 1.2 2006/06/24 16:10:09 brix Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/wpa_supplicant-0.4.9.ebuild,v 1.3 2006/06/24 16:35:52 brix Exp $ inherit eutils toolchain-funcs @@ -121,7 +121,9 @@ src_compile() { emake || die "emake wpa_gui-qt4 failed" elif use qt3; then [[ -d ${QTDIR}/etc/settings ]] && addwrite ${QTDIR}/etc/settings - emake wpa_gui || die "emake wpa_gui failed" + /usr/qt/3/bin/qmake -o "${S}"/wpa_gui/Makefile "${S}"/wpa_gui/wpa_gui.pro + cd "${S}"/wpa_gui + emake || die "emake wpa_gui failed" fi } diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-0.5.4.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-0.5.4.ebuild index 50993142a1a2..253e91e2dc2b 100644 --- a/net-wireless/wpa_supplicant/wpa_supplicant-0.5.4.ebuild +++ b/net-wireless/wpa_supplicant/wpa_supplicant-0.5.4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/wpa_supplicant-0.5.4.ebuild,v 1.2 2006/06/24 16:10:09 brix Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/wpa_supplicant-0.5.4.ebuild,v 1.3 2006/06/24 16:35:52 brix Exp $ inherit eutils toolchain-funcs @@ -126,7 +126,9 @@ src_compile() { emake || die "emake wpa_gui-qt4 failed" elif use qt3; then [[ -d ${QTDIR}/etc/settings ]] && addwrite ${QTDIR}/etc/settings - emake wpa_gui || die "emake wpa_gui failed" + /usr/qt/3/bin/qmake -o "${S}"/wpa_gui/Makefile "${S}"/wpa_gui/wpa_gui.pro + cd "${S}"/wpa_gui + emake || die "emake wpa_gui failed" fi } |