summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomas Chvatal <scarabeus@gentoo.org>2011-06-17 10:14:09 +0000
committerTomas Chvatal <scarabeus@gentoo.org>2011-06-17 10:14:09 +0000
commitbc561c59f3e613fc3471285609bf72501584a903 (patch)
tree43a3411c4a2884a8a5b41ede8bc8b1ee968cce81 /dev-db/postgis/postgis-1.5.2-r3.ebuild
parentReorder configure/compile phases for readability. No functional changes. (diff)
downloadhistorical-bc561c59f3e613fc3471285609bf72501584a903.tar.gz
historical-bc561c59f3e613fc3471285609bf72501584a903.tar.bz2
historical-bc561c59f3e613fc3471285609bf72501584a903.zip
Reorder src_install and set -j1 only once into global MAKEOPTS variable.
Package-Manager: portage-2.2.0_alpha38/cvs/Linux x86_64
Diffstat (limited to 'dev-db/postgis/postgis-1.5.2-r3.ebuild')
-rw-r--r--dev-db/postgis/postgis-1.5.2-r3.ebuild16
1 files changed, 9 insertions, 7 deletions
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