Attachment #205347 for bug #231371

Lines 41-48 Link Here

(-)Mk/Uses/blaslapack.mk (-2 / +2 lines)
41	LAPACKLIB= -llapack	41	LAPACKLIB= -llapack
42	.elif ${blaslapack_ARGS} == openblas	42	.elif ${blaslapack_ARGS} == openblas
43	LIB_DEPENDS+= libopenblas.so:math/openblas	43	LIB_DEPENDS+= libopenblas.so:math/openblas
44	_BLASLIB= openblasp	44	_BLASLIB= openblas
45	LAPACKLIB= -lopenblasp	45	LAPACKLIB= -lopenblas
46	.else	46	.else
47	IGNORE= USES=blaslapack: invalid arguments: ${blaslapack_ARGS}	47	IGNORE= USES=blaslapack: invalid arguments: ${blaslapack_ARGS}
48	.endif	48	.endif




# $FreeBSD$

PORTNAME=	openblas
PORTVERSION=	0.3.6
PORTREVISION=	8
DISTVERSIONPREFIX=	v
PORTEPOCH=	1
CATEGORIES=	math

LICENSE=	BSD3CLAUSE
LICENSE_FILE=	${WRKSRC}/LICENSE

CONFLICTS_INSTALL=	cblas lapacke

USES=		fortran gmake perl5 pkgconfig

USE_GITHUB=	yes
GH_ACCOUNT=	xianyi
GH_PROJECT=	OpenBLAS

USE_LDCONFIG=	yes
USE_PERL5=	build

OPENBLAS_SUFX=	r${PORTVERSION}
OPENBLAS_LIBS=	libopenblas libopenblasp
OPENBLAS_SVER=	0
OPENBLAS_FILES=	${OPENBLAS_LIBS:S|$|.so|} ${OPENBLAS_LIBS:S|$|.so.${OPENBLAS_SVER}|} ${OPENBLAS_LIBS:S|$|.a|}
PLIST_FILES=	${OPENBLAS_FILES:S|^|lib/|}
TEST_TARGET=	tests

BUILDFLAGS=	FCOMMON_OPT=-frecursive MAKE_NB_JOBS=-1

AVX_DESC=		Support Advanced Vector Extensions (AVX)
AVX2_DESC=		Support Advanced Vector Extensions 2 (AVX2)

MAKE_ENV+=	${MAKE_ENV_${ARCH}}
MAKE_ENV_powerpc64=	TARGET=POWER7

.include <bsd.port.options.mk>

.if defined(TARGET_CPU_ARCH)

BUILDFLAGS+=	INTERFACE64=1
.endif

.if ${PORT_OPTIONS:MOPENMP}
USES+=		compiler:openmp
BUILDFLAGS_THREAD+=	USE_OPENMP=1
.endif

.if ! ${PORT_OPTIONS:MAVX}
BUILDFLAGS+=	NO_AVX=1
.endif

BUILDFLAGS+=	NO_AVX2=1
.endif

.if ${PORT_OPTIONS:MOPENMP}
USES+=		compiler:openmp
BUILDFLAGS_THREAD+=	USE_OPENMP=1
.else
USES+=		compiler:c11
.endif

.include <bsd.port.pre.mk>

.if ${PORT_OPTIONS:MOPENMP}
.if ${CHOSEN_COMPILER_TYPE} == gcc
USE_GCC=	yes
.endif
.endif

post-extract:
	cd ${DISTDIR}/${DIST_SUBDIR} ; \
	${CP} ${LARGE_FILE} ${TIMING_FILE} ${WRKSRC}

	${MKDIR} ${WRKDIR}/lib

