[82700] trunk/dports/math/atlas

[vince at macports.org]

Revision: 82700
          http://trac.macports.org/changeset/82700
Author:   vince at macports.org
Date:     2011-08-18 11:41:32 -0700 (Thu, 18 Aug 2011)
Log Message:
-----------
Another try to fix -force?\226?\128?\166 loss on G4 and pthreads problem on i386.

Modified Paths:
--------------
    trunk/dports/math/atlas/Portfile
    trunk/dports/math/atlas/files/patch-Makefile_pthreads_misc.diff

Added Paths:
-----------
    trunk/dports/math/atlas/files/patch-mvtesttime_h.diff

Removed Paths:
-------------
    trunk/dports/math/atlas/files/patch-build-Make.top.diff

Modified: trunk/dports/math/atlas/Portfile
===================================================================
--- trunk/dports/math/atlas/Portfile	2011-08-18 18:17:13 UTC (rev 82699)
+++ trunk/dports/math/atlas/Portfile	2011-08-18 18:41:32 UTC (rev 82700)
@@ -36,7 +36,8 @@
 					patch-ATL_go_parallel_c.diff \
 					patch-atlas_l2g_base.diff \
 					patch-mmparse_h.diff \
-					patch-mvparse_h.diff
+					patch-mvparse_h.diff \
+					patch-mvtesttime_h.diff
 
 
 
@@ -237,6 +238,14 @@
 	reinplace	"s|__MACPORTS_GCC__|${configure.cc}|g" \
 				 ${workpath}/${name}-${version}/CONFIG/src/SpewMakeInc.c
 	
+	reinplace	"s|XXXXX|${configure.cc}|g" \
+				${workpath}/${name}-${version}/include/atlas_mvtesttime.h
+
+	if { ${build_arch} == "ppc" || ${build_arch} == "ppc64" } {
+		reinplace \
+		"s|cMVFLAGS=\\\\\"%s\\\\\"|cMVFLAGS=\\\\\"-force_cpusubtype_ALL\ %s\\\\\"|" \
+		 ${workpath}/${name}-${version}/include/atlas_mvtesttime.h
+	}
 	# ar -r / ranlib / libtool seems to be buggy, so we have to supply a
 	# workaround to link properly.
 	reinplace	"s|XXXXX|${filespath}/ar2|" \

Modified: trunk/dports/math/atlas/files/patch-Makefile_pthreads_misc.diff
===================================================================
--- trunk/dports/math/atlas/files/patch-Makefile_pthreads_misc.diff	2011-08-18 18:17:13 UTC (rev 82699)
+++ trunk/dports/math/atlas/files/patch-Makefile_pthreads_misc.diff	2011-08-18 18:41:32 UTC (rev 82700)
@@ -1,11 +1,17 @@
---- Makefile.orig	2011-08-01 09:02:42.000000000 +0200
-+++ Makefile	2011-08-01 09:04:08.000000000 +0200
-@@ -87,7 +87,7 @@
+--- Makefile.orig	2011-08-18 20:27:47.000000000 +0200
++++ Makefile	2011-08-18 20:28:16.000000000 +0200
+@@ -86,10 +86,10 @@
  zlvlm : zlib
  #
  alib  : alib.grd
- slib  : slib.grd
+-slib  : slib.grd
 -dlib  : dlib.grd
+-clib  : clib.grd
+-zlib  : zlib.grd
++slib  : slib.grd alib.grd
 +dlib  : dlib.grd alib.grd
- clib  : clib.grd
- zlib  : zlib.grd
++clib  : clib.grd alib.grd
++zlib  : zlib.grd alib.grd
+ #
+ alib.grd  : $(ATL_alvlmobj)
+ 	$(ARCHIVER) $(ARFLAGS) $(ATLASlib) $(ATL_alvlmobj)

Deleted: trunk/dports/math/atlas/files/patch-build-Make.top.diff
===================================================================
Added: trunk/dports/math/atlas/files/patch-mvtesttime_h.diff
===================================================================
--- trunk/dports/math/atlas/files/patch-mvtesttime_h.diff	                        (rev 0)
+++ trunk/dports/math/atlas/files/patch-mvtesttime_h.diff	2011-08-18 18:41:32 UTC (rev 82700)
@@ -0,0 +1,11 @@
+--- include/atlas_mvtesttime.h.orig	2011-08-05 17:27:48.000000000 +0200
++++ include/atlas_mvtesttime.h	2011-08-18 10:47:43.000000000 +0200
+@@ -100,7 +100,7 @@
+    if (1)   /* NOTE: replace with test on restrict or not! */
+       i += sprintf(ln+i, " incy=1");
+    if (kn->comp)
+-      i += sprintf(ln+i, " %cMVCC=\"%s\"", pre, kn->comp);
++      i += sprintf(ln+i, " %cMVCC=\"XXXXX\"", pre);
+    if (kn->cflags)
+       i += sprintf(ln+i, " %cMVFLAGS=\"%s\"", pre, kn->cflags);
+    i += sprintf(ln+i, " Mt=%d Nt=%d ldat=%d", M, N, lda);
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110818/af744781/attachment.html>