Link libgfortran statically to H5test_kind in order to circumvent kind misdetection. Fixes #419895 by My Th <rei4dan@gmail.com>

Package-Manager: portage-2.2.0_alpha108/cvs/Linux x86_64

4 files changed, 40 insertions, 18 deletions

diff --git a/sci-libs/hdf5/ChangeLog b/sci-libs/hdf5/ChangeLog
index 59ba27fe4747..2aa243421309 100644
--- a/sci-libs/hdf5/ChangeLog
+++ b/sci-libs/hdf5/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-libs/hdf5
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/hdf5/ChangeLog,v 1.86 2012/06/06 19:40:27 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/hdf5/ChangeLog,v 1.87 2012/06/06 22:21:56 xarthisius Exp $
+
+  06 Jun 2012; Kacper Kowalik <xarthisius@gentoo.org>
+  +files/hdf5-1.8.9-static_libgfortran.patch, hdf5-1.8.9-r1.ebuild:
+  Link libgfortran statically to H5test_kind in order to circumvent kind
+  misdetection. Fixes #419895 by My Th <rei4dan@gmail.com>
 
 *hdf5-1.8.9-r1 (06 Jun 2012)
 
diff --git a/sci-libs/hdf5/Manifest b/sci-libs/hdf5/Manifest
index 5efc981ce00d..fb634b9ea471 100644
--- a/sci-libs/hdf5/Manifest
+++ b/sci-libs/hdf5/Manifest
@@ -13,29 +13,30 @@ AUX hdf5-1.8.8-array_bounds.patch 624 RMD160 cdbda024424e3eb6a08fd6bc226a28a1da5
 AUX hdf5-1.8.8-buildsystem.patch 1410 RMD160 a88c63145bf088b018d4dcf327415938d467914e SHA1 f8a48e3602967ef15ceabab9ad499a8f6b3aa009 SHA256 a97a7a82197eb4f3c9d43836f24c2c2ae14962970a0b680e5305a977b8c611a5
 AUX hdf5-1.8.8-implicits.patch 2005 RMD160 3eb7faffe476dec3f3cf49be0d285fef3c43fd2f SHA1 842fa0e605ba6ba5fa6c3134902c192c64584b13 SHA256 1fec9a12f20f28484a9047e39b4bb56694af394d9e591abf442046aed96d4b5c
 AUX hdf5-1.8.9-implicits.patch 1387 RMD160 fb0cbf622fd744242b80b9dc933f6d1aac60ec49 SHA1 c26ec25238bad7bf01dce485a4b3cf0def0083c3 SHA256 7d62dc53f2769aef1025fb128d4e2d11a5a172ca447747d81ffae0fa7a3d81e1
+AUX hdf5-1.8.9-static_libgfortran.patch 429 RMD160 624ea6d5c61ed126ad0a3b220b40a32ddf8a1a49 SHA1 5b8d09a1405ee7305eb428ce8ad9ed4a472476e7 SHA256 7802a4535f456c951fb4162850edd53f667ac29fc4838fce960a18f23d2dfc0d
 AUX mpd.conf 48 RMD160 289de9bb40759e3f71229cf47e4d2af83703a85f SHA1 244eee76dbf4ff269e4489d5cc7c3577c6c1fa6b SHA256 ae740cacaf2cb798921cb2092f5af98de67445e27af3f88858f3e6d2bbb127f4
 DIST hdf5-1.8.4.tar.gz 7181176 RMD160 e448e2326b55aa89ff0bd7488cd4291d6c5485ee SHA1 37877e29c49a6af3e23aa9ad798ef12b8ba1c05c SHA256 a992fce9387a17f175b3b188dc2a42f545a3057aeb141beb3fc3361c7521f465
 DIST hdf5-1.8.8.tar.bz2 5827394 RMD160 077580c9828747473836cc39f8cb3fd4e5e045d9 SHA1 1bc16883ecd631840b70857bea637a06eb0155da SHA256 b0ebb0b5478c6c0427631d4ad08f96e39f1b09fde615aa98d2a1b8fb7f6dced3
 DIST hdf5-1.8.9.tar.bz2 6006715 RMD160 4c1a4160fbac6befa15b2dc039f20858c31db37d SHA1 7d5e5e8caa5970c65e70a5b4ad6787efe0bf70bb SHA256 fafe54856b00f0d6531629f66e2c476ab6ee03458803088f270bbfc4a60966c7
 EBUILD hdf5-1.8.4-r1.ebuild 3134 RMD160 6dfc52e18b8d0005560f6c543b9641daeb20a11e SHA1 9f01a942144e3a1cdf8d9eea9b3e3620cd180892 SHA256 89aa8ed18e2d68e4c55d8f24c0db221f6e3f13d056f4f14eb29016dffddcdda7
 EBUILD hdf5-1.8.8-r1.ebuild 2845 RMD160 beb1ffa530ef3c372ac009d19290104775e1cdb0 SHA1 4b9671820a8c8efc6dd054dceb09842c72939b9c SHA256 910dfe988d2e90bceda89b20f7efe543f88b35eacddf0306c1eab6a0384311c6
