CVS commit: pkgsrc/math/openblas

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Mon Jun  7 15:52:04 UTC 2021

Modified Files:
        pkgsrc/math/openblas: Makefile.common distinfo
        pkgsrc/math/openblas/patches: patch-Makefile.install

Log Message:
openblas: fix building on Darwin


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 pkgsrc/math/openblas/Makefile.common \
    pkgsrc/math/openblas/distinfo
cvs rdiff -u -r1.3 -r1.4 pkgsrc/math/openblas/patches/patch-Makefile.install

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/math/openblas/Makefile.common
diff -u pkgsrc/math/openblas/Makefile.common:1.3 pkgsrc/math/openblas/Makefile.common:1.4
--- pkgsrc/math/openblas/Makefile.common:1.3    Sat May 29 19:57:21 2021
+++ pkgsrc/math/openblas/Makefile.common        Mon Jun  7 15:52:04 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.3 2021/05/29 19:57:21 thor Exp $
+# $NetBSD: Makefile.common,v 1.4 2021/06/07 15:52:04 adam Exp $
 #
 # used by math/openblas_pthread/Makefile
 # used by math/openblas_openmp/Makefile
@@ -27,10 +27,6 @@ HOMEPAGE=    https://github.com/xianyi/Open
 COMMENT=       Optimized BLAS library based on GotoBLAS2
 LICENSE=       modified-bsd
 
-# Darwin has a .so/.dylib PLIST issue
-# Untested on other platforms
-ONLY_FOR_PLATFORM=     Linux-*-* NetBSD-*-*
-
 USE_LANGUAGES= c fortran
 USE_TOOLS+=    gmake perl:build
 
Index: pkgsrc/math/openblas/distinfo
diff -u pkgsrc/math/openblas/distinfo:1.3 pkgsrc/math/openblas/distinfo:1.4
--- pkgsrc/math/openblas/distinfo:1.3   Sat May 29 19:57:21 2021
+++ pkgsrc/math/openblas/distinfo       Mon Jun  7 15:52:04 2021
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2021/05/29 19:57:21 thor Exp $
+$NetBSD: distinfo,v 1.4 2021/06/07 15:52:04 adam Exp $
 
 SHA1 (openblas-0.3.15/OpenBLAS-0.3.15.tar.gz) = d7d1f67c1ef0c14c93761bdf44f0da8d0dd4bc0f
 RMD160 (openblas-0.3.15/OpenBLAS-0.3.15.tar.gz) = b740a744c0405d036c39ee5224b7d18f542db788
@@ -13,7 +13,7 @@ RMD160 (openblas-0.3.15/timing.tgz) = f0
 SHA512 (openblas-0.3.15/timing.tgz) = be0abfcfffdf0e118ed7e25a8451639833cf0ad6bb04d101bbe194c16f656b6ce509b2f76acf4ad626d1fb5b126bd5498cfea262f2946c2d077751112a2906af
 Size (openblas-0.3.15/timing.tgz) = 1059485 bytes
 SHA1 (patch-Makefile) = 6b1db300b5487fca53e7c41c27b64017658e6375
-SHA1 (patch-Makefile.install) = eadba533232b2bf7c6ab5e4efe0db9206f35011d
+SHA1 (patch-Makefile.install) = 8c767de27b8c9aa68750c3ed899add322a9e3e29
 SHA1 (patch-Makefile.rule) = 45b6b4576fb521fa093252c63b899d4178a516b6
 SHA1 (patch-Makefile.system) = 6dc9fd85731ca88cb1fdb9063ba3baa31edbcfb8
 SHA1 (patch-common__arm.h) = f08ec61bee8317daac267e90a79f46097b3431c9

