cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Register libcblas.so dependency on libblas.so

Browse Source 
This avoids a runtime error with software linked by ld.lld -lcblas, and
a build error with ld.bfd -lcblas.

Spotted by sthen@ and tb@ while working on a py-numpy update.  Tests by
tb@ and martin@, ok tb@

A bunch of people want to move forward with this, so I'm not waiting for
Steven's ok.
This commit is contained in:
jca 2020-03-13 13:36:42 +00:00
parent 26005194b9
commit 3b5c90efe1
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
math/cblas/Makefile
View File

@ -1,12 +1,12 @@
# $OpenBSD: Makefile,v 1.20 2019/07/12 20:47:40 sthen Exp $
# $OpenBSD: Makefile,v 1.21 2020/03/13 13:36:42 jca Exp $
COMMENT= C interface to the BLAS library
VERSION= 1.0
DISTNAME= cblas
PKGNAME= ${DISTNAME}-${VERSION}
REVISION= 6
SHARED_LIBS= cblas 1.0
REVISION= 7
SHARED_LIBS= cblas 1.1
CATEGORIES= math

1
math/cblas/files/Makefile
View File

@ -42,5 +42,6 @@ cblas_dgemm.c cblas_sdsdot.c cblas_zhemm.c zdotusub.f \
cblas_dgemv.c cblas_sgbmv.c cblas_zhemv.c \
cblas_dger.c cblas_sgemm.c cblas_zher.c \
cblas_dnrm2.c cblas_sgemv.c cblas_zher2.c
LDADD=-lblas -lgfortran
.include <bsd.lib.mk>

6
math/cblas/pkg/PLIST
View File

@ -1,6 +1,6 @@
@comment $OpenBSD: PLIST,v 1.4 2015/03/16 18:07:49 naddy Exp $
@comment $OpenBSD: PLIST,v 1.5 2020/03/13 13:36:42 jca Exp $
include/cblas.h
include/cblas_f77.h
lib/libcblas.a
@static-lib lib/libcblas.a
@lib lib/libcblas.so.${LIBcblas_VERSION}
lib/libcblas_p.a
@static-lib lib/libcblas_p.a