pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
wip/gemma: attempt to fix it up for BLAS_C_INTERFACE
Module Name: pkgsrc-wip
Committed By: Dr. Thomas Orgis <thomas.orgis%uni-hamburg.de@localhost>
Pushed By: thor
Date: Tue Jun 15 09:45:25 2021 +0200
Changeset: 0181a41520d2c6c53c36fb2befa0e0e8779d0ff8
Modified Files:
gemma/Makefile
Log Message:
wip/gemma: attempt to fix it up for BLAS_C_INTERFACE
… but failing to do so, properly. There is header conflict between gsl
and our cblas.h. This insane package combines gsl, BLAS _and_ eigen3?!
I hope Jason can fix it up.
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=0181a41520d2c6c53c36fb2befa0e0e8779d0ff8
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
gemma/Makefile | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diffs:
diff --git a/gemma/Makefile b/gemma/Makefile
index 72dda89ef7..97ab16a4cb 100644
--- a/gemma/Makefile
+++ b/gemma/Makefile
@@ -21,7 +21,7 @@ USE_TOOLS+= gmake perl
CXXFLAGS+= -I${PREFIX}/include/eigen3
CXXFLAGS+= -fpermissive
-MAKE_FLAGS+= LDFLAGS+="${LAPACK_LIBS} -lgsl -lcblas -lz"
+MAKE_FLAGS+= LDFLAGS+="${LAPACK_LIBS} -lgsl ${CBLAS_LIBS} -lz"
MAKE_FILE= ${FILESDIR}/Makefile
# Requires multithreading for decent performance
@@ -29,8 +29,11 @@ MAKE_FILE= ${FILESDIR}/Makefile
# of math/cblas, if there were any.
BLAS_ACCEPTED= openblas_pthread openblas_openmp accelerate.framework
+BLAS_C_INTERFACE= yes
+CXXFLAGS+= ${BLAS_INCLUDES}
+
.if !empty(BLAS_TYPE:Mopenblas*)
-CXXFLAGS+= -I${PREFIX}/include/${BLAS_TYPE} -DOPENBLAS
+CXXFLAGS+= -DOPENBLAS
.endif
INSTALLATION_DIRS= bin share/examples
@@ -39,7 +42,7 @@ do-test:
(cd ${WRKSRC}/test && ${SH} test_suite.sh)
.include "../../devel/zlib/buildlink3.mk"
-.include "../../math/cblas/buildlink3.mk"
+.include "../../mk/blas.buildlink3.mk"
.include "../../math/gsl/buildlink3.mk"
.include "../../math/eigen3/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Home |
Main Index |
Thread Index |
Old Index