diff --git a/math/blis/Makefile b/math/blis/Makefile index 2793d3538f46..baa73955f9e3 100644 --- a/math/blis/Makefile +++ b/math/blis/Makefile @@ -1,71 +1,75 @@ PORTNAME= blis PORTVERSION= 0.9.0 PORTREVISION= 2 CATEGORIES= math MAINTAINER= jmd@FreeBSD.org COMMENT= Software framework for high-performance BLAS-like libraries WWW= https://github.com/flame/blis LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= bash:shells/bash USES= compiler gmake perl5 python shebangfix USE_GITHUB= yes GH_ACCOUNT= flame USE_LDCONFIG= yes USE_PERL5= build SHEBANG_FILES= build/flatten-headers.py OPTIONS_DEFINE= PARA CBLAS PARA_DESC= use pthread parallelization CBLAS_DESC= build the CBLAS compatibility layer OPTIONS_DEFAULT= PARA CBLAS OPTIONS_SUB= yes CFLAGS_riscv64= -mno-relax HAS_CONFIGURE= yes TEST_TARGET= test .include # enable BLAS and static/shared libs by default CONFIGURE_ARGS+= --enable-blas \ --prefix=${PREFIX} \ --enable-shared \ --enable-static #--prefix=PREFIX .if ${PORT_OPTIONS:MPARA} CONFIGURE_ARGS+= -t pthreads .endif .if ${PORT_OPTIONS:MCBLAS} CONFIGURE_ARGS+= --enable-cblas .endif .if ${ARCH} == amd64 CONFIGURE_ARGS+= x86_64 PLIST_SUB+= ARCH="x86_64" .elif ${ARCH:Mpowerpc64*} CONFIGURE_ARGS+= power9 PLIST_SUB+= ARCH="power9" USE_GCC= yes .else CONFIGURE_ARGS+= generic PLIST_SUB+= ARCH="generic" .endif .include +.if ${COMPILER_TYPE} == clang && ${COMPILER_VERSION} >= 190 +EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-config_knl_make__defs.mk +.endif + .if ${CHOSEN_COMPILER_TYPE} == gcc USE_GCC= yes .endif post-install: @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libblis.so.4.0.0 .include diff --git a/math/blis/files/extra-patch-config_knl_make__defs.mk b/math/blis/files/extra-patch-config_knl_make__defs.mk new file mode 100644 index 000000000000..e2b980ba641d --- /dev/null +++ b/math/blis/files/extra-patch-config_knl_make__defs.mk @@ -0,0 +1,20 @@ +--- config/knl/make_defs.mk.orig 2022-04-01 13:12:06 UTC ++++ config/knl/make_defs.mk +@@ -81,7 +81,7 @@ ifeq ($(CC_VENDOR),clang) + CKVECFLAGS := -xMIC-AVX512 + else + ifeq ($(CC_VENDOR),clang) +-CKVECFLAGS := -mavx512f -mavx512pf -mfpmath=sse -march=knl ++CKVECFLAGS := -mavx512f -mfpmath=sse -march=knl + else + $(error gcc, icc, or clang is required for this configuration.) + endif +@@ -105,7 +105,7 @@ ifeq ($(CC_VENDOR),clang) + CRVECFLAGS := -xMIC-AVX512 + else + ifeq ($(CC_VENDOR),clang) +-CRVECFLAGS := -march=knl -mno-avx512f -mno-avx512pf -mno-avx512er -mno-avx512cd -funsafe-math-optimizations -ffp-contract=fast ++CRVECFLAGS := -march=knl -mno-avx512f -mno-avx512cd -funsafe-math-optimizations -ffp-contract=fast + else + $(error gcc, icc, or clang is required for this configuration.) + endif