aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjsbronder <jsbronder@32389bae-6d03-0410-99cf-db05cde120eb>2008-04-28 23:25:21 +0000
committerjsbronder <jsbronder@32389bae-6d03-0410-99cf-db05cde120eb>2008-04-28 23:25:21 +0000
commit04b54ea42392de0f47e094eb75c4ffa280869db3 (patch)
treefcf03af4448eb136e51ca84fe5138c877ea772b9
parentVersion bump. (diff)
downloadsci-04b54ea42392de0f47e094eb75c4ffa280869db3.tar.gz
sci-04b54ea42392de0f47e094eb75c4ffa280869db3.tar.bz2
sci-04b54ea42392de0f47e094eb75c4ffa280869db3.zip
Fix for gcc-4.3.0. Change 'char * argv[]' to 'char **argv' in configure scripts. Thanks to Peter Alfredsen (peter.alfredsen at gmail) for the fix.
git-svn-id: http://overlays.gentoo.org/svn/proj/science/overlay@1029 32389bae-6d03-0410-99cf-db05cde120eb
-rw-r--r--sys-cluster/lam-mpi/ChangeLog4
-rw-r--r--sys-cluster/lam-mpi/Manifest4
-rw-r--r--sys-cluster/lam-mpi/lam-mpi-7.1.4-r1.ebuild8
3 files changed, 12 insertions, 4 deletions
diff --git a/sys-cluster/lam-mpi/ChangeLog b/sys-cluster/lam-mpi/ChangeLog
index 22ec4c8e2..10264a574 100644
--- a/sys-cluster/lam-mpi/ChangeLog
+++ b/sys-cluster/lam-mpi/ChangeLog
@@ -2,6 +2,10 @@
# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
# $Header: /var/cvsroot/gentoo-x86/sys-cluster/lam-mpi/ChangeLog,v 1.65 2008/01/31 07:07:18 dberkholz Exp $
+ 28 Apr 2008; Justin Bronder <jsbronder@gentoo.org> ChangeLog:
+ Fix for gcc-4.3.0. Change 'char * argv[]' to 'char **argv' in configure
+ scripts. Thanks to Peter Alfredsen (peter.alfredsen at gmail) for the fix.
+
29 Feb 2008; Jeff Gardner <je_fro@gentoo.org> Manifest:
fix manifest
diff --git a/sys-cluster/lam-mpi/Manifest b/sys-cluster/lam-mpi/Manifest
index b5373b6c2..c84aec9dd 100644
--- a/sys-cluster/lam-mpi/Manifest
+++ b/sys-cluster/lam-mpi/Manifest
@@ -3,6 +3,6 @@ AUX 7.1.2-liblam-use-extra-libs.patch 490 RMD160 f52c0c3490a5d7dd9fa3993032c64c5
AUX 7.1.4-as-needed.patch 3702 RMD160 ba3dd579d482d67ec47721a764ebe5cf9c12de6f SHA1 635660a50dcd4bb176fd62a234895383e37ebcb4 SHA256 8e2792244742180ca5f9e829c16597ad9a85e955f8fd512a81515c304ed4e2cf
AUX eselect.mpi.lam-mpi 201 RMD160 bd458925228222b1109f6d8902132348c6e32571 SHA1 9b36f2b9ea10d578d183f3388fd0e149957f8bc9 SHA256 42aeba404585d0da00948029735239fe3fab30549f0ec9f99ae07ec0b73d3319
DIST lam-7.1.4.tar.bz2 7865813 RMD160 6c9c6338391472d4cd2572c409cb92360e7fd799 SHA1 ce8a983004f31d5960d34efe3ed9ac489e9dfc9d SHA256 d66c205f57d9ffc38dbfb81faef8b586ef2b9e08853034c0472ef4ae45803d2e
-EBUILD lam-mpi-7.1.4-r1.ebuild 3542 RMD160 bbf24f2d3ece58be628644c57f66608adec4e5f5 SHA1 b4828c2018f1a34bb68481fef6c5a6c5bc39ef05 SHA256 87d31157927a5c62effe68bf7be95630e9a6ab2e18a559ebe0c481467ed1091d
-MISC ChangeLog 10977 RMD160 eadf368276a0ed6d576ce2080077758cfa3e987b SHA1 b705af310367ef6392fba64e5dd91aa4f4c08df0 SHA256 2dd08fc6ef549ff67a48f1fe892e5737e6cdf07a507f01f411063ea738afcbda
+EBUILD lam-mpi-7.1.4-r1.ebuild 3617 RMD160 001a47d602a28f6c5abfe04268b1eb17c30a959c SHA1 cdaf00ddd0fd461258cc528bfdccdbd021e46724 SHA256 ff423f0579ccc01e781b59bbc5482f870be962db8e7a59ae31718da83d20b641
+MISC ChangeLog 11195 RMD160 0b0745f28cc07b9895a521fb6e38ad6f18adf0ed SHA1 cc18ebe1c8d24cfbd1aa1b30455567d6e8d13001 SHA256 edea0b1cc13cbe0bed05f917f4a0b42526bf7b598c2ba1b58e07eb21cf62e775
MISC metadata.xml 163 RMD160 ea1530cd45b9e04e8693261b9a94b5988e4b09a1 SHA1 443b7a3d8fb76c8d20647b165032ad358bfa3b6a SHA256 5a03bf3074b07158dffe793af69f7b0cd1e5c785537574713f9a7978032363a3
diff --git a/sys-cluster/lam-mpi/lam-mpi-7.1.4-r1.ebuild b/sys-cluster/lam-mpi/lam-mpi-7.1.4-r1.ebuild
index ce6db4ca9..ba022c1a3 100644
--- a/sys-cluster/lam-mpi/lam-mpi-7.1.4-r1.ebuild
+++ b/sys-cluster/lam-mpi/lam-mpi-7.1.4-r1.ebuild
@@ -37,8 +37,12 @@ src_unpack() {
epatch "${FILESDIR}"/7.1.2-lam_prog_f77.m4.patch
epatch "${FILESDIR}"/7.1.2-liblam-use-extra-libs.patch
epatch "${FILESDIR}"/7.1.4-as-needed.patch
- # Isn't needed yet, but is probably the right place to look.
- # sed -i 's:^\(WRAPPER_EXTRA_LDFLAGS=.*\)":\1 -Wl,--no-as-needed":' configure.in
+
+ # gcc-4.3.0 fix. char *argv[] -> char **argv.
+ # replaces a few more than necessary, but should be harmless.
+ for f in config/*.m4; do
+ sed -i 's:^\(int main(int argc, char\)[^{]*\([{]\?\):\1** argv) \2:g' $f
+ done
eautoreconf
}