Revision
76450
Author
vince@macports.org
Date
2011-02-23 13:37:09 -0800 (Wed, 23 Feb 2011)

Log Message

Correct a bug where "gcc" is used instead of ${configure.cc}

Modified Paths

Added Paths

Diff

Modified: trunk/dports/math/atlas/Portfile (76449 => 76450)


--- trunk/dports/math/atlas/Portfile	2011-02-23 21:35:57 UTC (rev 76449)
+++ trunk/dports/math/atlas/Portfile	2011-02-23 21:37:09 UTC (rev 76450)
@@ -30,7 +30,8 @@
 distfiles           ${atlasdist}:atlas \
                     ${lapackdist}:lapack
 
-patchfiles          patch-SpewMakeInc.c.diff
+patchfiles          patch-SpewMakeInc.c.diff \
+					patch-emit_mm_c.diff
 
 checksums           atlas3.9.37.tar.bz2 \
                     sha1    71dd254dad1fc9ad3dec123a561706c9a1a5d7d1 \
@@ -170,16 +171,16 @@
 
     	ppc64 {
     		reinplace -E \
-    			"s|ATL_thread_exit.o ATL_thread_join.o|\
+    			's|ATL_thread_exit.o ATL_thread_join.o|\
     			ATL_thread_exit.o ATL_thread_join.o\
-    			ATL_DecAtomicCount_ppc.o|" ${path}
+    			ATL_DecAtomicCount_ppc.o|' ${path}
     	}
 
     	ppc {
     		reinplace -E \
-    			"s|ATL_thread_exit.o ATL_thread_join.o|\
+    			's|ATL_thread_exit.o ATL_thread_join.o|\
     			ATL_thread_exit.o ATL_thread_join.o\
-    			ATL_DecAtomicCount_ppc.o|" ${path}
+    			ATL_DecAtomicCount_ppc.o|' ${path}
     	}
 	}
 }

Added: trunk/dports/math/atlas/files/patch-emit_mm_c.diff (0 => 76450)


--- trunk/dports/math/atlas/files/patch-emit_mm_c.diff	                        (rev 0)
+++ trunk/dports/math/atlas/files/patch-emit_mm_c.diff	2011-02-23 21:37:09 UTC (rev 76450)
@@ -0,0 +1,16 @@
+--- tune/blas/gemm/emit_mm.c.orig	2011-02-23 22:06:06.000000000 +0100
++++ tune/blas/gemm/emit_mm.c	2011-02-23 22:07:28.000000000 +0100
+@@ -2688,9 +2688,11 @@
+       {
+          if (wp->CC[0])  /* need non-default compilation rule */
+          {
+-            char *comp = (wp->CC[0] == 'g' && wp->CC[1] == 'c'
++/*            char *comp = (wp->CC[0] == 'g' && wp->CC[1] == 'c'
+                           && wp->CC[2] == 'c' && wp->CC[3] == '\0')
+-                         ? "$(GOODGCC)" : wp->CC;
++                         ? "$(GOODGCC)" : wp->CC; */
++              char *comp = "$(GOODGCC)";
++
+             for (j=0; j < nbetas; j++)
+             {
+                for(k=0; k < wp->ncomps; k++)