[122764] trunk/dports/math/atlas
vince at macports.org
vince at macports.org
Tue Jul 29 02:19:25 PDT 2014
Revision: 122764
https://trac.macports.org/changeset/122764
Author: vince at macports.org
Date: 2014-07-29 02:19:25 -0700 (Tue, 29 Jul 2014)
Log Message:
-----------
Restore some patchfiles that were necessary to build on PPC. Sorry for the flub.
Modified Paths:
--------------
trunk/dports/math/atlas/Portfile
Added Paths:
-----------
trunk/dports/math/atlas/files/patch-emit_mm_c.diff
trunk/dports/math/atlas/files/patch-makes-Make.lib.diff
Modified: trunk/dports/math/atlas/Portfile
===================================================================
--- trunk/dports/math/atlas/Portfile 2014-07-29 06:25:07 UTC (rev 122763)
+++ trunk/dports/math/atlas/Portfile 2014-07-29 09:19:25 UTC (rev 122764)
@@ -1,4 +1,4 @@
-# $Id$
+$Id$
set ports_ignore_different "yes"
PortSystem 1.0
@@ -8,6 +8,7 @@
license BSD
name atlas
version 3.10.2
+revision 1
use_bzip2 yes
# additional versions
@@ -37,7 +38,9 @@
extract.only ${atlasdist}
-patchfiles patch-archinfo_x86_c.diff
+patchfiles patch-archinfo_x86_c.diff \
+ patch-emit_mm_c.diff \
+ patch-makes-Make.lib.diff
checksums atlas3.10.2.tar.bz2 \
rmd160 af4099e8bb65f5d771618ca1580f5bc8210f83fe \
@@ -774,40 +777,40 @@
build.target build
build.dir ${worksrcpath}/build
-#post-build {
-# if {${universal} == 0} {
-#
-# set libdir ${build.dir}/lib
-# reinplace "s|^LIBTOOL=.*$|LIBTOOL=\$\(GCC\) \$\(GCCFLAGS\)|" \
-# ${libdir}/Makefile
+post-build {
+ if {${universal} == 0} {
+ set libdir ${build.dir}/lib
+ reinplace "s|^LIBTOOL=.*$|LIBTOOL=\$\(GCC\) \$\(GCCFLAGS\)|" \
+ ${libdir}/Makefile
+
# On mono-processors machines, build libsatlas.dylib only
-# if {${no_threads} == 1} {
-#
-# system -W ${libdir} "${build.cmd} dylib"
-# } else {
-#
-# system -W ${libdir} "${build.cmd} shared_all"
-# }
-# } else {
-#
-# foreach arch ${universal_archs_to_use} {
+ if {${no_threads} == 1} {
-# set libdir ${worksrcpath}-${arch}/build/lib
-# reinplace "s|^LIBTOOL=.*$|LIBTOOL=\$\(GCC\) \$\(GCCFLAGS\)|" \
-# ${libdir}/Makefile
+ system -W ${libdir} "${build.cmd} dylib"
+ } else {
+ system -W ${libdir} "${build.cmd} shared_all"
+ }
+ } else {
+
+ foreach arch ${universal_archs_to_use} {
+
+ set libdir ${worksrcpath}-${arch}/build/lib
+ reinplace "s|^LIBTOOL=.*$|LIBTOOL=\$\(GCC\) \$\(GCCFLAGS\)|" \
+ ${libdir}/Makefile
+
# Same as above
-# if {${no_threads} == 1} {
+ if {${no_threads} == 1} {
-# system -W ${libdir} "${build.cmd} dylib"
-# } else {
+ system -W ${libdir} "${build.cmd} dylib"
+ } else {
-# system -W ${libdir} "${build.cmd} shared_all"
-# }
-# }
-# }
-#}
+ system -W ${libdir} "${build.cmd} shared_all"
+ }
+ }
+ }
+}
destroot.dir ${build.dir}
destroot.destdir DESTDIR=${destroot}${prefix}
Added: trunk/dports/math/atlas/files/patch-emit_mm_c.diff
===================================================================
--- trunk/dports/math/atlas/files/patch-emit_mm_c.diff (rev 0)
+++ trunk/dports/math/atlas/files/patch-emit_mm_c.diff 2014-07-29 09:19:25 UTC (rev 122764)
@@ -0,0 +1,15 @@
+--- tune/blas/gemm/emit_mm.c.orig 2012-12-10 13:59:14.000000000 +0100
++++ tune/blas/gemm/emit_mm.c 2012-12-10 13:59:59.000000000 +0100
+@@ -2688,10 +2688,7 @@
+ {
+ if (wp->CC[0]) /* need non-default compilation rule */
+ {
+- char *comp = (wp->CC[0] == 'g' && wp->CC[1] == 'c'
+- && wp->CC[2] == 'c' &&
+- (wp->CC[3] == '\0' || wp->CC[3] == ' '))
+- ? "$(GOODGCC)" : wp->CC;
++ char *comp = "$(GOODGCC)";
+ for (j=0; j < nbetas; j++)
+ {
+ for(k=0; k < wp->ncomps; k++)
+
Added: trunk/dports/math/atlas/files/patch-makes-Make.lib.diff
===================================================================
--- trunk/dports/math/atlas/files/patch-makes-Make.lib.diff (rev 0)
+++ trunk/dports/math/atlas/files/patch-makes-Make.lib.diff 2014-07-29 09:19:25 UTC (rev 122764)
@@ -0,0 +1,56 @@
+--- makes/Make.lib.orig 2013-01-08 12:15:41.000000000 -0600
++++ makes/Make.lib 2013-11-24 02:11:17.000000000 -0600
+@@ -242,7 +242,7 @@
+ LIBINSTdir="$(LIBINSTdir)"
+
+ # =======================================================================
+-# The following commands are to build dynamib libraries on OS X (in BETA)
++# The following commands are to build dynamic libraries on OS X (in BETA)
+ # =======================================================================
+ dylib :
+ rm -rf $(tmpd) ; mkdir $(tmpd)
+@@ -250,7 +250,7 @@
+ cd $(tmpd) ; ar x ../libf77blas.a
+ cd $(tmpd) ; ar x ../libcblas.a
+ cd $(tmpd) ; ar x ../libatlas.a
+- cd $(tmpd) ; $(LIBTOOL) -dynamic -o ../libsatlas.dylib \
++ cd $(tmpd) ; $(LIBTOOL) -dynamiclib -o ../libsatlas.dylib \
+ -install_name $(LIBINSTdir)/libsatlas.dylib -current_version $(VER) \
+ -compatibility_version $(VER) *.o $(LIBS) $(F77SYSLIB)
+ rm -rf $(tmpd)
+@@ -260,7 +260,7 @@
+ cd $(tmpd) ; ar x ../libptf77blas.a
+ cd $(tmpd) ; ar x ../libptcblas.a
+ cd $(tmpd) ; ar x ../libatlas.a
+- cd $(tmpd) ; $(LIBTOOL) -dynamic -o ../libtatlas.dylib \
++ cd $(tmpd) ; $(LIBTOOL) -dynamiclib -o ../libtatlas.dylib \
+ -install_name $(LIBINSTdir)/libtatlas.dylib -current_version $(VER) \
+ -compatibility_version $(VER) *.o $(LIBS) $(F77SYSLIB)
+ rm -rf $(tmpd)
+@@ -269,7 +269,7 @@
+ cd $(tmpd) ; ar x ../libclapack.a
+ cd $(tmpd) ; ar x ../libcblas.a
+ cd $(tmpd) ; ar x ../libatlas.a
+- cd $(tmpd) ; $(LIBTOOL) -dynamic -o ../libsatlas.dylib \
++ cd $(tmpd) ; $(LIBTOOL) -dynamiclib -o ../libsatlas.dylib \
+ -install_name $(LIBINSTdir)/libsatlas.dylib -current_version $(VER) \
+ -compatibility_version $(VER) *.o $(LIBS)
+ rm -rf $(tmpd)
+@@ -278,7 +278,7 @@
+ cd $(tmpd) ; ar x ../libptclapack.a
+ cd $(tmpd) ; ar x ../libptcblas.a
+ cd $(tmpd) ; ar x ../libatlas.a
+- cd $(tmpd) ; $(LIBTOOL) -dynamic -o ../libtatlas.dylib \
++ cd $(tmpd) ; $(LIBTOOL) -dynamiclib -o ../libtatlas.dylib \
+ -install_name $(LIBINSTdir)/libtatlas.dylib -current_version $(VER) \
+ -compatibility_version $(VER) *.o $(LIBS)
+ rm -rf $(tmpd)
+@@ -287,7 +287,7 @@
+ rm -rf $(tmpd) ; mkdir $(tmpd)
+ cd $(tmpd) ; ar x ../liblapack.a
+ rm -f $(tmpd)/*C2F $(tmpd)/*f77wrap*
+- cd $(tmpd) ; libtool -dynamic -o ../libclapack.dylib \
++ cd $(tmpd) ; libtool -dynamiclib -o ../libclapack.dylib \
+ -install_name $(LIBINSTdir)/libclapack.dylib \
+ -compatibility_version $(VER) -current_version $(VER) \
+ *.o ../libcblas.dylib ../libatlas.dylib $(LIBS)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140729/fe3ee884/attachment-0001.html>
More information about the macports-changes
mailing list