diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2010-07-18 18:04:52 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2010-07-18 18:04:52 +0000 |
| commit | 582548d550c4facc92c46f49b35526ff615d32e3 (patch) | |
| tree | d2bda06fe7969164c7c58f2e2043581ed6554799 /net-p2p | |
| parent | ppc64 stable wrt #326241 (diff) | |
| download | gentoo-2-582548d550c4facc92c46f49b35526ff615d32e3.tar.gz gentoo-2-582548d550c4facc92c46f49b35526ff615d32e3.tar.bz2 gentoo-2-582548d550c4facc92c46f49b35526ff615d32e3.zip | |
Remove everything except -j flags from MAKEOPTS wrt #259162 by Max Klinger.
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'net-p2p')
| -rw-r--r-- | net-p2p/linuxdcpp/ChangeLog | 7 | ||||
| -rw-r--r-- | net-p2p/linuxdcpp/linuxdcpp-1.0.3-r1.ebuild | 6 | ||||
| -rw-r--r-- | net-p2p/linuxdcpp/linuxdcpp-9999.ebuild | 8 |
3 files changed, 15 insertions, 6 deletions
diff --git a/net-p2p/linuxdcpp/ChangeLog b/net-p2p/linuxdcpp/ChangeLog index 982189708b60..cdbdaf8f780d 100644 --- a/net-p2p/linuxdcpp/ChangeLog +++ b/net-p2p/linuxdcpp/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for net-p2p/linuxdcpp # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-p2p/linuxdcpp/ChangeLog,v 1.41 2010/06/18 21:51:21 sochotnicky Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-p2p/linuxdcpp/ChangeLog,v 1.42 2010/07/18 18:04:52 ssuominen Exp $ + + 18 Jul 2010; Samuli Suominen <ssuominen@gentoo.org> + linuxdcpp-1.0.3-r1.ebuild, linuxdcpp-9999.ebuild: + Remove everything except -j flags from MAKEOPTS wrt #259162 by Max + Klinger. *linuxdcpp-1.0.3-r1 (18 Jun 2010) diff --git a/net-p2p/linuxdcpp/linuxdcpp-1.0.3-r1.ebuild b/net-p2p/linuxdcpp/linuxdcpp-1.0.3-r1.ebuild index 27c899e4a641..dd39c9ae9d39 100644 --- a/net-p2p/linuxdcpp/linuxdcpp-1.0.3-r1.ebuild +++ b/net-p2p/linuxdcpp/linuxdcpp-1.0.3-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-p2p/linuxdcpp/linuxdcpp-1.0.3-r1.ebuild,v 1.2 2010/06/18 22:09:23 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-p2p/linuxdcpp/linuxdcpp-1.0.3-r1.ebuild,v 1.3 2010/07/18 18:04:52 ssuominen Exp $ EAPI=2 @@ -29,10 +29,12 @@ src_prepare() { } src_compile() { + local sconsopts=$(echo "${MAKEOPTS}" | sed -ne "/-j/ { s/.*\(-j[[:space:]]*[0-9]\+\).*/\1/; p }") + local myconf="" use debug && myconf="${myconf} debug=1" - scons ${myconf} ${MAKEOPTS} CXXFLAGS="${CXXFLAGS}" PREFIX=/usr || die "scons failed" + scons ${myconf} ${sconsopts} CXXFLAGS="${CXXFLAGS}" PREFIX=/usr || die "scons failed" } src_install() { diff --git a/net-p2p/linuxdcpp/linuxdcpp-9999.ebuild b/net-p2p/linuxdcpp/linuxdcpp-9999.ebuild index cc49b82ef005..9b88ff8f7111 100644 --- a/net-p2p/linuxdcpp/linuxdcpp-9999.ebuild +++ b/net-p2p/linuxdcpp/linuxdcpp-9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-p2p/linuxdcpp/linuxdcpp-9999.ebuild,v 1.13 2010/06/18 19:28:36 sochotnicky Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-p2p/linuxdcpp/linuxdcpp-9999.ebuild,v 1.14 2010/07/18 18:04:52 ssuominen Exp $ inherit bzr eutils @@ -14,7 +14,7 @@ IUSE="debug" EBZR_REPO_URI="lp:linuxdcpp" -S="${WORKDIR}/${P}" +S=${WORKDIR}/${P} RDEPEND=">=gnome-base/libglade-2.4 >=x11-libs/gtk+-2.6 @@ -27,10 +27,12 @@ DEPEND="${RDEPEND} >=dev-libs/boost-1.35.0-r2" src_compile() { + local sconsopts=$(echo "${MAKEOPTS}" | sed -ne "/-j/ { s/.*\(-j[[:space:]]*[0-9]\+\).*/\1/; p }") + local myconf="" use debug && myconf="${myconf} debug=1" - scons ${myconf} ${MAKEOPTS} CXXFLAGS="${CXXFLAGS}" PREFIX=/usr || die "scons failed" + scons ${myconf} ${sconsopts} CXXFLAGS="${CXXFLAGS}" PREFIX=/usr || die "scons failed" } src_install() { |