Index: pkgsrc/math/openblas/patches/patch-Makefile.install
diff -u pkgsrc/math/openblas/patches/patch-Makefile.install:1.3 pkgsrc/math/openblas/patches/patch-Makefile.install:1.4
--- pkgsrc/math/openblas/patches/patch-Makefile.install:1.3     Sat May 29 19:57:21 2021
+++ pkgsrc/math/openblas/patches/patch-Makefile.install Mon Jun  7 15:52:04 2021
@@ -1,13 +1,31 @@
-$NetBSD: patch-Makefile.install,v 1.3 2021/05/29 19:57:21 thor Exp $
+$NetBSD: patch-Makefile.install,v 1.4 2021/06/07 15:52:04 adam Exp $
 
 Second part of removing the special library names.
+Separate options for "install" (needed at least on Darwin).
 
 --- Makefile.install.orig      2021-05-02 21:50:22.000000000 +0000
 +++ Makefile.install
-@@ -85,29 +85,35 @@ endif
+@@ -74,40 +74,46 @@ endif
+ ifneq ($(OSNAME), AIX)
+ ifndef NO_LAPACKE
+       @echo Copying LAPACKE header files to $(DESTDIR)$(OPENBLAS_INCLUDE_DIR)
+-      @-install -pm644 $(NETLIB_LAPACK_DIR)/LAPACKE/include/lapack.h "$(DESTDIR)$(OPENBLAS_INCLUDE_DIR)/lapack.h"
+-      @-install -pm644 $(NETLIB_LAPACK_DIR)/LAPACKE/include/lapacke.h "$(DESTDIR)$(OPENBLAS_INCLUDE_DIR)/lapacke.h"
+-      @-install -pm644 $(NETLIB_LAPACK_DIR)/LAPACKE/include/lapacke_config.h "$(DESTDIR)$(OPENBLAS_INCLUDE_DIR)/lapacke_config.h"
+-      @-install -pm644 $(NETLIB_LAPACK_DIR)/LAPACKE/include/lapacke_mangling_with_flags.h.in "$(DESTDIR)$(OPENBLAS_INCLUDE_DIR)/lapacke_mangling.h"
+-      @-install -pm644 $(NETLIB_LAPACK_DIR)/LAPACKE/include/lapacke_utils.h "$(DESTDIR)$(OPENBLAS_INCLUDE_DIR)/lapacke_utils.h"
++      @-install -p -m 644 $(NETLIB_LAPACK_DIR)/LAPACKE/include/lapack.h "$(DESTDIR)$(OPENBLAS_INCLUDE_DIR)/lapack.h"
++      @-install -p -m 644 $(NETLIB_LAPACK_DIR)/LAPACKE/include/lapacke.h "$(DESTDIR)$(OPENBLAS_INCLUDE_DIR)/lapacke.h"
++      @-install -p -m 644 $(NETLIB_LAPACK_DIR)/LAPACKE/include/lapacke_config.h "$(DESTDIR)$(OPENBLAS_INCLUDE_DIR)/lapacke_config.h"
++      @-install -p -m 644 $(NETLIB_LAPACK_DIR)/LAPACKE/include/lapacke_mangling_with_flags.h.in "$(DESTDIR)$(OPENBLAS_INCLUDE_DIR)/lapacke_mangling.h"
++      @-install -p -m 644 $(NETLIB_LAPACK_DIR)/LAPACKE/include/lapacke_utils.h "$(DESTDIR)$(OPENBLAS_INCLUDE_DIR)/lapacke_utils.h"
+ endif
+ 
+ #for install static library
  ifneq ($(NO_STATIC),1)
        @echo Copying the static library to $(DESTDIR)$(OPENBLAS_LIBRARY_DIR)
-       @install -pm644 $(LIBNAME) "$(DESTDIR)$(OPENBLAS_LIBRARY_DIR)"
+-      @install -pm644 $(LIBNAME) "$(DESTDIR)$(OPENBLAS_LIBRARY_DIR)"
++      @install -p -m 644 $(LIBNAME) "$(DESTDIR)$(OPENBLAS_LIBRARY_DIR)"
 +ifneq ($(LIBNAME), $(LIBPREFIX).$(LIBSUFFIX))
        @cd "$(DESTDIR)$(OPENBLAS_LIBRARY_DIR)" ; \
        ln -fs $(LIBNAME) $(LIBPREFIX).$(LIBSUFFIX)