Date: Sun, 25 Jul 2021 16:03:01 GMT From: Thierry Thomas <thierry@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org Subject: git: a36e5a3440e5 - 2021Q3 - math/lapack: fix post-patch target for math/atlas Message-ID: <202107251603.16PG31HY068071@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch 2021Q3 has been updated by thierry: URL: https://cgit.FreeBSD.org/ports/commit/?id=a36e5a3440e59bd0e2a42f16d0ca5b820be234d9 commit a36e5a3440e59bd0e2a42f16d0ca5b820be234d9 Author: Thierry Thomas <thierry@FreeBSD.org> AuthorDate: 2021-07-21 20:38:05 +0000 Commit: Thierry Thomas <thierry@FreeBSD.org> CommitDate: 2021-07-25 16:01:48 +0000 math/lapack: fix post-patch target for math/atlas When upgrading this port, I previously merged the post-patch with the pre-configure target, and it was a mistake. The patch target is used from math/atlas, and make.inc is needed. PR: 257122 Reported by: alt2600 (at) icloud.com MFH: 2021Q3 (cherry picked from commit b7eec409d5664a73725c392b83e4f2741c5ad33f) --- math/lapack/Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/math/lapack/Makefile b/math/lapack/Makefile index 128c6f2eb4da..5b6cf934e9a5 100644 --- a/math/lapack/Makefile +++ b/math/lapack/Makefile @@ -80,7 +80,7 @@ PLIST_SUB+= BLAS="@comment " CBLAS="@comment " LAPACK="" XLAPACK="@comment " LA .include <bsd.port.pre.mk> -pre-configure: +post-patch: ${SED} -Ee '\ s@^(FORTRAN|LOADER)([[:blank:]]*=)(.*)@\1\2 $${FC}@; \ s@^(OPTS[[:blank:]]*=)(.*)@\1 $${FFLAGS} $${EXTRAFLAGS}@; \ @@ -93,6 +93,8 @@ pre-configure: s@^(LDFLAGS[[:blank:]]*=)(.*)@@; \ \@(BLAS|LAPACKE|RAN)LIB[[:blank:]]*=@d;' \ ${WRKSRC}/make.inc.example > ${WRKSRC}/make.inc + +pre-configure: ${REINPLACE_CMD} -e 's@\./lapack_testing\.py@${S} &@' \ ${WRKSRC}/Makefile ${FIND} ${WRKSRC} -name Makefile | ${XARGS} \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202107251603.16PG31HY068071>