public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Julien Roy" <julien@jroy.ca>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/proj/guru:master commit in: sci-electronics/verilator/
Date: Tue, 19 Mar 2024 00:39:49 +0000 (UTC)	[thread overview]
Message-ID: <1710767949.01e3aec7e7e42a3ff27a057482656b825e1648ed.julien@gentoo> (raw)

commit:     01e3aec7e7e42a3ff27a057482656b825e1648ed
Author:     Huang Rui <vowstar <AT> gmail <DOT> com>
AuthorDate: Mon Mar 18 13:19:09 2024 +0000
Commit:     Julien Roy <julien <AT> jroy <DOT> ca>
CommitDate: Mon Mar 18 13:19:09 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=01e3aec7

sci-electronics/verilator: fix compile bugs

- fix fails to compile with dev-lang/python-exec[-native-symlinks]
- fix adds debug flags (-g/-ggdb) on its own

Closes: https://bugs.gentoo.org/785151
Closes: https://bugs.gentoo.org/887917
Signed-off-by: Huang Rui <vowstar <AT> gmail.com>

 sci-electronics/verilator/verilator-5.022.ebuild | 29 +++++++++++++++++++++-
 sci-electronics/verilator/verilator-9999.ebuild  | 31 ++++++++++++++++++++++--
 2 files changed, 57 insertions(+), 3 deletions(-)

diff --git a/sci-electronics/verilator/verilator-5.022.ebuild b/sci-electronics/verilator/verilator-5.022.ebuild
index a71b2db38c..b5557f2f17 100644
--- a/sci-electronics/verilator/verilator-5.022.ebuild
+++ b/sci-electronics/verilator/verilator-5.022.ebuild
@@ -3,7 +3,9 @@
 
 EAPI="8"
 
-inherit autotools
+PYTHON_COMPAT=( python3_{9..12} )
+
+inherit autotools python-single-r1
 
 DESCRIPTION="The fast free Verilog/SystemVerilog simulator"
 HOMEPAGE="
@@ -21,8 +23,12 @@ fi
 
 LICENSE="|| ( Artistic-2 LGPL-3 )"
 SLOT="0"
+IUSE="debug test"
+RESTRICT="!test? ( test )"
 
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RDEPEND="
+	${PYTHON_DEPS}
 	dev-lang/perl
 	sys-libs/zlib
 "
@@ -34,13 +40,34 @@ DEPEND="
 BDEPEND="
 	sys-devel/bison
 	sys-devel/flex
+	test? (
+		dev-build/cmake
+	)
 "
 
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
 src_prepare() {
 	default
 	if [[ ! "${PV}" == "9999" ]] ; then
 		# https://github.com/verilator/verilator/issues/3352
 		sed -i "s/UNKNOWN_REV/(Gentoo ${PVR})/g" "${S}"/src/config_rev || die
 	fi
+	# https://bugs.gentoo.org/785151
+	sed -i "s/python3/${EPYTHON}/g" "${S}"/configure.ac || die
+	find . -name "Makefile" -exec sed -i "s/python3/${EPYTHON}/g" {} + || die
+	find test_regress -type f -exec sed -i "s/python3/${EPYTHON}/g" {} + || die
+	python_fix_shebang .
+	# https://bugs.gentoo.org/887917
+	if ! use debug; then
+		sed -i '/AC_SUBST(CFG_CXXFLAGS_DEBUG)/i CFG_CXXFLAGS_DEBUG=""' "${S}"/configure.ac || die
+		sed -i '/AC_SUBST(CFG_LDFLAGS_DEBUG)/i CFG_LDFLAGS_DEBUG=""' "${S}"/configure.ac || die
+	fi
 	eautoconf --force
 }
+
+src_test() {
+	emake test
+}

diff --git a/sci-electronics/verilator/verilator-9999.ebuild b/sci-electronics/verilator/verilator-9999.ebuild
index 644cb0bfca..b5557f2f17 100644
--- a/sci-electronics/verilator/verilator-9999.ebuild
+++ b/sci-electronics/verilator/verilator-9999.ebuild
@@ -1,9 +1,11 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="8"
 
-inherit autotools
+PYTHON_COMPAT=( python3_{9..12} )
+
+inherit autotools python-single-r1
 
 DESCRIPTION="The fast free Verilog/SystemVerilog simulator"
 HOMEPAGE="
@@ -21,8 +23,12 @@ fi
 
 LICENSE="|| ( Artistic-2 LGPL-3 )"
 SLOT="0"
+IUSE="debug test"
+RESTRICT="!test? ( test )"
 
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RDEPEND="
+	${PYTHON_DEPS}
 	dev-lang/perl
 	sys-libs/zlib
 "
@@ -34,13 +40,34 @@ DEPEND="
 BDEPEND="
 	sys-devel/bison
 	sys-devel/flex
