diff options
| author |   Tomas Chvatal <scarabeus@gentoo.org> | 2011-06-17 10:14:09 +0000 |
|---|---|---|
| committer | Tomas Chvatal <scarabeus@gentoo.org> | 2011-06-17 10:14:09 +0000 |
| commit | 0cbbdd67172185397d3b48985fb7d4122bb21e49 (patch) | |
| tree | 942597abcdaef5d286189902018961bf129e6cec /dev-db/postgis | |
| parent | Reorder configure/compile phases for readability. No functional changes. (diff) | |
| download | gentoo-2-0cbbdd67172185397d3b48985fb7d4122bb21e49.tar.gz gentoo-2-0cbbdd67172185397d3b48985fb7d4122bb21e49.tar.bz2 gentoo-2-0cbbdd67172185397d3b48985fb7d4122bb21e49.zip | |
Reorder src_install and set -j1 only once into global MAKEOPTS variable.
(Portage version: 2.2.0_alpha38/cvs/Linux x86_64)
Diffstat (limited to 'dev-db/postgis')
| -rw-r--r-- | dev-db/postgis/ChangeLog | 5 | ||||
| -rw-r--r-- | dev-db/postgis/postgis-1.5.2-r3.ebuild | 16 |
2 files changed, 13 insertions, 8 deletions
diff --git a/dev-db/postgis/ChangeLog b/dev-db/postgis/ChangeLog index 4b520840daab..31d74b0067ae 100644 --- a/dev-db/postgis/ChangeLog +++ b/dev-db/postgis/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-db/postgis # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/postgis/ChangeLog,v 1.51 2011/06/17 10:12:05 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/postgis/ChangeLog,v 1.52 2011/06/17 10:14:09 scarabeus Exp $ + + 17 Jun 2011; Tomáš Chvátal <scarabeus@gentoo.org> postgis-1.5.2-r3.ebuild: + Reorder src_install and set -j1 only once into global MAKEOPTS variable. 17 Jun 2011; Tomáš Chvátal <scarabeus@gentoo.org> postgis-1.5.2-r3.ebuild: Reorder configure/compile phases for readability. No functional changes. diff --git a/dev-db/postgis/postgis-1.5.2-r3.ebuild b/dev-db/postgis/postgis-1.5.2-r3.ebuild index 2239444a9488..b08fb688b39e 100644 --- a/dev-db/postgis/postgis-1.5.2-r3.ebuild +++ b/dev-db/postgis/postgis-1.5.2-r3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/postgis/postgis-1.5.2-r3.ebuild,v 1.2 2011/06/17 10:12:05 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/postgis/postgis-1.5.2-r3.ebuild,v 1.3 2011/06/17 10:14:09 scarabeus Exp $ EAPI="4" @@ -43,6 +43,9 @@ RESTRICT="test" PGIS="$(get_version_component_range 1-2)" +# not parallel safe +MAKEOPTS+=" -j1" + pkg_setup() { export PGSLOT="$(postgresql-config show)" if [[ ${PGSLOT//.} < 83 ]] ; then @@ -69,15 +72,14 @@ src_configure() { src_compile() { # Occasionally, builds fail because of out of order compilation. # Otherwise, it'd be fine. - emake -j1 - emake -j1 -C topology - use doc && emake -j1 -C doc + emake + emake -C topology + use doc && emake -C doc } src_install() { - emake -j1 DESTDIR="${D}" install - cd topology/ - emake -j1 DESTDIR="${D}" install + emake DESTDIR="${D}" install + emake -C topology DESTDIR="${D}" install cd "${S}" dodoc CREDITS TODO loader/README.* doc/*txt |