Skip to content

Commit 2aa8f0a

Browse files
oharboeclaude
andcommitted
DependencyInstaller: drop the packages only kepler-formal needed
kepler-formal no longer builds against host packages: capnproto and TBB on Ubuntu, EL and Homebrew, the oneTBB source build on EL8 and gcc-toolset-13 on EL8 go. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Signed-off-by: Øyvind Harboe <oyvind.harboe@zylin.com>
1 parent a92b10c commit 2aa8f0a

1 file changed

Lines changed: 5 additions & 47 deletions

File tree

‎etc/DependencyInstaller.sh‎

Lines changed: 5 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ _versionCompare() {
2626
test $a "$2" $b
2727
}
2828

29-
# Yosys and kepler-formal are built with CMake. Yosys needs CMake >= 3.28,
29+
# Yosys is built with CMake and needs CMake >= 3.28,
3030
# newer than Ubuntu 22.04 ships, so fetch a release from Kitware when the
3131
# one on PATH is too old.
3232
cmakeMinVersion=3.28
@@ -108,36 +108,6 @@ _installBison() {
108108
rm -rf "${workDir}"
109109
}
110110

111-
# kepler-formal needs oneTBB and its CMake package. EL8 ships TBB 2018, which
112-
# has neither, so build oneTBB there. Build it static, because the
113-
# kepler-formal RPATH does not include the prefix.
114-
tbbVersion=2021.13.0
115-
tbbChecksum=3ad5dd08954b39d113dc5b3f8a8dc6dc1fd5250032b7c491eb07aed5c94133e1
116-
117-
_installTbb() {
118-
local prefix=${PREFIX:-"/usr/local"}
119-
if compgen -G "${prefix}/lib*/cmake/TBB/TBBConfig.cmake" > /dev/null; then
120-
echo "oneTBB found in ${prefix}, skipping install"
121-
return
122-
fi
123-
local tarball="oneTBB-${tbbVersion}.tar.gz"
124-
local workDir
125-
workDir=$(mktemp -d)
126-
(
127-
# _installCmake may have put CMake in a prefix that is not on PATH.
128-
export PATH="${prefix}/bin:${PATH}"
129-
cd "${workDir}"
130-
wget -q -O "${tarball}" "https://github.com/uxlfoundation/oneTBB/archive/refs/tags/v${tbbVersion}.tar.gz"
131-
sha256sum -c <(echo "${tbbChecksum} ${tarball}")
132-
tar xzf "${tarball}"
133-
cmake -S "oneTBB-${tbbVersion}" -B build -DCMAKE_BUILD_TYPE=Release \
134-
-DTBB_TEST=OFF -DBUILD_SHARED_LIBS=OFF -DCMAKE_INSTALL_PREFIX="${prefix}"
135-
cmake --build build -j "${numThreads}"
136-
cmake --install build
137-
)
138-
rm -rf "${workDir}"
139-
}
140-
141111
_installORDependencies() {
142112
if [[ ${YOSYS_VER} == "" ]]; then
143113
YOSYS_VER=v$(grep 'yosys_ver =' tools/yosys/docs/source/conf.py | awk -F'"' '{print $2}')
@@ -232,14 +202,12 @@ _install_EL8_EL9_Packages() {
232202

233203
# EL8 and EL9 use `dnf`, instead of `yum`
234204
dnf -y update
235-
# EPEL has tcl-tclreadline and capnproto.
205+
# EPEL has tcl-tclreadline.
236206
dnf -y install "https://dl.fedoraproject.org/pub/epel/epel-release-latest-${elVersion}.noarch.rpm"
237-
# The rest builds Yosys and kepler-formal.
207+
# The rest builds Yosys.
238208
dnf -y install \
239209
bison \
240210
boost-devel \
241-
capnproto \
242-
capnproto-devel \
243211
findutils \
244212
flex \
245213
gcc \
@@ -260,7 +228,7 @@ _install_EL8_EL9_Packages() {
260228
wget \
261229
zlib-devel
262230

263-
# kepler-formal and the pip lock files need Python 3.10 or newer, which
231+
# The pip lock files need Python 3.10 or newer, which
264232
# is newer than the EL8 and EL9 defaults.
265233
dnf -y install python3.12 python3.12-devel python3.12-pip
266234
update-alternatives --install /usr/bin/python3 python3 "$(command -v python3.12)" 50
@@ -272,13 +240,9 @@ _install_EL8_EL9_Packages() {
272240
readline-devel \
273241
tcl-tclreadline \
274242
tcl-tclreadline-devel
275-
# The default GCC 8 is too old for kepler-formal.
276-
dnf -y install gcc-toolset-13
277243
fi
278244

279245
if [[ "${elVersion}" == "9" ]]; then
280-
# EL8 builds oneTBB instead, in -common.
281-
dnf -y install tbb-devel
282246
dnf -y install \
283247
https://mirror.stream.centos.org/9-stream/AppStream/x86_64/os/Packages/readline-devel-8.1-4.el9.x86_64.rpm
284248
fi
@@ -345,13 +309,11 @@ _installUbuntuPackages() {
345309
bison \
346310
build-essential \
347311
ca-certificates \
348-
capnproto \
349312
curl \
350313
flex \
351314
git \
352315
help2man \
353316
libboost-iostreams-dev \
354-
libcapnp-dev \
355317
libffi-dev \
356318
libfl-dev \
357319
libfl2 \
@@ -364,7 +326,6 @@ _installUbuntuPackages() {
364326
libqt5svg5-dev \
365327
libqt5xmlpatterns5-dev \
366328
libreadline-dev \
367-
libtbb-dev \
368329
libz-dev \
369330
perl \
370331
pkg-config \
@@ -467,7 +428,7 @@ _installUbuntuPackages() {
467428

468429
_installDarwinPackages() {
469430
brew install libffi tcl-tk ruby
470-
brew install python libomp doxygen capnp tbb bison flex boost spdlog zlib cmake
431+
brew install python libomp doxygen bison flex boost spdlog zlib cmake
471432
brew link --force libomp
472433
brew install --cask klayout
473434
brew install docker docker-buildx
@@ -697,9 +658,6 @@ case "${os}" in
697658
if [[ "${option}" == "common" || "${option}" == "all" ]]; then
698659
_installCmake
699660
_installBison
700-
if [[ "${elVersion}" == "8" ]]; then
701-
_installTbb
702-
fi
703661
_installPipCommon
704662
fi
705663
;;

0 commit comments

Comments
 (0)