Skip to content

Commit 6a9c95a

Browse files
authored
Revert "Remove zlib from requirements script and instruction files (#105419)"
This reverts commit 3ec6286.
1 parent 3ec6286 commit 6a9c95a

File tree

2 files changed

+7
-5
lines changed

2 files changed

+7
-5
lines changed

docs/workflow/requirements/linux-requirements.md

+4-2
Original file line numberDiff line numberDiff line change
@@ -47,14 +47,15 @@ Install the following packages for the toolchain:
4747
* liblttng-ust-dev
4848
* libssl-dev
4949
* libkrb5-dev
50+
* zlib1g-dev
5051
* ninja-build (optional, enables building native code with ninja instead of make)
5152

5253
**NOTE**: If you have an Ubuntu version older than 22.04 LTS, or Debian version older than 12, don't install `cmake` using `apt` directly. Follow the note written down below.
5354

5455
```bash
5556
sudo apt install -y cmake llvm lld clang build-essential \
5657
python-is-python3 curl git lldb libicu-dev liblttng-ust-dev \
57-
libssl-dev libkrb5-dev ninja-build
58+
libssl-dev libkrb5-dev zlib1g-dev ninja-build
5859
```
5960

6061
**NOTE**: As of now, Ubuntu's `apt` only has until CMake version 3.16.3 if you're using Ubuntu 20.04 LTS (less in older Ubuntu versions), and version 3.18.4 in Debian 11 (less in older Debian versions). This is lower than the required 3.20, which in turn makes it incompatible with the repo. For this case, we can use the `snap` package manager or the _Kitware APT feed_ to get a new enough version of CMake.
@@ -98,12 +99,13 @@ Install the following packages for the toolchain:
9899
* libicu-devel
99100
* openssl-devel
100101
* krb5-devel
102+
* zlib-devel
101103
* lttng-ust-devel
102104
* ninja-build (optional, enables building native code with ninja instead of make)
103105

104106
```bash
105107
sudo dnf install -y cmake llvm lld lldb clang python curl git libicu-devel openssl-devel \
106-
krb5-devel lttng-ust-devel ninja-build
108+
krb5-devel zlib-devel lttng-ust-devel ninja-build
107109
```
108110

109111
### Gentoo

eng/install-native-dependencies.sh

+3-3
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,13 @@ case "$os" in
2424
apt update
2525

2626
apt install -y build-essential gettext locales cmake llvm clang lldb liblldb-dev libunwind8-dev libicu-dev liblttng-ust-dev \
27-
libssl-dev libkrb5-dev
27+
libssl-dev libkrb5-dev zlib1g-dev
2828

2929
localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8
3030
elif [ "$ID" = "fedora" ]; then
31-
dnf install -y cmake llvm lld lldb clang python curl libicu-devel openssl-devel krb5-devel lttng-ust-devel
31+
dnf install -y cmake llvm lld lldb clang python curl libicu-devel openssl-devel krb5-devel zlib-devel lttng-ust-devel
3232
elif [ "$ID" = "alpine" ]; then
33-
apk add build-base cmake bash curl clang llvm-dev krb5-dev lttng-ust-dev icu-dev openssl-dev
33+
apk add build-base cmake bash curl clang llvm-dev krb5-dev lttng-ust-dev icu-dev zlib-dev openssl-dev
3434
else
3535
echo "Unsupported distro. distro: $ID"
3636
exit 1

0 commit comments

Comments
 (0)