Skip to content

Commit 4d2d3d3

Browse files
carlossanlopjkotas
andauthored
Migrate to zlib-ng, part 3: Remove zlib and zlib-intel source code and license mentions (#104399)
* Remove zlib/ * Remove zlib-intel/ * Remove third party notice * Remove patches * Remove version txts * Remove cgmanifest.json entries * Remove installer third party notice * Update docs --------- Co-authored-by: Jan Kotas <[email protected]>
1 parent 78db74f commit 4d2d3d3

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

80 files changed

+6
-53338
lines changed

THIRD-PARTY-NOTICES.TXT

Lines changed: 0 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -66,38 +66,6 @@ shall not be used in advertising or otherwise to promote the sale,
6666
use or other dealings in these Data Files or Software without prior
6767
written authorization of the copyright holder.
6868

69-
License notice for Zlib
70-
-----------------------
71-
72-
https://github.com/madler/zlib
73-
https://zlib.net/zlib_license.html
74-
75-
/* zlib.h -- interface of the 'zlib' general purpose compression library
76-
version 1.3.1, January 22nd, 2024
77-
78-
Copyright (C) 1995-2022 Jean-loup Gailly and Mark Adler
79-
80-
This software is provided 'as-is', without any express or implied
81-
warranty. In no event will the authors be held liable for any damages
82-
arising from the use of this software.
83-
84-
Permission is granted to anyone to use this software for any purpose,
85-
including commercial applications, and to alter it and redistribute it
86-
freely, subject to the following restrictions:
87-
88-
1. The origin of this software must not be misrepresented; you must not
89-
claim that you wrote the original software. If you use this software
90-
in a product, an acknowledgment in the product documentation would be
91-
appreciated but is not required.
92-
2. Altered source versions must be plainly marked as such, and must not be
93-
misrepresented as being the original software.
94-
3. This notice may not be removed or altered from any source distribution.
95-
96-
Jean-loup Gailly Mark Adler
97-
98-
99-
*/
100-
10169
License notice for zlib-ng
10270
-----------------------
10371

docs/workflow/requirements/linux-requirements.md

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -47,15 +47,14 @@ Install the following packages for the toolchain:
4747
* liblttng-ust-dev
4848
* libssl-dev
4949
* libkrb5-dev
50-
* zlib1g-dev
5150
* ninja-build (optional, enables building native code with ninja instead of make)
5251

5352
**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.
5453

5554
```bash
5655
sudo apt install -y cmake llvm lld clang build-essential \
57-
python-is-python3 curl git lldb libicu-dev liblttng-ust-dev \
58-
libssl-dev libkrb5-dev zlib1g-dev ninja-build
56+
python-is-python3 curl git lldb libicu-dev liblttng-ust-dev \
57+
libssl-dev libkrb5-dev ninja-build
5958
```
6059

6160
**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,13 +97,12 @@ Install the following packages for the toolchain:
9897
* libicu-devel
9998
* openssl-devel
10099
* krb5-devel
101-
* zlib-devel
102100
* lttng-ust-devel
103101
* ninja-build (optional, enables building native code with ninja instead of make)
104102

105103
```bash
106104
sudo dnf install -y cmake llvm lld lldb clang python curl git libicu-devel openssl-devel \
107-
krb5-devel zlib-devel lttng-ust-devel ninja-build
105+
krb5-devel lttng-ust-devel ninja-build
108106
```
109107

110108
### Gentoo

eng/install-native-dependencies.sh

Lines changed: 3 additions & 3 deletions
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 zlib1g-dev
27+
libssl-dev libkrb5-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 zlib-devel lttng-ust-devel
31+
dnf install -y cmake llvm lld lldb clang python curl libicu-devel openssl-devel krb5-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 zlib-dev openssl-dev
33+
apk add build-base cmake bash curl clang llvm-dev krb5-dev lttng-ust-dev icu-dev openssl-dev
3434
else
3535
echo "Unsupported distro. distro: $ID"
3636
exit 1

src/installer/pkg/THIRD-PARTY-NOTICES.TXT

Lines changed: 0 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -65,38 +65,6 @@ shall not be used in advertising or otherwise to promote the sale,
6565
use or other dealings in these Data Files or Software without prior
6666
written authorization of the copyright holder.
6767

68-
License notice for Zlib
69-
-----------------------
70-
71-
https://github.com/madler/zlib
72-
https://zlib.net/zlib_license.html
73-
74-
/* zlib.h -- interface of the 'zlib' general purpose compression library
75-
version 1.2.13, October 13th, 2022
76-
77-
Copyright (C) 1995-2022 Jean-loup Gailly and Mark Adler
78-
79-
This software is provided 'as-is', without any express or implied
80-
warranty. In no event will the authors be held liable for any damages
81-
arising from the use of this software.
82-
83-
Permission is granted to anyone to use this software for any purpose,
84-
including commercial applications, and to alter it and redistribute it
85-
freely, subject to the following restrictions:
86-
87-
1. The origin of this software must not be misrepresented; you must not
88-
claim that you wrote the original software. If you use this software
89-
in a product, an acknowledgment in the product documentation would be
90-
appreciated but is not required.
91-
2. Altered source versions must be plainly marked as such, and must not be
92-
misrepresented as being the original software.
93-
3. This notice may not be removed or altered from any source distribution.
94-
95-
Jean-loup Gailly Mark Adler
96-
97-
98-
*/
99-
10068
License notice for Mono
10169
-------------------------------
10270

src/native/external/cgmanifest.json

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -41,26 +41,6 @@
4141
},
4242
"DevelopmentDependency": false
4343
},
44-
{
45-
"Component": {
46-
"Type": "git",
47-
"Git": {
48-
"RepositoryUrl": "https://github.com/madler/zlib",
49-
"CommitHash": "51b7f2abdade71cd9bb0e7a373ef2610ec6f9daf"
50-
}
51-
},
52-
"DevelopmentDependency": false
53-
},
54-
{
55-
"Component": {
56-
"Type": "git",
57-
"Git": {
58-
"RepositoryUrl": "https://github.com/intel/zlib",
59-
"CommitHash": "6160a8f20c3626aec2f8b0fda5bf2e65bfe31781"
60-
}
61-
},
62-
"DevelopmentDependency": false
63-
},
6444
{
6545
"Component": {
6646
"Type": "git",

src/native/external/patches/zlib-intel/0001-Make-zlib-intel-compile-clean-against-C4244.patch

Lines changed: 0 additions & 75 deletions
This file was deleted.

src/native/external/patches/zlib/0001-Make-zlib-compile-clean-against-C4244.patch

Lines changed: 0 additions & 57 deletions
This file was deleted.

src/native/external/zlib-intel-version.txt

Lines changed: 0 additions & 16 deletions
This file was deleted.

src/native/external/zlib-intel/README.txt

Lines changed: 0 additions & 11 deletions
This file was deleted.

0 commit comments

Comments
 (0)