Skip to content

Commit a9de863

Browse files
committed
etc: fix dependency install order
Signed-off-by: Vitor Bandeira <vvbandeira@precisioninno.com>
1 parent b4815fb commit a9de863

2 files changed

Lines changed: 17 additions & 2 deletions

File tree

docker/Dockerfile.dev

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@ RUN sh /tmp/setup_compiler_wrappers.sh && rm /tmp/setup_compiler_wrappers.sh
2121

2222
ENV PATH="/usr/local/bin/wrapped-cc:$PATH"
2323

24-
RUN ./DependencyInstaller.sh -all $options $constantBuildDir -save-deps-prefixes=/etc/openroad_deps_prefixes.txt \
24+
RUN ./DependencyInstaller.sh -base $options $constantBuildDir -save-deps-prefixes=/etc/openroad_deps_prefixes.txt \
25+
&& ./DependencyInstaller.sh -common $options $constantBuildDir -save-deps-prefixes=/etc/openroad_deps_prefixes.txt \
2526
&& rm -rf /tmp/installer /tmp/* /var/tmp/* /var/lib/apt/lists/*
2627

2728
ARG fromImage

etc/DependencyInstaller.sh

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,9 @@ _install_EL7_Packages() {
7373
time \
7474
readline \
7575
ruby \
76-
ruby-devel
76+
ruby-devel \
77+
tcl-tclreadline \
78+
tcl-tclreadline-devel
7779

7880
if ! [ -x "$(command -v klayout)" ]; then
7981
yum -y install https://www.klayout.org/downloads/CentOS_7/klayout-${klayoutVersion}-0.x86_64.rpm
@@ -113,6 +115,17 @@ _install_EL8_EL9_Packages() {
113115
ruby \
114116
ruby-devel
115117

118+
if [[ "${elVersion}" == "8" ]]; then
119+
dnf -y install \
120+
tcl-tclreadline \
121+
tcl-tclreadline-devel
122+
fi
123+
124+
if [[ "${elVersion}" == "9" ]]; then
125+
dnf -y install \
126+
https://mirror.stream.centos.org/9-stream/AppStream/x86_64/os/Packages/readline-devel-8.1-4.el9.x86_64.rpm
127+
fi
128+
116129
# Install KLayout based on EL version, note the different URLs
117130
case "${elVersion}" in
118131
"8")
@@ -199,6 +212,7 @@ _installUbuntuPackages() {
199212
qttools5-dev \
200213
ruby \
201214
ruby-dev \
215+
tcl-tclreadline \
202216
time \
203217
zlib1g \
204218
zlib1g-dev

0 commit comments

Comments
 (0)