Skip to content

Commit 73d92c3

Browse files
committed
deps: delete deps/zlib
We currently have two copies of Chromium's zlib: one in deps/zlib and another in deps/v8/third_party/zlib. This has a couple of disadvantages: 1. There is an additional cost to keeping both dependencies up-to-date, and in fact they were already out-of-sync (see the refs). 2. People who compile with --shared-zlib (i.e. distro maintainers) will probably not be thrilled to learn that there is still a copy of zlib inside. 3. It's aesthetically unpleasing. Centralize on the version in V8 rather than the one in deps, and delete the one in deps. Basically I just copied deps/zlib/zlib.gyp to tools/v8_gypfiles/zlib.gyp, since the former had a better build configuration (see the refs). This approach seemed better than the opposite approach of centralizing on deps/zlib because: 1. We would need to occasionally bump deps/zlib manually after bumping deps/v8, which seemed annoying. 2. The maintenance steps for bumping zlib seemed more onerous than the maintenance steps for bumping V8. (If we would prefer the opposite approach, I actually have another patch locally.) One discrepancy was that V8's version of zlib had all symbols to be prefixed with `Cr_z_` per deps/v8/third_party/zlib/chromeconf.h, which seemed undesirable, so I added define `CHROMIUM_ZLIB_NO_CHROMECONF` to the build to remove it. (deps/zlib handled this by just commenting out the relevant include, but floating a patch seemed less desirable.) I tested this on Linux with the default build and a --shared-zlib build. I checked that the shared-zlib build correctly linked zlib according to ldd. I would appreciate if the reviewers could suggest some other build configurations to try. Refs: nodejs#47145 Refs: nodejs#47151
1 parent 9e9f68a commit 73d92c3

File tree

142 files changed

+6
-47421
lines changed

Some content is hidden

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

142 files changed

+6
-47421
lines changed

deps/zlib/BUILD.gn

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

deps/zlib/DIR_METADATA

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

deps/zlib/GN-scraper.py

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

deps/zlib/LICENSE

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

deps/zlib/OWNERS

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

deps/zlib/README.chromium

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

deps/zlib/adler32.c

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

0 commit comments

Comments
 (0)