[114017] trunk/dports/math/atlas

[vince at macports.org]

Revision: 114017
          https://trac.macports.org/changeset/114017
Author:   vince at macports.org
Date:     2013-11-27 04:58:12 -0800 (Wed, 27 Nov 2013)
Log Message:
-----------
As per Ryan suggestion. Should fix #40182

Modified Paths:
--------------
    trunk/dports/math/atlas/Portfile

Added Paths:
-----------
    trunk/dports/math/atlas/files/patch-makes-Make.lib.diff

Modified: trunk/dports/math/atlas/Portfile
===================================================================
--- trunk/dports/math/atlas/Portfile	2013-11-27 12:31:22 UTC (rev 114016)
+++ trunk/dports/math/atlas/Portfile	2013-11-27 12:58:12 UTC (rev 114017)
@@ -38,7 +38,8 @@
 extract.only            ${atlasdist}
 
 patchfiles              patch-emit_mm_c.diff \
-                        patch-ATL_cmm4x4x128_av_c.diff
+                        patch-ATL_cmm4x4x128_av_c.diff \
+                        patch-makes-Make.lib.diff
 
 checksums               ${atlasdist} \
                         rmd160  67f928ad900caa300b23e2f824b8a495f416c8d6 \
@@ -765,7 +766,6 @@
         set libdir ${build.dir}/lib
         reinplace "s|^LIBTOOL=.*$|LIBTOOL=\$\(GCC\) \$\(GCCFLAGS\)|" \
             ${libdir}/Makefile
-        reinplace "s|-dynamic |-dynamiclib |g" ${libdir}/Makefile
 
         # On mono-processors machines, build libsatlas.dylib only
         if {${no_threads} == 1} {
@@ -782,7 +782,6 @@
             set libdir ${worksrcpath}-${arch}/build/lib
             reinplace "s|^LIBTOOL=.*$|LIBTOOL=\$\(GCC\) \$\(GCCFLAGS\)|" \
                 ${libdir}/Makefile
-            reinplace "s|dynamic |dynamiclib |g" ${libdir}/Makefile
 
             # Same as above
             if {${no_threads} == 1} {

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	2013-11-27 12:58:12 UTC (rev 114017)
@@ -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/20131127/4d1de132/attachment-0001.html>