summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristoph Junghans <ottxor@gentoo.org>2014-08-11 16:14:27 +0000
committerChristoph Junghans <ottxor@gentoo.org>2014-08-11 16:14:27 +0000
commit5daabe825122e6bbd7dcaae03811762616a6ac13 (patch)
treedcfaf650a04cac1dce6d3fcbc81fd76819e5aa74 /dev-python/mpi4py
parentremoving ruby21 from 0.5.0 for bug 513284 (diff)
downloadhistorical-5daabe825122e6bbd7dcaae03811762616a6ac13.tar.gz
historical-5daabe825122e6bbd7dcaae03811762616a6ac13.tar.bz2
historical-5daabe825122e6bbd7dcaae03811762616a6ac13.zip
fix usage of ldshared (bug #514288)
Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64 Manifest-Sign-Key: 0xC2000586
Diffstat (limited to 'dev-python/mpi4py')
-rw-r--r--dev-python/mpi4py/ChangeLog6
-rw-r--r--dev-python/mpi4py/Manifest31
-rw-r--r--dev-python/mpi4py/files/mpi4py-1.3.1-ldshared.patch24
-rw-r--r--dev-python/mpi4py/mpi4py-1.3.1.ebuild4
4 files changed, 43 insertions, 22 deletions
diff --git a/dev-python/mpi4py/ChangeLog b/dev-python/mpi4py/ChangeLog
index d156b6c096ef..83a9b4c3fdab 100644
--- a/dev-python/mpi4py/ChangeLog
+++ b/dev-python/mpi4py/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-python/mpi4py
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/mpi4py/ChangeLog,v 1.16 2014/08/11 07:06:57 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/mpi4py/ChangeLog,v 1.17 2014/08/11 16:14:09 ottxor Exp $
+
+ 11 Aug 2014; Christoph Junghans <ottxor@gentoo.org>
+ +files/mpi4py-1.3.1-ldshared.patch, mpi4py-1.3.1.ebuild:
+ fix usage of ldshared (bug #514288)
11 Aug 2014; Justin Lecher <jlec@gentoo.org> mpi4py-1.3.1.ebuild:
Add python3.4 support
diff --git a/dev-python/mpi4py/Manifest b/dev-python/mpi4py/Manifest
index bacedccc5c31..cc238c336e82 100644
--- a/dev-python/mpi4py/Manifest
+++ b/dev-python/mpi4py/Manifest
@@ -1,27 +1,20 @@
-----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
+AUX mpi4py-1.3.1-ldshared.patch 1061 SHA256 4075b8111c80b1f406f1d253644830701fe07bf519fdf1cc986872d3eb02c5ec SHA512 06ec533d39ed890a682874447004b0fb21365a4b5af450c55618617dd89eb046de1920457a6dc9be4b33f540f341fa0eb8f333f7938bff4bd1243d3422f8c832 WHIRLPOOL 7a259841e5b6700fed0095bd9ef825bcd64be7cfda0f117b0aad14ce21fee4d739fed00211e056e0c88a2bb0eef72cbeac503de5050f54f179602c4086535fea
AUX mpi4py-1.3.1-py3-test-backport-1.patch 2763 SHA256 00ecae95adb16630b65a1e8d9b51a498133c495b80cde3f08d4b2a81431816d8 SHA512 8df6eff6c6877a0310151c155b67412d439977d2ec403cc1da88c9aafd6800df22d991c3cd71260377a5f263b71045f720f11bd104d6ca3fb074804a9245dad7 WHIRLPOOL 02a9ad8c72065fadbdfe6b1d4aaa9a7dff713e6ec05a4386304137debb075494745dca3fab32181f57cca9e35dbf3755a5d88963c4d9ed5d551ba8bcaabaa849
DIST mpi4py-1.3.1.tar.gz 1046580 SHA256 e7bd2044aaac5a6ea87a87b2ecc73b310bb6efe5026031e33067ea3c2efc3507 SHA512 15e81f2a1e6f6af7a54f0e8ec43ddf36cc565b7fe9e3dd35603c9d128199c5acd1584757ffca999c8826c0bbccf371175d40a7a24c85d3369efd77da5b3b603f WHIRLPOOL e32fef50c8cd8f866e40fb29f90775736cf0ea31c8a3fc4d460cded8b2056bae0c8d847b304c3222d3e5ffc913ca5cc722425e496d35bf41624f9b5ccdf3ead2
-EBUILD mpi4py-1.3.1.ebuild 1282 SHA256 3876560d048c919203acd7e9a550dd4fc220cc2a36a37847de54534999bbfe12 SHA512 faa0387d8cfe202ad332bec635c98e036addc342082f2196a40a265d75a99cb06c3a23744f75f367802ba44bc9e5d8c1df5e6749621c174e02dce03d3e8a75bb WHIRLPOOL a266301b1adbbe8ade0647361d93ac59f58fdf7ae924dd96c1a4d02f839939cc4e5c692a3fbade48167fac0c42e53286456301430106837043e8de6069bf33c4
-MISC ChangeLog 2485 SHA256 024a64de319d0888fd11f2b8365a54bf4e0cbd234b67ef4b8446e0e569c31373 SHA512 9fcf8209aa833f380cb15f98aeeef1142fc04576156cfe60f0e19858981f3fa62bda2ff672d2172f7e3faafc8c0551b48ce11ef09b3ff255857b831427a55038 WHIRLPOOL 6c4f0985942e750e92bbc13107dff1e6f03a479c72dd900ac128657cea49e1dc384b687da7b0e65cdd28f1d4c87b075c5cb47c224385e042e44d2f2da31dcef6
+EBUILD mpi4py-1.3.1.ebuild 1318 SHA256 b1ffb00bec44137483f8ef85ee0d4516e440892191f9db1467173eca48bd0e5e SHA512 e73c41a87d0e6b78a09984b40506bbc2d28eedfd0ba2dd78880e9ef1f812601d793a123747f5105db5fff163471088da4c9ca588d1b0a642b0ea75a47258b67e WHIRLPOOL 3e3572627d9bcb6bddc0a426e51431412b7ba6240c966500fbe60817174c1b2d62411701af789429fc8cef786be28a668f615e28a35fbaf743d508368ccce118
+MISC ChangeLog 2639 SHA256 17c3a9fbc9113b2ac715f31f2f0c6b8fb6ba4d9b66f97219e52ee22ec23d536d SHA512 a4705922f810f7a608ca84e90610d7c451af880ee96191430dcd27ba90cb8f4134e2ba1eb7b06a67a4de8536832fb1314427886a4d6bbe5cd128cc42716e6522 WHIRLPOOL bb94b86e2e9c8221709a9679d06d3c4df5ec6d539eafa798d97eacd2de044b7e6d7e8d1dcb86e70d2aa58c96b18c97b666189b216ff9f4340924e94a0e398238
MISC metadata.xml 934 SHA256 4054d71eee2394e19fdfd6825e11311fca41661c9161b00efb4d0b3750e378bc SHA512 3400a7e1d37bec25694e6d0206a2384204594809a7eb38699f8b0327d79f81205cd48dcf75380402ec5140dd47678d8cc8c52db85185333641e8bda9d242fea9 WHIRLPOOL 9d214574ab572ca98f0394d15d8cd809b323f265cd808032d5b62c3100d9b29dfa2cb350908a8a7926efd3be8ff9616b05328e0d4b2df3bb76bc3cd2eb047019
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2
-iQJ8BAEBCgBmBQJT6GuMXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
-OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirlfQP/RrG4NV+CH6VikXUHwyDHP49
-Rvoii1Fi1P35P9SJNf5HkvM0NbD/g1MRfxPMtxFkABuSc5E/IH2N3aMaeQEL0Nu8
-vbl5/17fLgYoyei4NtJicm48ThB80A7iRQQZBN4crHmKHwHyLr3iEY/quRnNuxmJ
-SEEi3039gU0bHfznDsMWU9GzPv7E2htVES49dLwJYkdzsdxUWGzMzT0uUjPxR+UC
-W42IGc62C4PCUDu8kHUEPqt8EuCyQCHR9+eYoB0KpPpa1cJF5qcWuYFYitzy2VuI
-fPDc9g8sqqnrg1PS611FEPwxrWEW9mx3CubTgfsZC+pU+AN6tDKPl626grAjdv3A
-/i8aCxsvWQhy05A6jmC5ovceEy2ICIxf92xKmwgNH/TX90jlYUBlQmqueGOjEHjq
-ubU7DGwOgKuC0teGmlfTP9fj6RENutInoQBXCrFtGtdwhmXTc/mZgpMgpETzP2Z+
-sGSD7ceAdNkiUalWQ6yJ1Uf/WPrPRgHbrKaIDLSxR3YVEmHSTk5Aa8K17H2kqO3Q
-g/j3nt/ymLAprJo6WsMWG4UftLxQ3Nl7iRpxUZyCezZHTTZmOBFkZ5s1IcuvkVe3
-EI60qLiRtBCMuW+qwEjfs00iNLWhBYZvLkrhk7Gjk+T7lr5S37d3WmcXEFTj96iS
-A/wprXV0oGAM4xNcARZJ
-=5OTL
+iQEcBAEBCAAGBQJT6OvcAAoJEOeBhlrCAAWGd9wH/AjToNemp3AUwyxCge0ktCGn
+esBKXZRyjyyGuD+hJDycJ35fHK+D9XsSYuxdUeEqVUUoCiPsVOU95JV5CvhqLcqV
+CUxswuW5Zkb4Tu2I8LX01bykeP3W3rdPi4xV/Hn5Y9MWNpkcnBssnDVy4C02qEV9
+0tm5biYawC0QkvrUntIsNlyB4V46mM0AQLNG9G6PO3P+fMZXm2+ZFACGg7KhZQQw
+KlQB49DrsGtftTHrvJmeq6jiRsPxelh9pBjcQdfIBu3ub2vOO9HHQc7CMe/gCdNA
+ov80uXeTwqiG11bMGCOfFPPgR44byY0WZi3NpRovgNSVbvewXg+iAOiE3R4h8oM=
+=fZL0
-----END PGP SIGNATURE-----
diff --git a/dev-python/mpi4py/files/mpi4py-1.3.1-ldshared.patch b/dev-python/mpi4py/files/mpi4py-1.3.1-ldshared.patch
new file mode 100644
index 000000000000..ae1eade0de2d
--- /dev/null
+++ b/dev-python/mpi4py/files/mpi4py-1.3.1-ldshared.patch
@@ -0,0 +1,24 @@
+# HG changeset patch
+# User Christoph Junghans <junghans@votca.org>
+# Date 1407773183 21600
+# Mon Aug 11 10:06:23 2014 -0600
+# Node ID ee313041ba5d7f0706f8140b4e965179e807ef56
+# Parent c66c1be9d40ae69aa61c45572fbe14ef3209378e
+Fix usage of LDSHARED
+
+- LDSHARED contain the linker, too
+- was used as it would only contain the options in the latter part
+- use split_linker_cmd to throw away the linker cmd
+- see https://bugs.gentoo.org/show_bug.cgi?id=514288
+
+diff -r c66c1be9d40a -r ee313041ba5d conf/mpidistutils.py
+--- a/conf/mpidistutils.py Wed Sep 04 22:40:25 2013 +0300
++++ b/conf/mpidistutils.py Mon Aug 11 10:06:23 2014 -0600
+@@ -176,6 +176,7 @@
+ opt = environ.get('OPT', opt )
+ ccshared = environ.get('CCSHARED', ccshared)
+ ldshared = environ.get('LDSHARED', ldshared)
++ _, ldshared = split_linker_cmd(ldshared)
+ cflags = ' '.join((basecflags, opt, cflags))
+ cxxflags = ' '.join((basecflags, opt, cxxflags))
+ cxxflags = cxxflags.replace('-Wstrict-prototypes', '')
diff --git a/dev-python/mpi4py/mpi4py-1.3.1.ebuild b/dev-python/mpi4py/mpi4py-1.3.1.ebuild
index 287335a11836..6e53591afae7 100644
--- a/dev-python/mpi4py/mpi4py-1.3.1.ebuild
+++ b/dev-python/mpi4py/mpi4py-1.3.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/mpi4py/mpi4py-1.3.1.ebuild,v 1.3 2014/08/11 07:06:57 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/mpi4py/mpi4py-1.3.1.ebuild,v 1.4 2014/08/11 16:14:09 ottxor Exp $
EAPI=5
@@ -23,7 +23,7 @@ DEPEND="${RDEPEND}
virtual/mpi[romio] )"
DISTUTILS_IN_SOURCE_BUILD=1
-PATCHES=( "${FILESDIR}"/${P}-py3-test-backport-1.patch )
+PATCHES=( "${FILESDIR}"/${P}-py3-test-backport-1.patch "${FILESDIR}"/${P}-ldshared.patch )
python_prepare_all() {
# not needed on install