-EBUILD hdf5-1.8.9-r1.ebuild 2837 RMD160 cb67a6e78436e1e8e02372dcf1b66cd102c08e19 SHA1 03ec7356ac3ae38a451cd224afd98b73a43b53c4 SHA256 80f73a51372ae0604a1d5a0511b7ffcc80c80993f6e95a2d57e7fe3f1e082274
-MISC ChangeLog 16979 RMD160 bb5f83ce0063d1bc225cf05fdac42f7ac1de3687 SHA1 8fe47eea925fc873ec4a9cc3fb899c15696e8bf2 SHA256 5d65206ac9dcb6edd68e8606b281286ddc273d20235e0a344d505bd0b7b797a3
+EBUILD hdf5-1.8.9-r1.ebuild 2885 RMD160 48954b7f7dea185e80cee31d3715c3f2700fd0c3 SHA1 5ef1f9d8e03ba29a9638a709e6e44c360812ef02 SHA256 b53e502bed6bcd64a668bdceeb5b469a3fc897dbcbc6c236e80aad3363cfa7c5
+MISC ChangeLog 17234 RMD160 fc1e667eda19eb9c2e0c5670a51c07e58c3ae9aa SHA1 f6fa20f47ac4bc1228efa8f5ef5e430d0f1d17c3 SHA256 5d9e64b740a035cdf0e4a541330eff5127da232924aaddd78c31287e12d982be
 MISC metadata.xml 728 RMD160 3863f8962e54ddbd28c78256e03feedc571148a7 SHA1 f4ac101d9b30cca655a89a87185364dd4a24816b SHA256 1a503997c6e2248b43a36eccd2c09337a0e02b498926b4430b9d8df059e638ba
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJPz7I2AAoJEF0huFKJUZL5aIwP/jBbQNfTCjQGigcq4eoWOaTr
-GU7vlngPo+mPGnqcnzbr+pfIWSGOvLb31WVTTNEE9iatBrhaUGj+8Wy3bo+7PrIL
-0IJzJLVj0y/Kixtn56sv/DeX1UUJ7J7VI+osCkpRd4fNBpppEoauS4mIF/tSMJDJ
-+7N/c+FeWIv5wq924pSlQl5mCwbng8CI3hYhUeUrPJ5J55YS3nhe92jY5IYaeJZp
-US/qux6GEe6lEhXy6mYOFvWRXMahnmw/0RVuJYfKkcrnK61QuT8PjUTPiPFO3hSj
-Y2uNkD4bRtgv/M5zDe4bcF8is4b1fYTRR2GG5o8U96FLnCLwKcjsUl2h787w+eHq
-x8qOcUJ7nVAhH6vlXl3bPbpiLen0tiCiG0lYBDSoQNvaifG0eUQkSN0puEHHnSRi
-h7YnayfUEz8MI0sjaoDixyr4D3vX5/KAhiUef5mMk9ODXZCNuqo6nj+MKeu5J8Wn
-kammc/u6qFhLtHE/92v7SanHrO7R3/m9u6ZhO+Epga7QNFt13H9RZQUWOa+1sCe1
-ZxXrerL38rsp8ltT/zP2RY428Sz8HPfKWkI3iFx+mSO5Z2Q07PvZCDmS1zKwFlia
-q8ozE86fbl1qeA2qZAmENinp59x8/6Eztk8hrdz5AHRQf+NLznKLNpunCKjRLBIb
-dikkOafaP4ouzDTF0TE2
-=K68J
+iQIcBAEBCAAGBQJPz9gKAAoJEF0huFKJUZL5YW0P/0gh52kx3uda4JzLVoAVr49y
+jgsIJJt+/IlqVLxMzXhyHzTJuuzGZE26KWKhKCaAETWlpstE79LH/Wre2i4n1s28
+xXqzOkCyejyhPjeWMF3r37Imb0rASMAgX4fns2XQxhTo1hIJkxqjTViGzBfYcqX4
+ShFOHMvEjZrFVhoYaw45WVUvvPWeDwVmfto2bNDt91GtOkvg7QeezTtdgQyHh7Z4
+mLqJXbY4f53L+NoqJHQbbW2qAOAHhWyIXxBBWEQK4xG9ZjppFLeD0IULgyzWUY62
+cIccKnJGrfbQgRBLCD9UKqwz15jzW29SpwUweV24hXER/ZyPGA4mTQ0zlbhUVl3S
+/rNVX+wgWQHsihYD5m4/QZtUzV+b/AgFaM6WYK6QZ+kGruC+41KXNEp8KJ4Olv4K
+W17HjYQRuCvsYj4pgP/us65MUMGy5Qzj06C4weSYzHMUolpPcnK57af6zInOHl9a
++a9cdT4XJiKBX8Poz7P1sikuGTf7BJuq0O2BZOoWfk7bB0xLDgcXZvAkfGpyCUQa
+49dXoQZB5Av4aK7oG/JWwAljwAebXkJkQqVNFvLmz2qd5ABv70RrTtCMcL+5Svqr
+mcN0ekZhotzqTv2cmQySyrNTZjnQVkXPC2sJ6pSN+KefQRjQOVnXCnYE78VXVuwy
+eFSLRSJJxNZ5NHDNizVl
+=25Yf
 -----END PGP SIGNATURE-----
