Changeset 82700

Timestamp:

08/18/11 11:41:32 (4 years ago)

Author:

vince@…

Message:

Another try to fix -force… loss on G4 and pthreads problem on i386.

Location:

trunk/dports/math/atlas

Files:

• Portfile (modified) (2 diffs)
• files/patch-Makefile_pthreads_misc.diff (modified) (1 diff)
• files/patch-build-Make.top.diff (deleted)
• files/patch-mvtesttime_h.diff (added)

trunk/dports/math/atlas/Portfile

@@ -37 +37 @@
                                         patch-atlas_l2g_base.diff \
                                         patch-mmparse_h.diff \
-                                        patch-mvparse_h.diff
+                                        patch-mvparse_h.diff \
+                                        patch-mvtesttime_h.diff
 
 
@@ -238 +239 @@
                                  ${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.

trunk/dports/math/atlas/files/patch-Makefile_pthreads_misc.diff

@@ -1 @@
---- 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)