Attachment 205355 Details for Bug 238825 – patch

[patch] patch

openblas.patch (text/plain), 2.71 KB, created by Piotr Kubaj on 2019-06-26 12:58:23 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Piotr Kubaj

Created: 2019-06-26 12:58:23 UTC

Size: 2.71 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 505080)
>+++ Makefile	(working copy)
>@@ -17,8 +17,6 @@
> LICENSE=	BSD3CLAUSE
> LICENSE_FILE=	${WRKSRC}/LICENSE
> 
>-BROKEN_powerpc64=	fails to compile: gemm.c:403: 'SGEMM_DEFAULT_Q' undeclared (first use in this function)
>-
> USES=		fortran gmake perl5
> 
> USE_GITHUB=	yes
>@@ -54,8 +52,12 @@
> AVX_DESC=		Support Advanced Vector Extensions (AVX)
> AVX2_DESC=		Support Advanced Vector Extensions 2 (AVX2)
> 
>-.include <bsd.port.options.mk>
>+.include <bsd.port.pre.mk>
> 
>+.if ${ARCH} == powerpc64
>+TARGET_CPU_ARCH=	POWER6
>+.endif
>+
> .if defined(TARGET_CPU_ARCH)
> BUILDFLAGS+=	TARGET=${TARGET_CPU_ARCH}
> .endif
>@@ -84,6 +86,8 @@
> .if ${PORT_OPTIONS:MOPENMP}
> USES+=		compiler:openmp
> BUILDFLAGS_THREAD+=	USE_OPENMP=1
>+.else
>+USES+=		compiler:c11
> .endif
> 
> .if ! ${PORT_OPTIONS:MAVX}
>@@ -131,6 +135,10 @@
> 	-e 's+$${CROSS_SUFFIX}+${LOCALBASE}/bin/+' \
> 	-e '/Clang.*OpenMP/g' \
> 		${WRKSRC}/Makefile.system
>+	${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
> 
> post-patch-OPENMP-on:
> 	${REINPLACE_CMD} -e "s+OPENBLAS_NUM_THREADS+OMP_NUM_THREADS+g" \
>@@ -168,4 +176,4 @@
> 	${LN} -sf ${L}.so.${OPENBLAS_SVER} ${STAGEDIR}${PREFIX}/lib/${L}.so
> .endfor
> 
>-.include <bsd.port.mk>
>+.include <bsd.port.post.mk>
>Index: files/patch-common__power.h
>===================================================================
>--- files/patch-common__power.h	(nonexistent)
>+++ files/patch-common__power.h	(working copy)
>@@ -0,0 +1,29 @@
>+--- common_power.h.orig	2019-06-26 10:25:04 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;\
>+@@ -774,7 +774,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
>+@@ -819,7 +819,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
>
>Property changes on: files/patch-common__power.h
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property

Flags:

pkubaj: maintainer-approval? (phd_kimberlite)

Actions: View | Diff

Attachments on bug 238825: 205355