[121094] trunk/dports/math/OpenBLAS

[nicos at macports.org]

Revision: 121094
          https://trac.macports.org/changeset/121094
Author:   nicos at macports.org
Date:     2014-06-17 05:02:22 -0700 (Tue, 17 Jun 2014)
Log Message:
-----------
openblas: update to 0.9.2

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

Added Paths:
-----------
    trunk/dports/math/OpenBLAS/files/patch-linkLib.diff

Removed Paths:
-------------
    trunk/dports/math/OpenBLAS/files/patch-lapacke.h.diff

Modified: trunk/dports/math/OpenBLAS/Portfile
===================================================================
--- trunk/dports/math/OpenBLAS/Portfile	2014-06-17 11:40:41 UTC (rev 121093)
+++ trunk/dports/math/OpenBLAS/Portfile	2014-06-17 12:02:22 UTC (rev 121094)
@@ -5,10 +5,9 @@
 PortGroup           github 1.0
 PortGroup           muniversal 1.0
 
-github.setup        xianyi OpenBLAS 0.2.8 v
+github.setup        xianyi OpenBLAS 0.2.9 v
 
 conflicts           OpenBLAS-devel
-revision            2
 categories          math science
 license             BSD
 maintainers         nicos openmaintainer
@@ -21,10 +20,10 @@
 archive_sites
 
 patchfiles          patch-libnoarch.diff \
-                    patch-lapacke.h.diff
+                    patch-linkLib.diff
 
-checksums           rmd160  5f08d211f20a46c77eda4ff212201e684a2baf14 \
-                    sha256  048986f4e0a8d480c5e6d439915738f3298f2629d6a399a1ddb16e1629b07901
+checksums           rmd160  0b8ea63f02409e94a8a5e00fe1e4ef2ec9ebbde1 \
+                    sha256  2d1bdeef52d746c1bec8cdbed8be39c2de6353b4f4da0849f28d56cc037e00cb
 
 variant gcc45 conflicts gcc46 gcc47 gcc48 gcc49 clang \
     description "Use Gcc45 as compiler" { 
@@ -115,11 +114,6 @@
         }
     } else {
         set makeINC [open ${worksrcpath}/Makefile.rule "w"]
-        #Present version of openblas does not detect Haswell correctly.
-        #Revert to Sandy Bridge
-        if { ![catch {sysctl hw.cpufamily} cputype] && $cputype == 280134364 } {
-            puts $makeINC "TARGET=SANDYBRIDGE"
-        }
         puts $makeINC "VERSION = ${version}"
         puts $makeINC "LIBNAMESUFFIX = "
 
@@ -153,7 +147,7 @@
 #and using gcc-mp ones end up in an error about a missing plugin 
 #(see ticket #38551 for example)
 build.args          "AR=/usr/bin/ar RANLIB=/usr/bin/ranlib"
-destroot.args       "PREFIX=${destroot}${prefix}"
+destroot.args       "PREFIX=${prefix}"
 
 post-destroot {
     #Avoid conflict with Atlas
@@ -163,4 +157,15 @@
     system "install_name_tool -id \
         ${prefix}/lib/libopenblas-r${version}.dylib \
         ${destroot}${prefix}/lib/libopenblas-r${version}.dylib"
+    if {[variant_isset lapack]} {
+        #Install lapacke headers too
+        xinstall -m 755 ${worksrcpath}/lapack-netlib/lapacke/include/lapacke_config.h \
+            ${destroot}/${prefix}/include/lapacke_config.h
+        xinstall -m 755 ${worksrcpath}/lapack-netlib/lapacke/include/lapacke_mangling.h \
+            ${destroot}/${prefix}/include/lapacke_mangling.h
+        xinstall -m 755 ${worksrcpath}/lapack-netlib/lapacke/include/lapacke_utils.h \
+            ${destroot}/${prefix}/include/lapacke_utils.h
+        xinstall -m 755 ${worksrcpath}/lapack-netlib/lapacke/include/lapacke.h \
+            ${destroot}/${prefix}/include/lapacke.h
+    }
 }

Deleted: trunk/dports/math/OpenBLAS/files/patch-lapacke.h.diff
===================================================================
--- trunk/dports/math/OpenBLAS/files/patch-lapacke.h.diff	2014-06-17 11:40:41 UTC (rev 121093)
+++ trunk/dports/math/OpenBLAS/files/patch-lapacke.h.diff	2014-06-17 12:02:22 UTC (rev 121094)
@@ -1,24 +0,0 @@
---- lapack-netlib/lapacke/include/lapacke.h.orig	2013-08-01 08:53:12.000000000 +0900
-+++ lapack-netlib/lapacke/include/lapacke.h	2013-11-26 12:44:25.000000000 +0900
-@@ -41,10 +41,6 @@
- #include "lapacke_config.h"
- #endif
- 
--#ifdef __cplusplus
--extern "C" {
--#endif /* __cplusplus */
--
- #include <stdlib.h>
- 
- #ifndef lapack_int
-@@ -142,6 +138,10 @@
- 
- #include "lapacke_mangling.h"
- 
-+#ifdef __cplusplus
-+extern "C" {
-+#endif /* __cplusplus */
-+
- #define LAPACK_lsame LAPACK_GLOBAL(lsame,LSAME)
- lapack_logical LAPACK_lsame( char* ca,  char* cb,
-                               lapack_int lca, lapack_int lcb );

Added: trunk/dports/math/OpenBLAS/files/patch-linkLib.diff
===================================================================
--- trunk/dports/math/OpenBLAS/files/patch-linkLib.diff	                        (rev 0)
+++ trunk/dports/math/OpenBLAS/files/patch-linkLib.diff	2014-06-17 12:02:22 UTC (rev 121094)
@@ -0,0 +1,11 @@
+--- Makefile.install.orig	2013-12-16 21:31:17.000000000 +0900
++++ Makefile.install	2013-12-19 22:08:57.000000000 +0900
+@@ -75,7 +75,7 @@
+ ifeq ($(OSNAME), Darwin)     
+ 	@-cp $(LIBDYNNAME) $(DESTDIR)$(OPENBLAS_LIBRARY_DIR)
+ 	@-install_name_tool -id $(DESTDIR)$(OPENBLAS_LIBRARY_DIR)/$(LIBDYNNAME) $(DESTDIR)$(OPENBLAS_LIBRARY_DIR)/$(LIBDYNNAME)
+-	@-ln -fs $(DESTDIR)$(OPENBLAS_LIBRARY_DIR)/$(LIBDYNNAME) $(DESTDIR)$(OPENBLAS_LIBRARY_DIR)/$(LIBPREFIX).dylib
++	@-ln -fs $(OPENBLAS_LIBRARY_DIR)/$(LIBDYNNAME) $(DESTDIR)$(OPENBLAS_LIBRARY_DIR)/$(LIBPREFIX).dylib
+ endif
+ ifeq ($(OSNAME), WINNT)
+ 	@-cp $(LIBDLLNAME) $(OPENBLAS_LIBRARY_DIR)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140617/cf685970/attachment.html>