post-patch:
	${REINPLACE_CMD} \
		-e 's/defined(linux)/(defined(linux) || defined(__FreeBSD__))/g' \
		-e 's/ifdef linux/if defined(linux) || defined(__FreeBSD__)/g' \
		${WRKSRC}/kernel/power/*.S
	${REINPLACE_CMD} -e "s+%%FC%%+${FC}+" -e "s+%%CC%%+${CC}+" \
		${WRKSRC}/Makefile.rule
	${REINPLACE_CMD} -e "s+(ARCH)+(ARCH_)+" \
		${WRKSRC}/Makefile.rule \
		${WRKSRC}/Makefile.tail \
		${WRKSRC}/driver/level3/Makefile \
		${WRKSRC}/driver/others/Makefile \
		${WRKSRC}/exports/Makefile \
		${WRKSRC}/interface/Makefile \
		${WRKSRC}/kernel/Makefile \
		${WRKSRC}/kernel/Makefile.L3 \
		${WRKSRC}/lapack/laswp/Makefile \
		${WRKSRC}/lapack-netlib/SRC/Makefile \
		${WRKSRC}/lapack-netlib/SRC/VARIANTS/Makefile \
		${WRKSRC}/lapack-netlib/TESTING/MATGEN/Makefile \
		${WRKSRC}/lapack-netlib/LAPACKE/src/Makefile \
		${WRKSRC}/lapack-netlib/LAPACKE/utils/Makefile \
		${WRKSRC}/reference/Makefile
	${REINPLACE_CMD} -e "s+(ARCH)+(ARCH_)+" \
	-e 's+%%LDFLAGS%%+${LDFLAGS}+' \
	-e 's+%%LOCALBASE%%+${LOCALBASE}+' \
	-e 's+%%FIND%%+${FIND}+' \
	-e 's+%%XARGS%%+${XARGS}+' \
	-e 's+%%REINPLACE_CMD%%+${REINPLACE_CMD}+' \
	-e 's+$${CROSS_SUFFIX}+${LOCALBASE}/bin/+' \
	-e '/Clang.*OpenMP/g' \
		${WRKSRC}/Makefile.system

post-patch-OPENMP-on:
	${REINPLACE_CMD} -e "s+OPENBLAS_NUM_THREADS+OMP_NUM_THREADS+g" \

		${WRKSRC}/test/Makefile \
		${WRKSRC}/ctest/Makefile

post-install:
	${MV} ${STAGEDIR}${PREFIX}/lib/lib${PORTNAME}_*-r${PORTVERSION}.a ${STAGEDIR}${PREFIX}/lib/lib${PORTNAME}.a
	${MV} ${STAGEDIR}${PREFIX}/lib/lib${PORTNAME}_*-r${PORTVERSION}.so ${STAGEDIR}${PREFIX}/lib/lib${PORTNAME}.so.${OPENBLAS_SVER}
	${RM} ${STAGEDIR}${PREFIX}/lib/lib${PORTNAME}.so
	${LN} -sf lib${PORTNAME}.so.${OPENBLAS_SVER} ${STAGEDIR}${PREFIX}/lib/lib${PORTNAME}.so
	cd ${WRKSRC} ; ${MAKE_CMD} ${MAKE_ARGS} clean
	cd ${WRKSRC} ; ${SETENV} ${BUILDFLAGS} ${BUILDFLAGS_THREAD} \
	${MAKE_CMD} ${MAKE_ARGS}
	${CP} ${WRKSRC}/libopenblasp-${OPENBLAS_SUFX}.a ${WRKDIR}/lib/libopenblasp.a
	${CP} ${WRKSRC}/libopenblasp-${OPENBLAS_SUFX}.so ${WRKDIR}/lib/libopenblasp.so.${OPENBLAS_SVER}

BENCHMARK_MAXTHREADS?=	${MAXTHREADS}
.if ${PORT_OPTIONS:MOPENMP}

	cd ${WRKSRC}/benchmark ; ${SETENV} ${BUILDFLAGS} NUM_THREADS=${MAXTHREADS} \
	USE_THREAD=1 ${BENCHMARK_THREADS_FLAG} ${MAKE_CMD} ${MAKE_ARGS}

.include <bsd.port.post.mk>
.for L in ${OPENBLAS_LIBS}
	${INSTALL_DATA} ${WRKDIR}/lib/${L}.a ${STAGEDIR}${PREFIX}/lib
	${INSTALL_LIB} ${WRKDIR}/lib/${L}.so.${OPENBLAS_SVER} ${STAGEDIR}${PREFIX}/lib
	${LN} -sf ${L}.so.${OPENBLAS_SVER} ${STAGEDIR}${PREFIX}/lib/${L}.so
.endfor

.include <bsd.port.mk>

Lines 1-7 Link Here

(-)math/openblas/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1503123719	1	TIMESTAMP = 1556566525
2	SHA256 (openblas/large.tgz) = f328d88b7fa97722f271d7d0cfea1c220e0f8e5ed5ff01d8ef1eb51d6f4243a1	2	SHA256 (openblas/large.tgz) = f328d88b7fa97722f271d7d0cfea1c220e0f8e5ed5ff01d8ef1eb51d6f4243a1
3	SIZE (openblas/large.tgz) = 2595	3	SIZE (openblas/large.tgz) = 2595
4	SHA256 (openblas/timing.tgz) = 999c65f8ea8bd4eac7f1c7f3463d4946917afd20a997807300fe35d70122f3af	4	SHA256 (openblas/timing.tgz) = 999c65f8ea8bd4eac7f1c7f3463d4946917afd20a997807300fe35d70122f3af
5	SIZE (openblas/timing.tgz) = 1059485	5	SIZE (openblas/timing.tgz) = 1059485
6	SHA256 (openblas/xianyi-OpenBLAS-v0.2.20_GH0.tar.gz) = 5ef38b15d9c652985774869efd548b8e3e972e1e99475c673b25537ed7bcf394	6	SHA256 (openblas/xianyi-OpenBLAS-v0.3.6_GH0.tar.gz) = e64c8fe083832ffbc1459ab6c72f71d53afd3b36e8497c922a15a06b72e9002f
7	SIZE (openblas/xianyi-OpenBLAS-v0.2.20_GH0.tar.gz) = 11637301	7	SIZE (openblas/xianyi-OpenBLAS-v0.3.6_GH0.tar.gz) = 11920973

Lines 1-11 Link Here

(-)math/openblas/files/patch-Makefile (-11 lines)
1	--- Makefile.orig 2015-10-27 20:44:50 UTC
2	+++ Makefile
3	@@ -238,7 +238,7 @@ ifndef NOFORTRAN
4	-@echo "LOADOPTS = $(FFLAGS) $(EXTRALIB)" >> $(NETLIB_LAPACK_DIR)/make.inc
5	-@echo "CC = $(CC)" >> $(NETLIB_LAPACK_DIR)/make.inc
6	-@echo "override CFLAGS = $(LAPACK_CFLAGS)" >> $(NETLIB_LAPACK_DIR)/make.inc
7	- -@echo "ARCH = $(AR)" >> $(NETLIB_LAPACK_DIR)/make.inc
8	+ -@echo "ARCH_ = $(AR)" >> $(NETLIB_LAPACK_DIR)/make.inc
9	-@echo "ARCHFLAGS = -ru" >> $(NETLIB_LAPACK_DIR)/make.inc
10	-@echo "RANLIB = $(RANLIB)" >> $(NETLIB_LAPACK_DIR)/make.inc
11	-@echo "LAPACKLIB = ../$(LIBNAME)" >> $(NETLIB_LAPACK_DIR)/make.inc




--- Makefile.rule.orig	2015-10-27 20:44:50 UTC
+++ Makefile.rule
@@ -19,10 +19,10 @@ VERSION = 0.2.15
 
 # C compiler including binary type(32bit / 64bit). Default is gcc.
 # Don't use Intel Compiler or PGI, it won't generate right codes as I expect.
-# CC = gcc
+CC = %%CC%%
 
 # Fortran compiler. Default is g77.
-# FC = gfortran
+FC = %%FC%%
 
 # Even you can specify cross compiler. Meanwhile, please set HOSTCC.
 




--- Makefile.system.orig	2015-10-27 20:44:50 UTC
+++ Makefile.system
@@ -218,6 +218,7 @@ MD5SUM = md5 -r
 endif
 
 ifeq ($(OSNAME), FreeBSD)
+EXTRALIB	+= -lm %%LDFLAGS%%
 MD5SUM = md5 -r
 endif
 
@@ -889,9 +890,17 @@ SYMBOLSUFFIX =
 endif
 
 ifndef LIBNAMESUFFIX
+ifndef SMP
 LIBPREFIX = lib$(SYMBOLPREFIX)openblas$(SYMBOLSUFFIX)
 else
+LIBPREFIX = lib$(SYMBOLPREFIX)openblasp$(SYMBOLSUFFIX)
+endif
+else
+ifndef SMP
 LIBPREFIX = lib$(SYMBOLPREFIX)openblas$(SYMBOLSUFFIX)_$(LIBNAMESUFFIX)
+else
+LIBPREFIX = lib$(SYMBOLPREFIX)openblasp$(SYMBOLSUFFIX)_$(LIBNAMESUFFIX)
+endif
 endif
 
 KERNELDIR	= $(TOPDIR)/kernel/$(ARCH)
@@ -1020,24 +1029,8 @@ ifndef LIBSUFFIX
 LIBSUFFIX = a
 endif
 
-ifneq ($(DYNAMIC_ARCH), 1)
-ifndef SMP
-LIBNAME		= $(LIBPREFIX)_$(LIBCORE)$(REVISION).$(LIBSUFFIX)
-LIBNAME_P	= $(LIBPREFIX)_$(LIBCORE)$(REVISION)_p.$(LIBSUFFIX)
-else
-LIBNAME		= $(LIBPREFIX)_$(LIBCORE)p$(REVISION).$(LIBSUFFIX)
-LIBNAME_P	= $(LIBPREFIX)_$(LIBCORE)p$(REVISION)_p.$(LIBSUFFIX)
-endif
-else
-ifndef SMP
 LIBNAME		= $(LIBPREFIX)$(REVISION).$(LIBSUFFIX)
 LIBNAME_P	= $(LIBPREFIX)$(REVISION)_p.$(LIBSUFFIX)
-else
-LIBNAME		= $(LIBPREFIX)p$(REVISION).$(LIBSUFFIX)
-LIBNAME_P	= $(LIBPREFIX)p$(REVISION)_p.$(LIBSUFFIX)
-endif
-endif
-
 
 LIBDLLNAME   = $(LIBPREFIX).dll
 LIBSONAME    = $(LIBNAME:.$(LIBSUFFIX)=.so)
@@ -1067,7 +1060,7 @@ LIB_COMPONENTS = CBLAS
 endif
 
 export OSNAME
-export ARCH
+export ARCH_
 export CORE
 export LIBCORE
 export PGCPATH

Lines 1-6 Link Here

(-)math/openblas/files/patch-c_check (-2 / +2 lines)
1	--- c_check.orig 2015-10-27 20:44:50 UTC	1	--- c_check.orig 2019-04-29 17:22:19 UTC
2	+++ c_check	2	+++ c_check
3	@@ -235,7 +235,7 @@ open(CONFFILE, "> $config" ) \|\| die "Ca	3	@@ -320,7 +320,7 @@ open(CONFFILE, "> $config" ) \|\| die "Can't create $co
4	# print $data, "\n";	4	# print $data, "\n";
5		5
6	print MAKEFILE "OSNAME=$os\n";	6	print MAKEFILE "OSNAME=$os\n";

Lines 1-6 Link Here

(-)math/openblas/files/patch-common__arm.h (-2 / +2 lines)
1	--- common_arm.h.orig 2016-09-01 03:58:42 UTC	1	--- common_arm.h.orig 2018-08-30 22:07:48 UTC
2	+++ common_arm.h	2	+++ common_arm.h
3	@@ -93,6 +93,17 @@ static inline int blas_quickdivide(blasint x, blasint	3	@@ -93,6 +93,17 @@ static inline int blas_quickdivide(blasint x, blasint
4		4
5	#endif	5	#endif
6		6




--- common_power.h.orig	2019-06-24 17:16:36 UTC
+++ common_power.h
@@ -499,7 +499,7 @@ static inline int blas_quickdivide(blasint x, blasint 
 
 #if defined(ASSEMBLER) && !defined(NEEDPARAM)
 
-#ifdef OS_LINUX
+#if defined(OS_LINUX) || defined(OS_FREEBSD)
 #ifndef __64BIT__
 #define PROLOGUE \
 	.section .text;\
@@ -784,7 +784,7 @@ Lmcount$lazy_ptr:
 
 #define HALT		mfspr	r0, 1023
 
-#ifdef OS_LINUX
+#if defined(OS_LINUX) || defined(OS_FREEBSD)
 #if defined(PPC440) || defined(PPC440FP2)
 #undef  MAX_CPU_NUMBER
 #define MAX_CPU_NUMBER 1
@@ -829,7 +829,7 @@ Lmcount$lazy_ptr:
 #define MAP_ANONYMOUS MAP_ANON
 #endif
 
-#ifdef OS_LINUX
+#if defined(OS_LINUX) || defined(OS_FREEBSD)
 #ifndef __64BIT__
 #define FRAMESLOT(X) (((X) * 4) + 8)
 #else

Lines 1-6 Link Here

(-)math/openblas/files/patch-cpuid__arm64.c (-2 / +2 lines)
1	--- cpuid_arm64.c.orig 2016-09-01 03:58:42 UTC	1	--- cpuid_arm64.c.orig 2019-04-29 17:22:19 UTC
2	+++ cpuid_arm64.c	2	+++ cpuid_arm64.c
3	@@ -132,6 +132,8 @@ int detect(void)	3	@@ -180,6 +180,8 @@ int detect(void)
4		4
5		5
6	}	6	}




--- cpuid_ia64.c.orig	2015-10-27 20:44:50 UTC
+++ cpuid_ia64.c
@@ -38,7 +38,9 @@
 
 #include <stdio.h>
 #include <string.h>
+#ifdef linux
 #include <sys/sysinfo.h>
+#endif
 #include "cpuid.h"
 
 #ifdef __ECC

Lines 1-10 Link Here

(-)math/openblas/files/patch-cpuid_sparc.c (-10 lines)
1	--- cpuid_sparc.c.orig 2015-10-27 20:44:50 UTC
2	+++ cpuid_sparc.c
3	@@ -49,6 +49,7 @@ void get_subdirname(void){
4	}
5
6	void get_cpuconfig(void){
7	+ printf("#define SPARC\n");
8	printf("#define V9\n");
9	printf("#define DTB_DEFAULT_ENTRIES 32\n");
10	}




--- cpuid_x86.c.orig	2017-07-24 04:03:35 UTC
+++ cpuid_x86.c
@@ -1329,6 +1329,7 @@ int get_cpuname(void){
       case 8:
 	switch (model) {
 	case 1:
+	case 8:
 	  // AMD Ryzen
 	  if(support_avx())
 #ifndef NO_AVX2
@@ -1865,6 +1866,7 @@ int get_coretype(void){
       } else if (exfamily == 8) {
 	switch (model) {
 	case 1:
+	case 8:
 	  // AMD Ryzen
 	  if(support_avx())
 #ifndef NO_AVX2




Passing a priority level to constructor/destructor only works on GCC >= 4.3.0;
improve the upstream check so that the build works with base GCC.
--- driver/others/memory.c.orig	2016-04-12 19:29:19 UTC
+++ driver/others/memory.c
@@ -144,7 +144,7 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 #if defined(_MSC_VER) && !defined(__clang__)
 #define CONSTRUCTOR __cdecl
 #define DESTRUCTOR __cdecl
-#elif (defined(OS_DARWIN) || defined(OS_SUNOS)) && defined(C_GCC)
+#elif (defined(OS_DARWIN) || defined(OS_SUNOS)) || (defined(C_GCC) && ((__GNUC__ == 4) && (__GNUC_MINOR__ < 3)))
 #define CONSTRUCTOR	__attribute__ ((constructor))
 #define DESTRUCTOR	__attribute__ ((destructor))
 #else




--- exports/Makefile.orig	2015-10-27 20:44:50 UTC
+++ exports/Makefile
@@ -140,6 +140,7 @@ endif
 #http://stackoverflow.com/questions/7656425/makefile-ifeq-logical-or
 ifeq ($(OSNAME), $(filter $(OSNAME),FreeBSD NetBSD))
 
+EXTRALIB += -lgfortran
 so : ../$(LIBSONAME)
 
 ifeq (, $(SYMBOLPREFIX)$(SYMBOLSUFFIX))
@@ -151,6 +152,7 @@ else
 endif
 	$(CC) $(CFLAGS) $(LDFLAGS)  -shared -o ../$(LIBSONAME) \
 	-Wl,--whole-archive $< -Wl,--no-whole-archive \
+	-Wl,-soname,$(LIBPREFIX).so.$(MAJOR_VERSION) \
 	$(FEXTRALIB) $(EXTRALIB)
 	$(CC) $(CFLAGS) $(LDFLAGS) -w -o linktest linktest.c ../$(LIBSONAME) $(FEXTRALIB) && echo OK.
 	rm -f linktest

Lines 1-6 Link Here

(-)math/openblas/files/patch-f_check (-3 / +3 lines)
1	--- f_check.orig 2015-10-27 20:44:50 UTC	1	--- f_check.orig 2018-12-02 22:41:17 UTC
2	+++ f_check	2	+++ f_check
3	@@ -261,7 +261,7 @@ if ($link ne "") {	3	@@ -288,7 +288,7 @@ if ($link ne "") {
4		4
5	foreach $flags (@flags) {	5	foreach $flags (@flags) {
6	if (	6	if (
Lines 9-15 Link Here
9	&& ($flags !~ /^-LIST:/)	9	&& ($flags !~ /^-LIST:/)
10	&& ($flags !~ /^-LANG:/)	10	&& ($flags !~ /^-LANG:/)
11	) {	11	) {
12	@@ -292,7 +292,7 @@ if ($link ne "") {	12	@@ -317,7 +317,7 @@ if ($link ne "") {
13	}	13	}
14		14
15	if (	15	if (

Lines 1-6 Link Here

(-)math/openblas/files/patch-interface__ztrmv.c (-2 / +2 lines)
1	--- interface/ztrmv.c.orig 2016-09-01 03:58:42 UTC	1	--- interface/ztrmv.c.orig 2019-04-29 17:22:19 UTC
2	+++ interface/ztrmv.c	2	+++ interface/ztrmv.c
3	@@ -242,7 +242,7 @@ void CNAME(enum CBLAS_ORDER order, enum	3	@@ -245,7 +245,7 @@ void CNAME(enum CBLAS_ORDER order, enum CBLAS_UPLO Upl
4	else	4	else
5	#endif	5	#endif
6	{	6	{




include/cblas.h
include/f77blas.h
include/lapacke.h
include/lapacke_config.h
include/lapacke_mangling.h
include/lapacke_utils.h
include/openblas_config.h
lib/cmake/openblas/OpenBLASConfig.cmake
lib/cmake/openblas/OpenBLASConfigVersion.cmake
lib/libopenblas.a
lib/libopenblas.so
lib/libopenblas.so.0
libdata/pkgconfig/openblas.pc

Return to bug 231371

Lines 2-9 Link Here

(-)math/openblas/Makefile (-63 / +31 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= openblas	4	PORTNAME= openblas
5	PORTVERSION= 0.2.20	5	PORTVERSION= 0.3.6
6	PORTREVISION= 8
7	DISTVERSIONPREFIX= v	6	DISTVERSIONPREFIX= v
8	PORTEPOCH= 1	7	PORTEPOCH= 1
9	CATEGORIES= math	8	CATEGORIES= math
Lines 17-26 Link Here
17	LICENSE= BSD3CLAUSE	16	LICENSE= BSD3CLAUSE
18	LICENSE_FILE= ${WRKSRC}/LICENSE	17	LICENSE_FILE= ${WRKSRC}/LICENSE
19		18
20	BROKEN_powerpc64= fails to compile: gemm.c:403: 'SGEMM_DEFAULT_Q' undeclared (first use in this function)	19	CONFLICTS_INSTALL= cblas lapacke
21		20
22	USES= fortran gmake perl5	21	USES= fortran gmake perl5 pkgconfig
23
24	USE_GITHUB= yes	22	USE_GITHUB= yes
25	GH_ACCOUNT= xianyi	23	GH_ACCOUNT= xianyi
26	GH_PROJECT= OpenBLAS	24	GH_PROJECT= OpenBLAS
Lines 30-40 Link Here
30	USE_LDCONFIG= yes	28	USE_LDCONFIG= yes
31	USE_PERL5= build	29	USE_PERL5= build
32		30
33	OPENBLAS_SUFX= r${PORTVERSION}
34	OPENBLAS_LIBS= libopenblas libopenblasp
35	OPENBLAS_SVER= 0	31	OPENBLAS_SVER= 0
36	OPENBLAS_FILES= ${OPENBLAS_LIBS:S\|$\|.so\|} ${OPENBLAS_LIBS:S\|$\|.so.${OPENBLAS_SVER}\|} ${OPENBLAS_LIBS:S\|$\|.a\|}
37	PLIST_FILES= ${OPENBLAS_FILES:S\|^\|lib/\|}
38	TEST_TARGET= tests	32	TEST_TARGET= tests
39		33
40	BUILDFLAGS= FCOMMON_OPT=-frecursive MAKE_NB_JOBS=-1	34	BUILDFLAGS= FCOMMON_OPT=-frecursive MAKE_NB_JOBS=-1
Lines 54-59 Link Here
54	AVX_DESC= Support Advanced Vector Extensions (AVX)	48	AVX_DESC= Support Advanced Vector Extensions (AVX)
55	AVX2_DESC= Support Advanced Vector Extensions 2 (AVX2)	49	AVX2_DESC= Support Advanced Vector Extensions 2 (AVX2)
56		50
		51	MAKE_ENV+= ${MAKE_ENV_${ARCH}}
		52	MAKE_ENV_powerpc64= TARGET=POWER7
		53
57	.include <bsd.port.options.mk>	54	.include <bsd.port.options.mk>
58		55
59	.if defined(TARGET_CPU_ARCH)	56	.if defined(TARGET_CPU_ARCH)
Lines 81-91 Link Here
81	BUILDFLAGS+= INTERFACE64=1	78	BUILDFLAGS+= INTERFACE64=1
82	.endif	79	.endif
83		80
84	.if ${PORT_OPTIONS:MOPENMP}
85	USES+= compiler:openmp
86	BUILDFLAGS_THREAD+= USE_OPENMP=1
87	.endif
88
89	.if ! ${PORT_OPTIONS:MAVX}	81	.if ! ${PORT_OPTIONS:MAVX}
90	BUILDFLAGS+= NO_AVX=1	82	BUILDFLAGS+= NO_AVX=1
91	.endif	83	.endif
Lines 94-99 Link Here
94	BUILDFLAGS+= NO_AVX2=1	86	BUILDFLAGS+= NO_AVX2=1
95	.endif	87	.endif
96		88
		89	.if ${PORT_OPTIONS:MOPENMP}
		90	USES+= compiler:openmp
		91	BUILDFLAGS_THREAD+= USE_OPENMP=1
		92	.else
		93	USES+= compiler:c11
		94	.endif
		95
		96	.include <bsd.port.pre.mk>
		97
		98	.if ${PORT_OPTIONS:MOPENMP}
		99	.if ${CHOSEN_COMPILER_TYPE} == gcc
		100	USE_GCC= yes
		101	.endif
		102	.endif
		103
97	post-extract:	104	post-extract:
98	cd ${DISTDIR}/${DIST_SUBDIR} ; \	105	cd ${DISTDIR}/${DIST_SUBDIR} ; \
99	${CP} ${LARGE_FILE} ${TIMING_FILE} ${WRKSRC}	106	${CP} ${LARGE_FILE} ${TIMING_FILE} ${WRKSRC}
Lines 100-136 Link Here
100	${MKDIR} ${WRKDIR}/lib	107	${MKDIR} ${WRKDIR}/lib
101		108
102	post-patch:	109	post-patch:
103	${REINPLACE_CMD} -e "s+%%FIND%%+${FIND}+" \	110	${REINPLACE_CMD} \
104	-e "s+%%XARGS%%+${XARGS}+" \	111	-e 's/defined(linux)/(defined(linux) \|\| defined(__FreeBSD__))/g' \
105	-e "s+%%REINPLACE_CMD%%+${REINPLACE_CMD}+" \	112	-e 's/ifdef linux/if defined(linux) \|\| defined(__FreeBSD__)/g' \
106	${WRKSRC}/Makefile	113	${WRKSRC}/kernel/power/*.S
107	${REINPLACE_CMD} -e "s+%%FC%%+${FC}+" -e "s+%%CC%%+${CC}+" \
108	${WRKSRC}/Makefile.rule
109	${REINPLACE_CMD} -e "s+(ARCH)+(ARCH_)+" \
110	${WRKSRC}/Makefile.rule \
111	${WRKSRC}/Makefile.tail \
112	${WRKSRC}/driver/level3/Makefile \
113	${WRKSRC}/driver/others/Makefile \
114	${WRKSRC}/exports/Makefile \
115	${WRKSRC}/interface/Makefile \
116	${WRKSRC}/kernel/Makefile \
117	${WRKSRC}/kernel/Makefile.L3 \
118	${WRKSRC}/lapack/laswp/Makefile \
119	${WRKSRC}/lapack-netlib/SRC/Makefile \
120	${WRKSRC}/lapack-netlib/SRC/VARIANTS/Makefile \
121	${WRKSRC}/lapack-netlib/TESTING/MATGEN/Makefile \
122	${WRKSRC}/lapack-netlib/LAPACKE/src/Makefile \
123	${WRKSRC}/lapack-netlib/LAPACKE/utils/Makefile \
124	${WRKSRC}/reference/Makefile
125	${REINPLACE_CMD} -e "s+(ARCH)+(ARCH_)+" \
126	-e 's+%%LDFLAGS%%+${LDFLAGS}+' \
127	-e 's+%%LOCALBASE%%+${LOCALBASE}+' \
128	-e 's+%%FIND%%+${FIND}+' \
129	-e 's+%%XARGS%%+${XARGS}+' \
130	-e 's+%%REINPLACE_CMD%%+${REINPLACE_CMD}+' \
131	-e 's+$${CROSS_SUFFIX}+${LOCALBASE}/bin/+' \
132	-e '/Clang.*OpenMP/g' \
133	${WRKSRC}/Makefile.system
134		114
135	post-patch-OPENMP-on:	115	post-patch-OPENMP-on:
136	${REINPLACE_CMD} -e "s+OPENBLAS_NUM_THREADS+OMP_NUM_THREADS+g" \	116	${REINPLACE_CMD} -e "s+OPENBLAS_NUM_THREADS+OMP_NUM_THREADS+g" \
Lines 137-152 Link Here
137	${WRKSRC}/test/Makefile \	117	${WRKSRC}/test/Makefile \
138	${WRKSRC}/ctest/Makefile	118	${WRKSRC}/ctest/Makefile
139		119
140	do-build:	120	post-install:
141	cd ${WRKSRC} ; ${SETENV} ${BUILDFLAGS} NUM_THREADS=1 USE_THREAD=0 \	121	${MV} ${STAGEDIR}${PREFIX}/lib/lib${PORTNAME}_*-r${PORTVERSION}.a ${STAGEDIR}${PREFIX}/lib/lib${PORTNAME}.a
142	${MAKE_CMD} ${MAKE_ARGS}	122	${MV} ${STAGEDIR}${PREFIX}/lib/lib${PORTNAME}_*-r${PORTVERSION}.so ${STAGEDIR}${PREFIX}/lib/lib${PORTNAME}.so.${OPENBLAS_SVER}
143	${CP} ${WRKSRC}/libopenblas-${OPENBLAS_SUFX}.a ${WRKDIR}/lib/libopenblas.a	123	${RM} ${STAGEDIR}${PREFIX}/lib/lib${PORTNAME}.so
144	${CP} ${WRKSRC}/libopenblas-${OPENBLAS_SUFX}.so ${WRKDIR}/lib/libopenblas.so.${OPENBLAS_SVER}	124	${LN} -sf lib${PORTNAME}.so.${OPENBLAS_SVER} ${STAGEDIR}${PREFIX}/lib/lib${PORTNAME}.so
145	cd ${WRKSRC} ; ${MAKE_CMD} ${MAKE_ARGS} clean
146	cd ${WRKSRC} ; ${SETENV} ${BUILDFLAGS} ${BUILDFLAGS_THREAD} \
147	${MAKE_CMD} ${MAKE_ARGS}
148	${CP} ${WRKSRC}/libopenblasp-${OPENBLAS_SUFX}.a ${WRKDIR}/lib/libopenblasp.a
149	${CP} ${WRKSRC}/libopenblasp-${OPENBLAS_SUFX}.so ${WRKDIR}/lib/libopenblasp.so.${OPENBLAS_SVER}
150		125
151	BENCHMARK_MAXTHREADS?= ${MAXTHREADS}	126	BENCHMARK_MAXTHREADS?= ${MAXTHREADS}
152	.if ${PORT_OPTIONS:MOPENMP}	127	.if ${PORT_OPTIONS:MOPENMP}
Lines 161-171 Link Here
161	cd ${WRKSRC}/benchmark ; ${SETENV} ${BUILDFLAGS} NUM_THREADS=${MAXTHREADS} \	136	cd ${WRKSRC}/benchmark ; ${SETENV} ${BUILDFLAGS} NUM_THREADS=${MAXTHREADS} \
162	USE_THREAD=1 ${BENCHMARK_THREADS_FLAG} ${MAKE_CMD} ${MAKE_ARGS}	137	USE_THREAD=1 ${BENCHMARK_THREADS_FLAG} ${MAKE_CMD} ${MAKE_ARGS}
163		138
164	do-install:	139	.include <bsd.port.post.mk>
165	.for L in ${OPENBLAS_LIBS}
166	${INSTALL_DATA} ${WRKDIR}/lib/${L}.a ${STAGEDIR}${PREFIX}/lib
167	${INSTALL_LIB} ${WRKDIR}/lib/${L}.so.${OPENBLAS_SVER} ${STAGEDIR}${PREFIX}/lib
168	${LN} -sf ${L}.so.${OPENBLAS_SVER} ${STAGEDIR}${PREFIX}/lib/${L}.so
169	.endfor
170
171	.include <bsd.port.mk>

Lines 1-15 Link Here

(-)math/openblas/files/patch-Makefile.rule (-15 lines)
1	--- Makefile.rule.orig 2015-10-27 20:44:50 UTC
2	+++ Makefile.rule
3	@@ -19,10 +19,10 @@ VERSION = 0.2.15
4
5	# C compiler including binary type(32bit / 64bit). Default is gcc.
6	# Don't use Intel Compiler or PGI, it won't generate right codes as I expect.
7	-# CC = gcc
8	+CC = %%CC%%
9
10	# Fortran compiler. Default is g77.
11	-# FC = gfortran
12	+FC = %%FC%%
13
14	# Even you can specify cross compiler. Meanwhile, please set HOSTCC.
15

Lines 1-62 Link Here

(-)math/openblas/files/patch-Makefile.system (-62 lines)
1	--- Makefile.system.orig 2015-10-27 20:44:50 UTC
2	+++ Makefile.system
3	@@ -218,6 +218,7 @@ MD5SUM = md5 -r
4	endif
5
6	ifeq ($(OSNAME), FreeBSD)
7	+EXTRALIB += -lm %%LDFLAGS%%
8	MD5SUM = md5 -r
9	endif
10
11	@@ -889,9 +890,17 @@ SYMBOLSUFFIX =
12	endif
13
14	ifndef LIBNAMESUFFIX
15	+ifndef SMP
16	LIBPREFIX = lib$(SYMBOLPREFIX)openblas$(SYMBOLSUFFIX)
17	else
18	+LIBPREFIX = lib$(SYMBOLPREFIX)openblasp$(SYMBOLSUFFIX)
19	+endif
20	+else
21	+ifndef SMP
22	LIBPREFIX = lib$(SYMBOLPREFIX)openblas$(SYMBOLSUFFIX)_$(LIBNAMESUFFIX)
23	+else
24	+LIBPREFIX = lib$(SYMBOLPREFIX)openblasp$(SYMBOLSUFFIX)_$(LIBNAMESUFFIX)
25	+endif
26	endif
27
28	KERNELDIR = $(TOPDIR)/kernel/$(ARCH)
29	@@ -1020,24 +1029,8 @@ ifndef LIBSUFFIX
30	LIBSUFFIX = a
31	endif
32
33	-ifneq ($(DYNAMIC_ARCH), 1)
34	-ifndef SMP
35	-LIBNAME = $(LIBPREFIX)_$(LIBCORE)$(REVISION).$(LIBSUFFIX)
36	-LIBNAME_P = $(LIBPREFIX)_$(LIBCORE)$(REVISION)_p.$(LIBSUFFIX)
37	-else
38	-LIBNAME = $(LIBPREFIX)_$(LIBCORE)p$(REVISION).$(LIBSUFFIX)
39	-LIBNAME_P = $(LIBPREFIX)_$(LIBCORE)p$(REVISION)_p.$(LIBSUFFIX)
40	-endif
41	-else
42	-ifndef SMP
43	LIBNAME = $(LIBPREFIX)$(REVISION).$(LIBSUFFIX)
44	LIBNAME_P = $(LIBPREFIX)$(REVISION)_p.$(LIBSUFFIX)
45	-else
46	-LIBNAME = $(LIBPREFIX)p$(REVISION).$(LIBSUFFIX)
47	-LIBNAME_P = $(LIBPREFIX)p$(REVISION)_p.$(LIBSUFFIX)
48	-endif
49	-endif
50	-
51
52	LIBDLLNAME = $(LIBPREFIX).dll
53	LIBSONAME = $(LIBNAME:.$(LIBSUFFIX)=.so)
54	@@ -1067,7 +1060,7 @@ LIB_COMPONENTS = CBLAS
55	endif
56
57	export OSNAME
58	-export ARCH
59	+export ARCH_
60	export CORE
61	export LIBCORE
62	export PGCPATH

Line 0 Link Here

(-)math/openblas/files/patch-common__power.h (+29 lines)
	1	--- common_power.h.orig 2019-06-24 17:16:36 UTC
	2	+++ common_power.h
	3	@@ -499,7 +499,7 @@ static inline int blas_quickdivide(blasint x, blasint
	4
	5	#if defined(ASSEMBLER) && !defined(NEEDPARAM)
	6
	7	-#ifdef OS_LINUX
	8	+#if defined(OS_LINUX) \|\| defined(OS_FREEBSD)
	9	#ifndef __64BIT__
	10	#define PROLOGUE \
	11	.section .text;\
	12	@@ -784,7 +784,7 @@ Lmcount$lazy_ptr:
	13
	14	#define HALT mfspr r0, 1023
	15
	16	-#ifdef OS_LINUX
	17	+#if defined(OS_LINUX) \|\| defined(OS_FREEBSD)
	18	#if defined(PPC440) \|\| defined(PPC440FP2)
	19	#undef MAX_CPU_NUMBER
	20	#define MAX_CPU_NUMBER 1
	21	@@ -829,7 +829,7 @@ Lmcount$lazy_ptr:
	22	#define MAP_ANONYMOUS MAP_ANON
	23	#endif
	24
	25	-#ifdef OS_LINUX
	26	+#if defined(OS_LINUX) \|\| defined(OS_FREEBSD)
	27	#ifndef __64BIT__
	28	#define FRAMESLOT(X) (((X) * 4) + 8)
	29	#else

Lines 1-12 Link Here

(-)math/openblas/files/patch-cpuid_ia64.c (-12 lines)
1	--- cpuid_ia64.c.orig 2015-10-27 20:44:50 UTC
2	+++ cpuid_ia64.c
3	@@ -38,7 +38,9 @@
4
5	#include <stdio.h>
6	#include <string.h>
7	+#ifdef linux
8	#include <sys/sysinfo.h>
9	+#endif
10	#include "cpuid.h"
11
12	#ifdef __ECC

Lines 1-18 Link Here

(-)math/openblas/files/patch-cpuid_x86.c (-18 lines)
1	--- cpuid_x86.c.orig 2017-07-24 04:03:35 UTC
2	+++ cpuid_x86.c
3	@@ -1329,6 +1329,7 @@ int get_cpuname(void){
4	case 8:
5	switch (model) {
6	case 1:
7	+ case 8:
8	// AMD Ryzen
9	if(support_avx())
10	#ifndef NO_AVX2
11	@@ -1865,6 +1866,7 @@ int get_coretype(void){
12	} else if (exfamily == 8) {
13	switch (model) {
14	case 1:
15	+ case 8:
16	// AMD Ryzen
17	if(support_avx())
18	#ifndef NO_AVX2

Lines 1-13 Link Here

(-)math/openblas/files/patch-driver_others_memory.c (-13 lines)
1	Passing a priority level to constructor/destructor only works on GCC >= 4.3.0;
2	improve the upstream check so that the build works with base GCC.
3	--- driver/others/memory.c.orig 2016-04-12 19:29:19 UTC
4	+++ driver/others/memory.c
5	@@ -144,7 +144,7 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF
6	#if defined(_MSC_VER) && !defined(__clang__)
7	#define CONSTRUCTOR __cdecl
8	#define DESTRUCTOR __cdecl
9	-#elif (defined(OS_DARWIN) \|\| defined(OS_SUNOS)) && defined(C_GCC)
10	+#elif (defined(OS_DARWIN) \|\| defined(OS_SUNOS)) \|\| (defined(C_GCC) && ((__GNUC__ == 4) && (__GNUC_MINOR__ < 3)))
11	#define CONSTRUCTOR __attribute__ ((constructor))
12	#define DESTRUCTOR __attribute__ ((destructor))
13	#else

Lines 1-18 Link Here

(-)math/openblas/files/patch-exports+Makefile (-18 lines)
1	--- exports/Makefile.orig 2015-10-27 20:44:50 UTC
2	+++ exports/Makefile
3	@@ -140,6 +140,7 @@ endif
4	#http://stackoverflow.com/questions/7656425/makefile-ifeq-logical-or
5	ifeq ($(OSNAME), $(filter $(OSNAME),FreeBSD NetBSD))
6
7	+EXTRALIB += -lgfortran
8	so : ../$(LIBSONAME)
9
10	ifeq (, $(SYMBOLPREFIX)$(SYMBOLSUFFIX))
11	@@ -151,6 +152,7 @@ else
12	endif
13	$(CC) $(CFLAGS) $(LDFLAGS) -shared -o ../$(LIBSONAME) \
14	-Wl,--whole-archive $< -Wl,--no-whole-archive \
15	+ -Wl,-soname,$(LIBPREFIX).so.$(MAJOR_VERSION) \
16	$(FEXTRALIB) $(EXTRALIB)
17	$(CC) $(CFLAGS) $(LDFLAGS) -w -o linktest linktest.c ../$(LIBSONAME) $(FEXTRALIB) && echo OK.
18	rm -f linktest

Line 0 Link Here

(-)math/openblas/pkg-plist (+13 lines)
	1	include/cblas.h
	2	include/f77blas.h
	3	include/lapacke.h
	4	include/lapacke_config.h
	5	include/lapacke_mangling.h
	6	include/lapacke_utils.h
	7	include/openblas_config.h
	8	lib/cmake/openblas/OpenBLASConfig.cmake
	9	lib/cmake/openblas/OpenBLASConfigVersion.cmake
	10	lib/libopenblas.a
	11	lib/libopenblas.so
	12	lib/libopenblas.so.0
	13	libdata/pkgconfig/openblas.pc