diff options
| author | thierry <thierry@FreeBSD.org> | 2014-08-23 16:58:23 +0800 |
|---|---|---|
| committer | thierry <thierry@FreeBSD.org> | 2014-08-23 16:58:23 +0800 |
| commit | 098c9306b8bb0f52e110b023caedb8ca6be08263 (patch) | |
| tree | bccdcf62b88ffc9fbd241efe8c46d7e03de336b3 /math/blacs/files | |
| parent | f63f33ba20a12a5edf88909aa513ba08a253fd0c (diff) | |
| download | freebsd-ports-gnome-098c9306b8bb0f52e110b023caedb8ca6be08263.tar.gz freebsd-ports-gnome-098c9306b8bb0f52e110b023caedb8ca6be08263.tar.zst freebsd-ports-gnome-098c9306b8bb0f52e110b023caedb8ca6be08263.zip | |
- Make fetchable again
- Stagify
- Link the test programs with FFLAGS to get -rpath on GCC libs.
Diffstat (limited to 'math/blacs/files')
| -rw-r--r-- | math/blacs/files/Bmake.inc-mpich.diff | 31 | ||||
| -rw-r--r-- | math/blacs/files/Bmake.inc-openmpi.diff | 13 |
2 files changed, 22 insertions, 22 deletions
diff --git a/math/blacs/files/Bmake.inc-mpich.diff b/math/blacs/files/Bmake.inc-mpich.diff index e19a1851ff65..64d751f67c50 100644 --- a/math/blacs/files/Bmake.inc-mpich.diff +++ b/math/blacs/files/Bmake.inc-mpich.diff @@ -1,5 +1,5 @@ ---- Bmake.inc.orig Mon May 5 10:53:00 2003 -+++ Bmake.inc Mon May 5 10:58:38 2003 +--- Bmake.inc.orig 2000-02-25 01:22:28.000000000 +0100 ++++ Bmake.inc 2014-08-22 23:50:32.000000000 +0200 @@ -13,7 +13,7 @@ # ----------------------------- # The top level BLACS directory @@ -39,6 +39,15 @@ # ------------------------------------- # All libraries required by the tester. +@@ -93,7 +93,7 @@ + # setting for your platform, compile and run BLACS/INSTALL/xintface. + # Choices are: Add_, NoChange, UpCase, or f77IsF2C. + # --------------------------------------------------------------------------- +- INTFACE = -Df77IsF2C ++ INTFACE = -DAdd_ + + # ------------------------------------------------------------------------ + # Allows the user to vary the topologies that the BLACS default topologies @@ -195,16 +195,15 @@ # optimization. This is the F77NO_OPTFLAG. The usage of the remaining # macros should be obvious from the names. @@ -47,13 +56,14 @@ - F77NO_OPTFLAGS = - F77FLAGS = $(F77NO_OPTFLAGS) -O - F77LOADER = $(F77) +- F77LOADFLAGS = +- CC = gcc +- CCFLAGS = -O4 + F77 = @F77@ + F77NO_OPTFLAGS = @F77EXTRAFLAGS@ + F77FLAGS = @FFLAGS@ + F77LOADER = @F77@ - F77LOADFLAGS = -- CC = gcc -- CCFLAGS = -O4 ++ F77LOADFLAGS = @FFLAGS@ + CC = @CC@ + CCFLAGS = @CFLAGS@ CCLOADER = $(CC) @@ -62,14 +72,3 @@ # -------------------------------------------------------------------------- # The archiver and the flag(s) to use when building an archive (library). # Also the ranlib routine. If your system has no ranlib, set RANLIB = echo. ---- Bmake.inc~ Wed Jan 10 16:11:00 2007 -+++ Bmake.inc Wed Jan 10 16:18:08 2007 -@@ -93,7 +93,7 @@ - # setting for your platform, compile and run BLACS/INSTALL/xintface. - # Choices are: Add_, NoChange, UpCase, or f77IsF2C. - # --------------------------------------------------------------------------- -- INTFACE = -Df77IsF2C -+ INTFACE = -DAdd_ - - # ------------------------------------------------------------------------ - # Allows the user to vary the topologies that the BLACS default topologies diff --git a/math/blacs/files/Bmake.inc-openmpi.diff b/math/blacs/files/Bmake.inc-openmpi.diff index 40a12bfd93d0..649e969ae216 100644 --- a/math/blacs/files/Bmake.inc-openmpi.diff +++ b/math/blacs/files/Bmake.inc-openmpi.diff @@ -1,5 +1,5 @@ ---- Bmake.inc.orig Mon Nov 13 14:17:35 2006 -+++ Bmake.inc Mon Nov 13 14:19:18 2006 +--- Bmake.inc.orig 2014-08-22 23:54:21.000000000 +0200 ++++ Bmake.inc 2014-08-22 23:55:10.000000000 +0200 @@ -13,7 +13,7 @@ # ----------------------------- # The top level BLACS directory @@ -66,14 +66,15 @@ - F77NO_OPTFLAGS = - F77FLAGS = $(F77NO_OPTFLAGS) -O - F77LOADER = $(F77) +- F77LOADFLAGS = +- CC = gcc +- CCFLAGS = -O4 +- CCLOADER = $(CC) + F77 = @LOCALBASE@/mpi/openmpi/bin/mpif77 + F77NO_OPTFLAGS = @F77EXTRAFLAGS@ + F77FLAGS = @FFLAGS@ + F77LOADER = @LOCALBASE@/mpi/openmpi/bin/mpif77 - F77LOADFLAGS = -- CC = gcc -- CCFLAGS = -O4 -- CCLOADER = $(CC) ++ F77LOADFLAGS = @FFLAGS@ + CC = @LOCALBASE@/mpi/openmpi/bin/mpicc + CCFLAGS = @CFLAGS@ + CCLOADER = @LOCALBASE@/mpi/openmpi/bin/mpicc |