zlib: clean up zlib.gyp, don't build minizip #276
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Revert "src: fix windows build error" and "zlib: support concatenated gzip files". This reverts commits be413ac and 1183ba4. Treating subsequent bytes as a concatenated zlib stream breaks npm install. Conflicts: test/parallel/test-zlib-from-multiple-gzip-with-garbage.js test/parallel/test-zlib-from-multiple-gzip.js test/parallel/test-zlib-from-multiple-huge-gzip.js Fixes: nodejs/node-v0.x-archive#8962 PR-URL: #240 Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
|
LGTM, although not building minizip by itself doesn't fix the warnings, that's due to defining Z_HAVE_UNISTD_H. I suggest landing #273 first, then landing this PR on top so that things don't get conflated. |
The V8 development branch has unshipped ES6 classes pending resolution of a number of inheritance edge cases. Disable classes in io.js for the sake of feature parity. See #251 for background and discussion. PR-URL: #272 Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: Domenic Denicola <domenic@domenicdenicola.com>
Build the bundled zlib with -DZ_HAVE_UNISTD_H to make the definition of close(), read() and other unistd.h functions available to gzread.c and gzwrite.c. It's kind of silly that we have to jump through hoops here because we never call any of the functions that do I/O directly, but at least it squelches the -Wimplicit-function-declaration warnings. PR-URL: #273 Reviewed-by: Bert Belder <bertbelder@gmail.com>
PR-URL: #276 Reviewed-by: Ben Noordhuis <info@bnoordhuis.nl>
It's an optional extension that node/iojs doesn't use. PR-URL: #276 Reviewed-by: Ben Noordhuis <info@bnoordhuis.nl>
This was referenced Feb 11, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
As exposed by #273, the bundled zlib builds an optional extension called 'minizip' that provides filesystem-like APIs for working with zip files.
Node doesn't use it, so let's not build it either.
This patch works on windows but I haven't checked other platforms yet. (\o CI).
What definitely needs to be reviewed is what happens if
use_system_zlibis defined; with this patch zlib still gets built but has no sources at all.R=@bnoordhuis or @shigeki