diff --git a/sci-libs/hdf5/files/hdf5-1.8.9-static_libgfortran.patch b/sci-libs/hdf5/files/hdf5-1.8.9-static_libgfortran.patch
new file mode 100644
index 000000000000..f87ccdd08f7a
--- /dev/null
+++ b/sci-libs/hdf5/files/hdf5-1.8.9-static_libgfortran.patch
@@ -0,0 +1,15 @@
+Make sure that during runtime we'll use the same libgfortran as during linking
+
+https://bugs.gentoo.org/show_bug.cgi?id=419991
+https://bugs.gentoo.org/show_bug.cgi?id=419895
+
+--- a/fortran/src/Makefile.am
++++ b/fortran/src/Makefile.am
+@@ -181,6 +181,7 @@
+ else
+   H5test_kind_SOURCES = $(srcdir)/H5test_kind.f90
+ endif
++H5test_kind_LDFLAGS=-static-libgfortran
+ 
+ # Mark this directory as part of the Fortran API
+ FORTRAN_API=yes
diff --git a/sci-libs/hdf5/hdf5-1.8.9-r1.ebuild b/sci-libs/hdf5/hdf5-1.8.9-r1.ebuild
index 488a565b930a..8fd918d9b8e3 100644
--- a/sci-libs/hdf5/hdf5-1.8.9-r1.ebuild
+++ b/sci-libs/hdf5/hdf5-1.8.9-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/hdf5/hdf5-1.8.9-r1.ebuild,v 1.1 2012/06/06 19:40:27 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/hdf5/hdf5-1.8.9-r1.ebuild,v 1.2 2012/06/06 22:21:56 xarthisius Exp $
 
 EAPI=4
 
@@ -49,7 +49,8 @@ pkg_setup() {
 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-1.8.8-buildsystem.patch \
 		"${FILESDIR}"/${PN}-1.8.8-array_bounds.patch \
-		"${FILESDIR}"/${P}-implicits.patch
+		"${FILESDIR}"/${P}-implicits.patch \
+		"${FILESDIR}"/${P}-static_libgfortran.patch
 	# respect gentoo examples directory
 	sed \
 		-e "s:hdf5_examples:doc/${PF}/examples:g" \