From ed61aa3347e316f03a357fc443fa9d565c697e8d Mon Sep 17 00:00:00 2001 From: Jason Bacon Date: Mon, 19 Oct 2020 13:52:20 -0500 Subject: [PATCH] cblas: Remove wip refs for testing with committed BLAS framework --- cblas/Makefile | 4 ++-- cblas/buildlink3.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cblas/Makefile b/cblas/Makefile index fff706a8e5..99439698e5 100644 --- a/cblas/Makefile +++ b/cblas/Makefile @@ -10,6 +10,6 @@ LAPACK_COMPONENT_CMAKE_ARGS= \ -DCBLAS=ON -DLAPACKE=OFF \ -DCMAKE_VERBOSE=ON -.include "../../wip/mk/blas.buildlink3.mk" -.include "../../wip/lapack/Makefile.common" +.include "../../mk/blas.buildlink3.mk" +.include "../../math/lapack/Makefile.common" .include "../../mk/bsd.pkg.mk" diff --git a/cblas/buildlink3.mk b/cblas/buildlink3.mk index 6bf92148a6..70e2e7ecbd 100644 --- a/cblas/buildlink3.mk +++ b/cblas/buildlink3.mk @@ -12,7 +12,7 @@ BUILDLINK_PKGSRCDIR.cblas?= ../../wip/cblas # Without this, they can be included in either order. # I think pkg Makefiles should include both for clarity rather than have # cblas implicitly pull in blas.bl3. -#.include "../../wip/mk/blas.buildlink3.mk" +# .include "../../mk/blas.buildlink3.mk" .endif BUILDLINK_TREE+= -cblas