Skip to content

Commit c88983e

Browse files
committed
Fix(deps): Ensure Verilator Installation on Ubuntu 24.04
Signed-off-by: Sombrio <[email protected]>
1 parent cddcedb commit c88983e

File tree

1 file changed

+14
-6
lines changed

1 file changed

+14
-6
lines changed

etc/DependencyInstaller.sh

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ _installORDependencies() {
2424
./tools/OpenROAD/etc/DependencyInstaller.sh ${OR_INSTALLER_ARGS}
2525
}
2626

27-
_installCommon() {
27+
_installPipCommon() {
2828
if [[ -f /opt/rh/rh-python38/enable ]]; then
2929
set +u
3030
source /opt/rh/rh-python38/enable
@@ -36,7 +36,10 @@ _installCommon() {
3636
else
3737
pip3 install --no-cache-dir --user -U $pkgs
3838
fi
39+
}
3940

41+
_installVerilator() {
42+
local baseDir
4043
if [[ "$constantBuildDir" == "true" ]]; then
4144
baseDir="/tmp/DependencyInstaller-ORFS"
4245
if [[ -d "$baseDir" ]]; then
@@ -468,7 +471,8 @@ case "${os}" in
468471
esac
469472

470473
if [[ "${option}" == "common" || "${option}" == "all" ]]; then
471-
_installCommon
474+
_installPipCommon
475+
_installVerilator
472476
fi
473477
;;
474478
"Ubuntu" | "Debian GNU/Linux rodete" )
@@ -486,10 +490,13 @@ case "${os}" in
486490
_installUbuntuCleanUp
487491
fi
488492
if [[ "${option}" == "common" || "${option}" == "all" ]]; then
489-
if [[ $version == "rodete" ]]; then
493+
if [[ $version != "rodete" ]]; then
494+
if _versionCompare ${version} -lt 23.04 ; then
495+
_installPipCommon
496+
fi
497+
_installVerilator
498+
else
490499
echo "Skip common for rodete"
491-
elif _versionCompare ${version} -lt 23.04 ; then
492-
_installCommon
493500
fi
494501
fi
495502
;;
@@ -502,7 +509,8 @@ case "${os}" in
502509
_installDarwinPackages
503510
fi
504511
if [[ "${option}" == "common" || "${option}" == "all" ]]; then
505-
_installCommon
512+
_installPipCommon
513+
_installVerilator
506514
fi
507515
;;
508516
*)

0 commit comments

Comments
 (0)