summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDonnie Berkholz <spyderous@gentoo.org>2005-05-24 23:17:01 +0000
committerDonnie Berkholz <spyderous@gentoo.org>2005-05-24 23:17:01 +0000
commitd7a7c4e728955725345a0a8a733f5663cb276623 (patch)
treef10a6bcc0ed9bca942cf3d95ef8f251647b72c98 /sys-cluster/lam-mpi
parentfix static linking with libpcre (diff)
downloadgentoo-2-d7a7c4e728955725345a0a8a733f5663cb276623.tar.gz
gentoo-2-d7a7c4e728955725345a0a8a733f5663cb276623.tar.bz2
gentoo-2-d7a7c4e728955725345a0a8a733f5663cb276623.zip
(#92832) Fix misformatted patch.
Diffstat (limited to 'sys-cluster/lam-mpi')
-rw-r--r--sys-cluster/lam-mpi/ChangeLog6
-rw-r--r--sys-cluster/lam-mpi/files/lam-mpi-7.1.1-shared-romio.patch44
2 files changed, 28 insertions, 22 deletions
diff --git a/sys-cluster/lam-mpi/ChangeLog b/sys-cluster/lam-mpi/ChangeLog
index f54aa2bdfc80..9d2d9e4ad81f 100644
--- a/sys-cluster/lam-mpi/ChangeLog
+++ b/sys-cluster/lam-mpi/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sys-cluster/lam-mpi
# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/lam-mpi/ChangeLog,v 1.33 2005/05/18 12:30:47 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/lam-mpi/ChangeLog,v 1.34 2005/05/24 23:17:01 spyderous Exp $
+
+ 24 May 2005; Donnie Berkholz <spyderous@gentoo.org>;
+ files/lam-mpi-7.1.1-shared-romio.patch:
+ (#92832) Fix misformatted patch.
18 May 2005; Markus Rothe <corsair@gentoo.org> lam-mpi-7.1.1.ebuild:
Stable on ppc64
diff --git a/sys-cluster/lam-mpi/files/lam-mpi-7.1.1-shared-romio.patch b/sys-cluster/lam-mpi/files/lam-mpi-7.1.1-shared-romio.patch
index 344ff13ad94a..4cdeeb093ef8 100644
--- a/sys-cluster/lam-mpi/files/lam-mpi-7.1.1-shared-romio.patch
+++ b/sys-cluster/lam-mpi/files/lam-mpi-7.1.1-shared-romio.patch
@@ -1,5 +1,6 @@
---- lam-7.1.1/romio/mpi-io/Makefile.in.orig 2005-05-15 23:12:33.317533904 +0200
-+++ lam-7.1.1/romio/mpi-io/Makefile.in 2005-05-15 23:15:25.733322720 +0200
+diff -urN lam-7.1.1.orig/romio/mpi-io/Makefile.in lam-7.1.1/romio/mpi-io/Makefile.in
+--- lam-7.1.1.orig/romio/mpi-io/Makefile.in 2003-03-25 14:41:35.000000000 -0800
++++ lam-7.1.1/romio/mpi-io/Makefile.in 2005-05-24 16:12:46.000000000 -0700
@@ -1,6 +1,9 @@
CC = @CC@
AR = @AR@
@@ -9,36 +10,37 @@
+SONAME = $(basename @LIBNAME@).so
RANLIB = @RANLIB@
srcdir = @srcdir@
-
+
@@ -55,10 +58,14 @@
-
+
all: $(LIBNAME)
-
+
+dir:
-+ mkdir -p shared/
++ mkdir -p shared/
+
.SUFFIXES: $(SUFFIXES) .p
-
+
.c.o:
- $(CC) $(CFLAGS) -c $<
-+ $(CC) $(CFLAGS) $(PICFLAGS) -c -o shared/$@ $<
-
+ $(CC) $(CFLAGS) -c $<
++ $(CC) $(CFLAGS) $(PICFLAGS) -c -o shared/$@ $<
+
.c.p:
- @cp $(srcdir)/$*.c _$*.c
+ @cp $(srcdir)/$*.c _$*.c
@@ -69,8 +76,10 @@
- $(AR) $(LIBNAME) $(MPIO_REAL_POBJECTS)
- @rm -f _*.o
-
+ $(AR) $(LIBNAME) $(MPIO_REAL_POBJECTS)
+ @rm -f _*.o
+
-$(LIBNAME): $(MPIO_OBJECTS)
+$(LIBNAME): dir $(MPIO_OBJECTS)
- $(AR) $(LIBNAME) $(MPIO_OBJECTS)
-+ $(CC) $(SOFLAGS) -o $(SONAME) $(addprefix shared/, $(MPIO_OBJECTS))
-
+ $(AR) $(LIBNAME) $(MPIO_OBJECTS)
++ $(CC) $(SOFLAGS) -o $(SONAME) $(addprefix shared/, $(MPIO_OBJECTS))
+
clean:
- @rm -f *.o
-+ @rm -f shared/*.o
---- lam-7.1.1/romio/util/romioinstall.in.orig 2005-05-11 20:06:51.526529552 +0200
-+++ lam-7.1.1/romio/util/romioinstall.in 2005-05-11 20:07:10.845592608 +0200
+ @rm -f *.o
++ @rm -f shared/*.o
+diff -urN lam-7.1.1.orig/romio/util/romioinstall.in lam-7.1.1/romio/util/romioinstall.in
+--- lam-7.1.1.orig/romio/util/romioinstall.in 2003-03-25 14:41:35.000000000 -0800
++++ lam-7.1.1/romio/util/romioinstall.in 2005-05-24 16:10:30.000000000 -0700
@@ -128,6 +128,7 @@
# Library files
dir="$libdir"