diff options
| author |   Justin Lecher <jlec@gentoo.org> | 2011-04-12 06:34:08 +0000 |
|---|---|---|
| committer | Justin Lecher <jlec@gentoo.org> | 2011-04-12 06:34:08 +0000 |
| commit | 43040206e1b23fb30f1cd277731ab3baab1e6364 (patch) | |
| tree | 794272d504188ea12697fb2b6b7ede85885b81a9 /sci-libs | |
| parent | Added bug reference to ChangeLog. (diff) | |
| download | historical-43040206e1b23fb30f1cd277731ab3baab1e6364.tar.gz historical-43040206e1b23fb30f1cd277731ab3baab1e6364.tar.bz2 historical-43040206e1b23fb30f1cd277731ab3baab1e6364.zip | |
Fix for compilation with gcc-4.6 (-fpermissive), #363161
Package-Manager: portage-2.2.0_alpha29/cvs/Linux x86_64
Diffstat (limited to 'sci-libs')
| -rw-r--r-- | sci-libs/libcmatrix/ChangeLog | 8 | ||||
| -rw-r--r-- | sci-libs/libcmatrix/Manifest | 13 | ||||
| -rw-r--r-- | sci-libs/libcmatrix/files/3.2.1-gcc4.6.patch | 16 | ||||
| -rw-r--r-- | sci-libs/libcmatrix/libcmatrix-3.2.1.ebuild | 7 |
4 files changed, 33 insertions, 11 deletions
diff --git a/sci-libs/libcmatrix/ChangeLog b/sci-libs/libcmatrix/ChangeLog index 01a14a306e3f..54cf1a1c0005 100644 --- a/sci-libs/libcmatrix/ChangeLog +++ b/sci-libs/libcmatrix/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sci-libs/libcmatrix -# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/libcmatrix/ChangeLog,v 1.2 2010/11/03 09:35:06 jlec Exp $ +# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/sci-libs/libcmatrix/ChangeLog,v 1.3 2011/04/12 06:34:08 jlec Exp $ + + 12 Apr 2011; Justin Lecher <jlec@gentoo.org> +files/3.2.1-gcc4.6.patch, + libcmatrix-3.2.1.ebuild: + Fix for compilation with gcc-4.6 (-fpermissive), #363161 03 Nov 2010; Justin Lecher <jlec@gentoo.org> libcmatrix-3.2.1.ebuild: Keyworded for ~-linux prefix diff --git a/sci-libs/libcmatrix/Manifest b/sci-libs/libcmatrix/Manifest index 115d87d3b96e..657688ef81ef 100644 --- a/sci-libs/libcmatrix/Manifest +++ b/sci-libs/libcmatrix/Manifest @@ -2,16 +2,17 @@ Hash: SHA1 AUX 3.2.1-gcc4.4.patch 286 RMD160 8b275ad714b6bedbff03e411187342406f5cf1a7 SHA1 52873e8ef3197148d6c4ddfe0155a3cbfe4fd3db SHA256 e6eff8c9be0f9ac9026d1c00841e81a3f2e00127cbb70bd6e117de262e262fb3 +AUX 3.2.1-gcc4.6.patch 616 RMD160 5c08d0fad7f79cfe8d1c5577d0983f0f04d70c01 SHA1 9245459b34251206cb08595bab96914482c7a8c5 SHA256 fa7a4db6b1899a7a85fa6cd87f0d97ea6330ffc33787039d02330440dbdc30cb AUX 3.2.1-minuit2.patch 588 RMD160 7bfc835d79915342e6fdb209cfff29e0e8692bbc SHA1 374e8b92a1263ab488089303c6cbb46a28e7929f SHA256 099d47445e6efb340831b4a1f6210b02eb2a2ccf6f680f982761defcadfd1962 AUX 3.2.1-shared.patch 2626 RMD160 3227ea97a22750309d7e1d27aae276adc62c68d8 SHA1 5affbd06480e9fa95d44aae99c1665b9ff631cc6 SHA256 23983f6986b13cb31df7157e22932538cd73d4d2e2b806d42fa4a0df644b6df6 DIST libcmatrix-3.2.1.tar.gz 1151322 RMD160 d5f41d7fde34039482e3c971ecff84177ba5c064 SHA1 4612d4d0be34566bca83fe8b8a17033cd0457375 SHA256 6b4cb3ae4e1ed0a33190b09cd15a72c0938e3b598dbda39ca1557b482731b5c4 -EBUILD libcmatrix-3.2.1.ebuild 1104 RMD160 0338ad3edd4ba8c932b725e6caacbfacaa5c8536 SHA1 0f34684ba2e6be5bad23b8cef487f3afd29845a2 SHA256 4b9a30ecc1ef62794b4e98efb8b4fcb16877a3ff0287f1184c8e709ab8655a2b -MISC ChangeLog 563 RMD160 7384ba9bb14eb525192c0e155356d5e86699657c SHA1 73a418838d6f9b8c91e6f6790f12ade07514389a SHA256 48310e429d968985c8650cc287a6fd6a08d11f35d060092024cfebc6a8645e8b +EBUILD libcmatrix-3.2.1.ebuild 1141 RMD160 3ef557fb8ecb352dd641e226360b71cb8809d24b SHA1 4d4adeac5d4c1d16e885680d045f721302c1dfbd SHA256 b10a9db8cf1ff7e830c90cb0c5cf2bde4e5a50ae4f0443f12786b5e7fd90e9e1 +MISC ChangeLog 724 RMD160 687d3d2d4cd6d08283cc5110bbd0a4b9c940d407 SHA1 16433286872418fdd940ccc339c9bbed81b9d945 SHA256 cd7796a8d6055170775f19751dc2ec9f6d40309f18dac4bde86e27fc7c3959c7 MISC metadata.xml 290 RMD160 812d033907b7a0d755e1e38fb368b8eb5384cf02 SHA1 e7fc920fb3801d39c18f549ebac50add4d7f60da SHA256 307cd1defa0ca02a2c515b20c8ce50c80c4deccf845b8c55badd51896cbd8771 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.16 (GNU/Linux) +Version: GnuPG v2.0.17 (GNU/Linux) -iEYEARECAAYFAkzRLM8ACgkQgAnW8HDreRYIUQCgiJacQAvrITb1xXwP37COWAar -BdoAn1LuVuCDtRQY6lT45sjbWawYXnyi -=GpkF +iEYEARECAAYFAk2j8mUACgkQgAnW8HDreRbOeACfdRiQATLJzWs75l51ALc1a815 +E+QAniwResuidorx2pKYa7XE9gXPwH4P +=0nsS -----END PGP SIGNATURE----- diff --git a/sci-libs/libcmatrix/files/3.2.1-gcc4.6.patch b/sci-libs/libcmatrix/files/3.2.1-gcc4.6.patch new file mode 100644 index 000000000000..b3d8c8d19996 --- /dev/null +++ b/sci-libs/libcmatrix/files/3.2.1-gcc4.6.patch @@ -0,0 +1,16 @@ + NMR/MetaPropagation.cc | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/NMR/MetaPropagation.cc b/NMR/MetaPropagation.cc +index b7ed98b..ce8c16f 100755 +--- a/NMR/MetaPropagation.cc ++++ b/NMR/MetaPropagation.cc +@@ -2136,7 +2136,7 @@ SpinOpGenerator::add_A0(T& dest,F func, double coup, size_t j, size_t sk, Type2T + { ref_.clear(0); } + const space_T& operator()() const { return ref_; } + ~fudge_isotropic_() { ref_.ensure_rank(0); } +- mutable space_T& ref_; ++ space_T& ref_; + }; + template<> struct fudge_isotropic_<double> { + fudge_isotropic_(double v) : v_(v) {}; diff --git a/sci-libs/libcmatrix/libcmatrix-3.2.1.ebuild b/sci-libs/libcmatrix/libcmatrix-3.2.1.ebuild index df8937796fad..c19e33d7963f 100644 --- a/sci-libs/libcmatrix/libcmatrix-3.2.1.ebuild +++ b/sci-libs/libcmatrix/libcmatrix-3.2.1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2010 Gentoo Foundation +# Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/libcmatrix/libcmatrix-3.2.1.ebuild,v 1.2 2010/11/03 09:35:06 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/libcmatrix/libcmatrix-3.2.1.ebuild,v 1.3 2011/04/12 06:34:08 jlec Exp $ EAPI="3" @@ -29,7 +29,8 @@ src_prepare() { epatch \ "${FILESDIR}"/${PV}-shared.patch \ "${FILESDIR}"/${PV}-minuit2.patch \ - "${FILESDIR}"/${PV}-gcc4.4.patch + "${FILESDIR}"/${PV}-gcc4.4.patch \ + "${FILESDIR}"/${PV}-gcc4.6.patch eautoreconf } |