diff options
| author |   Aaron W. Swenson <titanofold@gentoo.org> | 2013-02-06 02:52:58 +0000 |
|---|---|---|
| committer | Aaron W. Swenson <titanofold@gentoo.org> | 2013-02-06 02:52:58 +0000 |
| commit | 143c885233e87dfe6873fcc79d55104130e50c7a (patch) | |
| tree | 85e877ed8ca6566d3d03653eca3671bbe98f0e86 /dev-db | |
| parent | Beta channel bump. (diff) | |
| download | gentoo-2-143c885233e87dfe6873fcc79d55104130e50c7a.tar.gz gentoo-2-143c885233e87dfe6873fcc79d55104130e50c7a.tar.bz2 gentoo-2-143c885233e87dfe6873fcc79d55104130e50c7a.zip | |
Fix recursive make errors by adding MAKEOPTS="-j1"
(Portage version: 2.1.11.31/cvs/Linux x86_64, signed Manifest commit with key D1BBFDA0)
Diffstat (limited to 'dev-db')
| -rw-r--r-- | dev-db/postgis/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-db/postgis/postgis-2.0.2-r1.ebuild | 15 |
2 files changed, 17 insertions, 4 deletions
diff --git a/dev-db/postgis/ChangeLog b/dev-db/postgis/ChangeLog index 8647e053db34..5bda4d9d6042 100644 --- a/dev-db/postgis/ChangeLog +++ b/dev-db/postgis/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-db/postgis # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/postgis/ChangeLog,v 1.74 2013/02/04 14:55:54 titanofold Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/postgis/ChangeLog,v 1.75 2013/02/06 02:52:58 titanofold Exp $ + + 06 Feb 2013; Aaron W. Swenson <titanofold@gentoo.org> + postgis-2.0.2-r1.ebuild: + Fix recursive make errors by adding MAKEOPTS="-j1" 04 Feb 2013; Aaron W. Swenson <titanofold@gentoo.org> postgis-2.0.2-r1.ebuild, +files/postgis-2.0-pkgconfig-json.patch: diff --git a/dev-db/postgis/postgis-2.0.2-r1.ebuild b/dev-db/postgis/postgis-2.0.2-r1.ebuild index b53316e84d80..77c12de91bee 100644 --- a/dev-db/postgis/postgis-2.0.2-r1.ebuild +++ b/dev-db/postgis/postgis-2.0.2-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/postgis/postgis-2.0.2-r1.ebuild,v 1.2 2013/02/04 14:55:54 titanofold Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/postgis/postgis-2.0.2-r1.ebuild,v 1.3 2013/02/06 02:52:58 titanofold Exp $ EAPI="4" @@ -51,6 +51,10 @@ RESTRICT="test" # *FLAGS settings. QA_FLAGS_IGNORED="usr/lib(64)?/(rt)?postgis-${PGIS}\.so" +# Because developers have been fooled into thinking recursive make is a +# good thing. +MAKEOPTS="-j1" + pkg_setup() { export PGSLOT="$(postgresql-config show)" @@ -80,12 +84,17 @@ src_compile() { # Otherwise, it'd be fine. emake emake -C topology - use doc && emake -C doc html -j1 + + if use doc ; then + emake comments + emake cheatsheets + emake -C doc html + fi } src_install() { emake DESTDIR="${D}" install - emake DESTDIR="${D}" comments-install + use doc && emake DESTDIR="${D}" comments-install emake -C topology DESTDIR="${D}" install dobin ./utils/postgis_restore.pl |