diff options
author | Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> | 2012-04-18 09:30:58 +0000 |
---|---|---|
committer | Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> | 2012-04-18 09:30:58 +0000 |
commit | 3f2f15d677d5cd2e4d292ca5c1bbbd9f038cd21e (patch) | |
tree | 687101dd56bd648ec8c488d5171d6b934e42ba40 /net-wireless | |
parent | Version bump, thanks everyone in bug #297128. Remove old (diff) | |
download | gentoo-2-3f2f15d677d5cd2e4d292ca5c1bbbd9f038cd21e.tar.gz gentoo-2-3f2f15d677d5cd2e4d292ca5c1bbbd9f038cd21e.tar.bz2 gentoo-2-3f2f15d677d5cd2e4d292ca5c1bbbd9f038cd21e.zip |
Fix building in the absence of qt-qt3support, add -j1 to emake install, bug #412449.
(Portage version: 2.2.0_alpha100/cvs/Linux x86_64)
Diffstat (limited to 'net-wireless')
-rw-r--r-- | net-wireless/gnuradio/ChangeLog | 7 | ||||
-rw-r--r-- | net-wireless/gnuradio/gnuradio-3.5.3.ebuild | 7 |
2 files changed, 11 insertions, 3 deletions
diff --git a/net-wireless/gnuradio/ChangeLog b/net-wireless/gnuradio/ChangeLog index 07966539da40..fc98f7e8e363 100644 --- a/net-wireless/gnuradio/ChangeLog +++ b/net-wireless/gnuradio/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for net-wireless/gnuradio # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-wireless/gnuradio/ChangeLog,v 1.3 2012/04/18 09:05:01 chithanh Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-wireless/gnuradio/ChangeLog,v 1.4 2012/04/18 09:30:58 chithanh Exp $ + + 18 Apr 2012; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> + gnuradio-3.5.3.ebuild: + Fix building in the absence of qt-qt3support, add -j1 to emake install, bug + #412449. 18 Apr 2012; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> gnuradio-3.5.3.ebuild: diff --git a/net-wireless/gnuradio/gnuradio-3.5.3.ebuild b/net-wireless/gnuradio/gnuradio-3.5.3.ebuild index e2c173bcbd68..9aec8c8c1df4 100644 --- a/net-wireless/gnuradio/gnuradio-3.5.3.ebuild +++ b/net-wireless/gnuradio/gnuradio-3.5.3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-wireless/gnuradio/gnuradio-3.5.3.ebuild,v 1.3 2012/04/18 09:05:01 chithanh Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-wireless/gnuradio/gnuradio-3.5.3.ebuild,v 1.4 2012/04/18 09:30:58 chithanh Exp $ EAPI=4 PYTHON_DEPEND="2" @@ -69,6 +69,8 @@ pkg_setup() { src_prepare() { python_convert_shebangs -q -r 2 "${S}" + # Useless UI element would require qt3support, bug #365019 + sed -i '/qPixmapFromMimeSource/d' "${S}"/gr-qtgui/lib/spectrumdisplayform.ui || die # TODO: DEPDIR is not created, need to investigate why mkdir "${S}"/gnuradio-core/src/lib/general/.deps || die mkdir "${S}"/gnuradio-core/src/lib/gengen/.deps || die @@ -105,7 +107,8 @@ src_configure() { } src_install() { - emake DESTDIR="${ED}" install + # Fails to install with parallel make sometimes, bug #412449 + emake -j1 DESTDIR="${ED}" install python_clean_installation_image -q |