Skip to content

Commit a247295

Browse files
committed
langutils: re-add verible, installing bazel in a different way
1 parent 4c9beed commit a247295

File tree

2 files changed

+7
-12
lines changed

2 files changed

+7
-12
lines changed

recipes/langutils

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,23 +13,18 @@ RUN apt-get update -qq \
1313
ca-certificates \
1414
curl \
1515
git \
16-
gnupg \
1716
python3 \
1817
zlib1g-dev \
1918
# vhd2vl
2019
flex \
2120
bison \
22-
iverilog \
2321
# Surelog
2422
cmake \
2523
default-jre \
2624
python3-orderedmultidict \
2725
&& curl -sSL https://get.haskellstack.org/ | sh \
28-
&& curl -fsSL https://bazel.build/bazel-release.pub.gpg | gpg --dearmor -o /usr/share/keyrings/bazel-archive-keyring.gpg \
29-
&& echo "deb [signed-by=/usr/share/keyrings/bazel-archive-keyring.gpg] \
30-
https://storage.googleapis.com/bazel-apt stable jdk1.8" | tee /etc/apt/sources.list.d/bazel.list \
31-
&& apt-get update -qq \
32-
&& DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends bazel \
26+
&& curl -sSL https://github.com/bazelbuild/bazel/releases/download/6.5.0/bazel-6.5.0-linux-x86_64 \
27+
-o /usr/bin/bazel && chmod +x /usr/bin/bazel \
3328
&& apt-get autoclean && apt-get clean && apt-get -y autoremove \
3429
&& rm -rf /var/lib/apt/lists/*
3530

@@ -67,9 +62,9 @@ RUN git clone --depth 1 https://github.com/zachjs/sv2v.git \
6762
# Verible
6863
#
6964

70-
# RUN git clone --depth 1 https://github.com/chipsalliance/verible.git \
71-
# && cd verible && bazel build -c opt //... \
72-
# && bazel run -c opt :install -- /usr/local/bin
65+
RUN git clone --depth 1 https://github.com/chipsalliance/verible.git \
66+
&& cd verible && bazel build -c opt //... \
67+
&& bazel run -c opt :install -- /usr/local/bin
7368

7469
#
7570
# Clean-up

tests/langutils.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@ $DOCKER vhd2vl --version
1010
$DOCKER slang --version
1111
$DOCKER surelog --version
1212
$DOCKER sv2v --version
13-
# $DOCKER verible-verilog-syntax --version
13+
$DOCKER verible-verilog-syntax --version
1414

1515
$DOCKER vhd2vl --quiet hdl/counter.vhdl results/vhd2vl.v
1616
$DOCKER slang hdl/counter.sv --lint-only
1717
$DOCKER surelog -parse hdl/counter.sv
1818
$DOCKER sv2v hdl/counter.sv --write=results/sv2v.v
19-
# $DOCKER verible-verilog-lint hdl/counter.sv
19+
$DOCKER verible-verilog-lint hdl/counter.sv
2020

2121
rm -fr slpp_all

0 commit comments

Comments
 (0)