+	test? (
+		dev-build/cmake
+	)
 "
 
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
 src_prepare() {
 	default
 	if [[ ! "${PV}" == "9999" ]] ; then
 		# https://github.com/verilator/verilator/issues/3352
 		sed -i "s/UNKNOWN_REV/(Gentoo ${PVR})/g" "${S}"/src/config_rev || die
 	fi
+	# https://bugs.gentoo.org/785151
+	sed -i "s/python3/${EPYTHON}/g" "${S}"/configure.ac || die
+	find . -name "Makefile" -exec sed -i "s/python3/${EPYTHON}/g" {} + || die
+	find test_regress -type f -exec sed -i "s/python3/${EPYTHON}/g" {} + || die
+	python_fix_shebang .
+	# https://bugs.gentoo.org/887917
+	if ! use debug; then
+		sed -i '/AC_SUBST(CFG_CXXFLAGS_DEBUG)/i CFG_CXXFLAGS_DEBUG=""' "${S}"/configure.ac || die
+		sed -i '/AC_SUBST(CFG_LDFLAGS_DEBUG)/i CFG_LDFLAGS_DEBUG=""' "${S}"/configure.ac || die
+	fi
 	eautoconf --force
 }
+
+src_test() {
+	emake test
+}


             reply	other threads:[~2024-03-19  0:39 UTC|newest]

Thread overview: 55+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-03-19  0:39 Julien Roy [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-10-11  9:55 [gentoo-commits] repo/proj/guru:master commit in: sci-electronics/verilator/ David Roman
2024-10-10  9:30 David Roman
2024-10-10  9:30 David Roman
2024-10-10  9:30 David Roman
2024-10-10  9:30 David Roman
2024-04-30 12:22 David Roman
2024-04-30 12:22 David Roman
2024-04-04 10:08 [gentoo-commits] repo/proj/guru:dev " Florian Schmaus
2024-04-04 10:09 ` [gentoo-commits] repo/proj/guru:master " Florian Schmaus
2024-03-19  0:39 Julien Roy
2024-03-16  5:57 Rui Huang
2024-03-16  5:56 [gentoo-commits] repo/proj/guru:dev " Rui Huang
2024-03-16  5:57 ` [gentoo-commits] repo/proj/guru:master " Rui Huang
2023-11-16 10:05 David Roman
2023-08-10  8:14 Viorel Munteanu
2023-03-31 10:16 Florian Schmaus
2023-03-31 10:16 Florian Schmaus
2023-01-31 11:00 Florian Schmaus
2023-01-31 11:00 Florian Schmaus
2023-01-31 11:00 Florian Schmaus
2023-01-06  8:51 Florian Schmaus
2023-01-06  8:51 Florian Schmaus
2022-07-11  6:54 Andrew Ammerlaan
2021-07-13  9:09 Andrew Ammerlaan
2021-07-13  9:09 Andrew Ammerlaan
2021-06-28 10:59 Florian Schmaus
2021-04-30  7:45 Andrew Ammerlaan
2021-04-06  9:03 Andrew Ammerlaan
2021-04-06  9:03 Andrew Ammerlaan
2021-03-11 13:16 Andrew Ammerlaan
2021-03-11 13:16 Andrew Ammerlaan
2021-01-23 11:49 Michał Górny
2021-01-23 11:49 Michał Górny
2021-01-01 13:14 Andrew Ammerlaan
2020-12-06 18:44 Andrew Ammerlaan
2020-12-06 18:44 Andrew Ammerlaan
2020-11-18 16:03 Andrew Ammerlaan
2020-11-18 16:03 Andrew Ammerlaan
2020-10-21  9:02 Andrew Ammerlaan
2020-10-21  9:02 Andrew Ammerlaan
2020-09-19 14:24 Andrew Ammerlaan
2020-07-24 11:25 Andrew Ammerlaan
2020-06-13 14:15 Andrew Ammerlaan
2020-05-14  9:29 Andrew Ammerlaan
2020-05-14  9:29 Andrew Ammerlaan
2020-05-12  9:01 Andrew Ammerlaan
2020-05-12  9:01 Andrew Ammerlaan
2020-04-27 11:25 Andrew Ammerlaan
2020-04-27 11:25 Andrew Ammerlaan
2020-04-27  7:02 Andrew Ammerlaan
2020-04-11 20:34 Andrew Ammerlaan
2020-04-07 10:16 Andrew Ammerlaan
2020-04-07  7:42 Andrew Ammerlaan
2020-04-07  7:42 Andrew Ammerlaan
2020-03-27 12:40 Andrew Ammerlaan
2020-03-15 11:29 [gentoo-commits] repo/proj/guru:dev " Andrew Ammerlaan
2020-03-15 11:39 ` [gentoo-commits] repo/proj/guru:master " Andrew Ammerlaan

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1710767949.01e3aec7e7e42a3ff27a057482656b825e1648ed.julien@gentoo \
    --to=julien@jroy.ca \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox