summaryrefslogtreecommitdiff
path: root/dev-db
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
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')
-rw-r--r--dev-db/postgis/ChangeLog5
-rw-r--r--dev-db/postgis/Manifest10
-rw-r--r--dev-db/postgis/postgis-1.5.2-r3.ebuild16
3 files changed, 18 insertions, 13 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/Manifest b/dev-db/postgis/Manifest
index c8638a83ce5f..3fc0b9141921 100644
--- a/dev-db/postgis/Manifest
+++ b/dev-db/postgis/Manifest
@@ -14,14 +14,14 @@ EBUILD postgis-1.3.6-r1.ebuild 5586 RMD160 d824f89bac4d74bdb2a526ae25ae3ae730c48
EBUILD postgis-1.4.0.ebuild 5535 RMD160 d88ae3b22c6d56650e8473c33e944121da8e7e14 SHA1 0375209a5e716347818bc9da3300396c91ea4762 SHA256 f1d5082611460dd01e026d79e1e0ba7faa9554a17d1ed9cf4355af9a1a46ac28
EBUILD postgis-1.5.0-r1.ebuild 5949 RMD160 616de40fc630f742ce04c2f1d699369c7b7e368c SHA1 2e2242f20ad26b136927af98da14fd2d0c75262a SHA256 a958f14851095d90bd00dab8775ebb5de2a63377ec0fa134b7c8b122a4cbd341
EBUILD postgis-1.5.0.ebuild 5554 RMD160 009a41a7162c935c7d321e5fb6d2a21d9b066270 SHA1 77c9bf519d40c0e497b9a8a28fbf337d070584fb SHA256 a3a6f2baa1c8deb9c8cc7dd91523e70ff48895e46ce748c521dc227afff8b023
-EBUILD postgis-1.5.2-r3.ebuild 7011 RMD160 4cb94e821d4dfe62265ada6c16d301fc4ac222a7 SHA1 3bc8aeecd54ad4a08e53bcc66115aacd3f30b718 SHA256 c9fccfa3e98c71aba9cf25b94e6060ccd54abac3444c2f35ac4475123bc1a358
+EBUILD postgis-1.5.2-r3.ebuild 7027 RMD160 794150f429f9c2587ec6dbc7fdccdf50e7ecda34 SHA1 bea14836cb1cb7936a6e65cfd9589108317179a5 SHA256 bcbba85d17e011faf1f0b0d60abac21f814d551c896f07b0d32c3e39756b401b
EBUILD postgis-1.5.2.ebuild 5946 RMD160 5aa7c66101ba5faf4e309860fd56fb87e2709967 SHA1 b21b24835cce9a8dc7059dca551d161c098089e9 SHA256 3f9fef73adce04ee5f4582cb5c404da482b549230024a4326798b15fd42bbbae
-MISC ChangeLog 7162 RMD160 9dcdf86944d2b961395f6aed2dde308b9678177f SHA1 e11342a0c139dfe090bfcd5a211c6c320f1420f8 SHA256 a50f7fec8453576322c2bf813d5de9725e84f69668c84da4c73dbcca57fdae93
+MISC ChangeLog 7318 RMD160 9734a4569ddb193aa71be9e0253ccaa42dcb74d0 SHA1 4655a825d943c9ea918f33988e057557a6c4f0ec SHA256 d60497bab29cc67bc62ae43009f02bfa9a9581c31f5368fb9282b33976a98ac3
MISC metadata.xml 481 RMD160 09ed331d86c1d68797aaf8a4912539f08f91cbb6 SHA1 a45afb667212035b630d417d2fc9632d99bbd62a SHA256 d0ab8dbe26001259f36c968e1d48ad5fda768227d99319cf4302af804a08d5ef
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.17 (GNU/Linux)
-iEYEARECAAYFAk37KHsACgkQHB6c3gNBRYeoQQCgnohS7EyAua2rbzZ+QDuKmogo
-Y2AAn3++Ea3Iile5paWzpHP4iIkkvIMA
-=FwDi
+iEYEARECAAYFAk37KPYACgkQHB6c3gNBRYdq4QCfb7qX4fTZcfSyD+CCniVwHzpH
+pYMAn2095ofdm+WRELFO11R5TlO+mJvv
+=d5qq
-----END PGP SIGNATURE-----
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