From owner-dev-commits-ports-branches@freebsd.org Sun Jul 25 16:03:01 2021 Return-Path: Delivered-To: dev-commits-ports-branches@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 961EE65C0AF; Sun, 25 Jul 2021 16:03:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4GXns13hWhz3BnW; Sun, 25 Jul 2021 16:03:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 6614B260ED; Sun, 25 Jul 2021 16:03:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 16PG31Hj068072; Sun, 25 Jul 2021 16:03:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 16PG31HY068071; Sun, 25 Jul 2021 16:03:01 GMT (envelope-from git) Date: Sun, 25 Jul 2021 16:03:01 GMT Message-Id: <202107251603.16PG31HY068071@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Thierry Thomas Subject: git: a36e5a3440e5 - 2021Q3 - math/lapack: fix post-patch target for math/atlas MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: thierry X-Git-Repository: ports X-Git-Refname: refs/heads/2021Q3 X-Git-Reftype: branch X-Git-Commit: a36e5a3440e59bd0e2a42f16d0ca5b820be234d9 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-branches@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 25 Jul 2021 16:03:01 -0000 The branch 2021Q3 has been updated by thierry: URL: https://cgit.FreeBSD.org/ports/commit/?id=a36e5a3440e59bd0e2a42f16d0ca5b820be234d9 commit a36e5a3440e59bd0e2a42f16d0ca5b820be234d9 Author: Thierry Thomas AuthorDate: 2021-07-21 20:38:05 +0000 Commit: Thierry Thomas 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 -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} \