[gentoo-commits] gentoo-x86 commit in sys-cluster/lam-mpi: ChangeLog lam-mpi-7.1.4.ebuild

[Justin Bronder (jsbronder)]

jsbronder    08/05/02 03:10:29

  Modified:             ChangeLog lam-mpi-7.1.4.ebuild
  Log:
  gcc-4.3.0 compile fix (char *argv[] -> char **argv).  Thanks to Peter Alfredsen (peter.alfredsen at gmail) for the report and fix.  Bug #219675
  (Portage version: 2.1.4.4)

Revision  Changes    Path
1.67                 sys-cluster/lam-mpi/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-cluster/lam-mpi/ChangeLog?rev=1.67&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-cluster/lam-mpi/ChangeLog?rev=1.67&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-cluster/lam-mpi/ChangeLog?r1=1.66&r2=1.67

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-cluster/lam-mpi/ChangeLog,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- ChangeLog	11 Mar 2008 14:34:41 -0000	1.66
+++ ChangeLog	2 May 2008 03:10:28 -0000	1.67
@@ -1,6 +1,10 @@
 # ChangeLog for sys-cluster/lam-mpi
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/lam-mpi/ChangeLog,v 1.66 2008/03/11 14:34:41 jsbronder Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/lam-mpi/ChangeLog,v 1.67 2008/05/02 03:10:28 jsbronder Exp $
+
+  02 May 2008; Justin Bronder <jsbronder@g.o> lam-mpi-7.1.4.ebuild:
+  gcc-4.3.0 compile fix (char *argv[] -> char **argv).  Thanks to Peter
+  Alfredsen (peter.alfredsen at gmail) for the report and fix.  Bug #219675
 
   11 Mar 2008; Justin Bronder <jsbronder@g.o>
   +files/7.1.4-as-needed.patch, lam-mpi-7.0.4.ebuild, lam-mpi-7.1.2.ebuild,



1.3                  sys-cluster/lam-mpi/lam-mpi-7.1.4.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-cluster/lam-mpi/lam-mpi-7.1.4.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-cluster/lam-mpi/lam-mpi-7.1.4.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-cluster/lam-mpi/lam-mpi-7.1.4.ebuild?r1=1.2&r2=1.3

Index: lam-mpi-7.1.4.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-cluster/lam-mpi/lam-mpi-7.1.4.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- lam-mpi-7.1.4.ebuild	11 Mar 2008 14:34:41 -0000	1.2
+++ lam-mpi-7.1.4.ebuild	2 May 2008 03:10:28 -0000	1.3
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/lam-mpi/lam-mpi-7.1.4.ebuild,v 1.2 2008/03/11 14:34:41 jsbronder Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/lam-mpi/lam-mpi-7.1.4.ebuild,v 1.3 2008/05/02 03:10:28 jsbronder Exp $
 
 inherit autotools eutils fortran flag-o-matic multilib portability
 
@@ -39,6 +39,22 @@
 	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
+
+	# gcc-4.3.0 fix.  char *argv[] -> char **argv.
+	# replaces a few more than necessary, but should be harmless.
+	# TODO:  Already applied upstream, will be in 7.1.5
+	for f in config/*.m4; do
+		sed -i 's:^\(int main(int argc, char\)[^{]*\([{]\?\):\1** argv) \2:g' $f
+	done
+
+	# eautoreconf doesn't work correctly as lam-mpi uses their own 
+	# LAM_CONFIG_SUBDIR instead of AC_CONFIG_SUBDIRS.  Even better, they use
+	# variables inside of the definitions, so --trace doesn't work.
+	for f in $(find ./ -name 'configure.ac'); do
+		pushd $(dirname $f) &>/dev/null
+		eautoreconf
+		popd &>/dev/null
+	done
 	eautoreconf
 }
 



-- 
gentoo-commits@l.g.o mailing list