Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 22 Feb 2023 04:29:09 GMT
From:      Yuri Victorovich <yuri@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: ece6495b2b6e - main - cad/verilator: Improve how python executable path is passed to the build
Message-ID:  <202302220429.31M4T9IV057042@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by yuri:

URL: https://cgit.FreeBSD.org/ports/commit/?id=ece6495b2b6e1c19aea5d1833f0fe3bff104ee68

commit ece6495b2b6e1c19aea5d1833f0fe3bff104ee68
Author:     Yuri Victorovich <yuri@FreeBSD.org>
AuthorDate: 2023-02-22 04:27:55 +0000
Commit:     Yuri Victorovich <yuri@FreeBSD.org>
CommitDate: 2023-02-22 04:29:05 +0000

    cad/verilator: Improve how python executable path is passed to the build
---
 cad/verilator/Makefile | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/cad/verilator/Makefile b/cad/verilator/Makefile
index d00ef47395dc..4034d3552151 100644
--- a/cad/verilator/Makefile
+++ b/cad/verilator/Makefile
@@ -32,7 +32,8 @@ SHEBANG_FILES=	bin/verilator_ccache_report \
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	INSTALL_PROGRAM="${INSTALL_SCRIPT}"
-CONFIGURE_ARGS=	AR=${LOCALBASE}/bin/ar
+CONFIGURE_ARGS=	AR=${LOCALBASE}/bin/ar \
+		PYTHON3=${PYTHON_CMD}
 CONFIGURE_SHELL=	${LOCALBASE}/bin/bash # see https://github.com/verilator/verilator/issues/3132
 
 TEST_TARGET=	test
@@ -49,8 +50,6 @@ LEAK_CHECKS_CXXFLAGS=		-DVL_LEAK_CHECKS
 LEAK_CHECKS_BROKEN=		compilation will be fixed in the next release
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|AC_PATH_PROG(PYTHON3,python3)|AC_PATH_PROG(PYTHON3,${PYTHON_VERSION})|' \
-		${WRKSRC}/configure.ac # hack-workaround for https://github.com/verilator/verilator/issues/3970
 	@${REINPLACE_CMD} -e 's|@pkgconfigdir@|${PREFIX}/libdata/pkgconfig|' \
 		${WRKSRC}/Makefile.in
 



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