Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 31 Oct 2019 13:21:45 +0000 (UTC)
From:      Gleb Popov <arrowd@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r516146 - head/math/openblas
Message-ID:  <201910311321.x9VDLjNU070641@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: arrowd
Date: Thu Oct 31 13:21:45 2019
New Revision: 516146
URL: https://svnweb.freebsd.org/changeset/ports/516146

Log:
  math/openblas: Fix build with DYNAMIC_ARCH=OFF.
  
  PR:		238228
  Submitted by:	Artyom Davidov <ard_1@mail.ru>

Modified:
  head/math/openblas/Makefile
  head/math/openblas/pkg-plist

Modified: head/math/openblas/Makefile
==============================================================================
--- head/math/openblas/Makefile	Thu Oct 31 12:19:09 2019	(r516145)
+++ head/math/openblas/Makefile	Thu Oct 31 13:21:45 2019	(r516146)
@@ -85,6 +85,9 @@ MANUAL_PACKAGE_BUILD=	Optimizes for the build machine.
 
 .if ${PORT_OPTIONS:MDYNAMIC_ARCH}
 BUILDFLAGS+=	DYNAMIC_ARCH=1
+PLIST_SUB+=	DYNARCH=""
+.else
+PLIST_SUB+=	DYNARCH="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MINTERFACE64}
@@ -201,7 +204,10 @@ do-install:
 		${WRKSRC}/interface/*.c
 	${MKDIR} ${STAGEDIR}${PREFIX}/include/openblas
 	${INSTALL_DATA} ${WRKSRC}/openblas_*.h ${STAGEDIR}${PREFIX}/include/openblas
-	${INSTALL_DATA} ${WRKSRC}/cblas.h ${WRKSRC}/config_kernel.h ${WRKSRC}/config_last.h ${WRKSRC}/l1param.h ${WRKSRC}/l2param.h ${WRKSRC}/symcopy.h \
+	${INSTALL_DATA} ${WRKSRC}/cblas.h ${WRKSRC}/config_last.h ${WRKSRC}/l1param.h ${WRKSRC}/l2param.h ${WRKSRC}/symcopy.h \
 		${STAGEDIR}${PREFIX}/include/openblas
+
+do-install-DYNAMIC_ARCH-on:
+	${INSTALL_DATA} ${WRKSRC}/config_kernel.h ${STAGEDIR}${PREFIX}/include/openblas
 
 .include <bsd.port.mk>

Modified: head/math/openblas/pkg-plist
==============================================================================
--- head/math/openblas/pkg-plist	Thu Oct 31 12:19:09 2019	(r516145)
+++ head/math/openblas/pkg-plist	Thu Oct 31 13:21:45 2019	(r516146)
@@ -29,7 +29,7 @@ include/openblas/openblas_common_x86_64.h
 include/openblas/openblas_common_z.h
 include/openblas/openblas_common_zarch.h
 include/openblas/openblas_config.h
-include/openblas/config_kernel.h
+%%DYNARCH%%include/openblas/config_kernel.h
 include/openblas/config_last.h
 include/openblas/openblas_cpuid.h
 include/openblas/l1param.h



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201910311321.x9VDLjNU070641>