CVS commit: pkgsrc/math

["Dr. Thomas Orgis" <thor%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   thor
Date:           Tue Jun 15 15:06:24 UTC 2021

Modified Files:
        pkgsrc/math/lapack: Makefile.common
        pkgsrc/math/openblas: Makefile.common

Log Message:
math/lapack, math/openblas: more inclusive 64 bit platform check

The simple approach missed alpha.


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 pkgsrc/math/lapack/Makefile.common
cvs rdiff -u -r1.5 -r1.6 pkgsrc/math/openblas/Makefile.common

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

Modified files:

Index: pkgsrc/math/lapack/Makefile.common
diff -u pkgsrc/math/lapack/Makefile.common:1.14 pkgsrc/math/lapack/Makefile.common:1.15
--- pkgsrc/math/lapack/Makefile.common:1.14     Tue Jun 15 04:41:52 2021
+++ pkgsrc/math/lapack/Makefile.common  Tue Jun 15 15:06:23 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.14 2021/06/15 04:41:52 thor Exp $
+# $NetBSD: Makefile.common,v 1.15 2021/06/15 15:06:23 thor Exp $
 # used by math/blas/Makefile
 # used by math/cblas/Makefile
 # used by math/lapacke/Makefile
@@ -35,8 +35,10 @@ WRKSRC=              ${WRKDIR}/${DISTNAME}
 CONFIGURE_DIRS=        build
 CMAKE_ARG_PATH=        ${WRKSRC}
 
+.include "../../mk/bsd.prefs.mk"
+
 .if !empty(LAPACK_COMPONENT:M*64)
-.  if empty(MACHINE_ARCH:M*64)
+.  if empty(LP64PLATFORMS:@.PLAT.@${MACHINE_PLATFORM:M${.PLAT.}}@)
 PKG_FAIL_REASON+=      "${LAPACK_COMPONENT} incompatible with non-64-bit platform"
 .  endif
 HEADERDIR=             netlib64

Index: pkgsrc/math/openblas/Makefile.common
diff -u pkgsrc/math/openblas/Makefile.common:1.5 pkgsrc/math/openblas/Makefile.common:1.6
--- pkgsrc/math/openblas/Makefile.common:1.5    Tue Jun 15 04:41:52 2021
+++ pkgsrc/math/openblas/Makefile.common        Tue Jun 15 15:06:23 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.5 2021/06/15 04:41:52 thor Exp $
+# $NetBSD: Makefile.common,v 1.6 2021/06/15 15:06:23 thor Exp $
 #
 # used by math/openblas_pthread/Makefile
 # used by math/openblas_openmp/Makefile
@@ -62,7 +62,7 @@ MAKE_FLAGS+=          NUM_THREADS=${OPENBLAS_THR
 .endif
 BENCHMARK_MAXTHREADS?= 8
 
-.if ${MACHINE_ARCH:M*64} == ""
+.if empty(LP64PLATFORMS:@.PLAT.@${MACHINE_PLATFORM:M${.PLAT.}}@)
 MAKE_FLAGS+=           BINARY32=1
 .  if !empty(OPENBLAS_VARIANT:M*64*)
 PKG_FAIL_REASON+=      "${OPENBLAS_VARIANT} incompatible with non-64-bit platform"
@@ -78,9 +78,7 @@ MAKE_FLAGS+=          BINARY64=1
 MAKE_FLAGS+=   OPENBLAS_INCLUDE_DIR=${PREFIX}/include/${OPENBLAS_VARIANT}
 MAKE_FLAGS+=   OPENBLAS_CMAKE_DIR=${PREFIX}/lib/cmake/${OPENBLAS_VARIANT}
 
-# TODO: Set INTERFACE64=1 with additional OPENBLAS_VARIANTs.
-# Need to settle on a convention for SYMBOLSUFFIX first, see
-# https://github.com/xianyi/OpenBLAS/issues/646 .
+# Settled on no sumbol suffix for 64 bit.
 MAKE_FLAGS+=   FIXED_LIBNAME=1
 .if ${OPENBLAS_VARIANT} == openblas || ${OPENBLAS_VARIANT} == openblas64
 MAKE_FLAGS+=   USE_OPENMP=0 USE_THREAD=0 USE_LOCKING=1