FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

gh-91246: Make zlib required to build python by StanFromIreland · Pull Request #130234 · python/cpython · GitHub

  1. python
  2. cpython

Repository navigation

gh-91246: Make zlib required to build python #130234

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
StanFromIreland wants to merge 31 commits into from
Conversation 3 Commits 31 Checks 0 Files changed
Closed

gh-91246: Make zlib required to build python #130234

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
42d107c
Make zlib required instead of optional.
gpshead Mar 22, 2022
33d9a3f
Undo aclocal.m4 changes.
gpshead Mar 22, 2022
9cd7a06
restore aclocal.m4 the right way? (ugh git)
gpshead Mar 22, 2022
f7f52c5
First commit, add some of gpsheads changes
StanFromIreland Feb 17, 2025
309cc68
Paperwork
StanFromIreland Feb 17, 2025
a6328ee
test_zlib stuff
StanFromIreland Feb 17, 2025
d565713
add android/ios
StanFromIreland Feb 17, 2025
aec582b
Config changes
StanFromIreland Feb 17, 2025
937a835
Revert binascii changes and add exception for WASM in configure
StanFromIreland Feb 17, 2025
40a3c8b
Revert "Revert binascii changes and add exception for WASM in configure"
StanFromIreland Feb 17, 2025
e347c17
Fix stuff
StanFromIreland Feb 17, 2025
c6fafae
Use non-zlib implementation if WASI
StanFromIreland Feb 17, 2025
c779e37
Fix minor error
StanFromIreland Feb 17, 2025
9668086
Correct indentation
StanFromIreland Feb 17, 2025
6f5e65e
Pushing configure would be handy :-/
StanFromIreland Feb 17, 2025
2626b5e
Fix error
StanFromIreland Feb 17, 2025
080918a
Fix error configure
StanFromIreland Feb 17, 2025
3fe2aa5
It was a )
StanFromIreland Feb 17, 2025
192f0bd
Try this
StanFromIreland Feb 17, 2025
8a7b116
Set up zlib flags correctly
StanFromIreland Feb 18, 2025
cba1f60
Set up AS_CASE better
StanFromIreland Feb 18, 2025
126d651
Push configure too
StanFromIreland Feb 18, 2025
f1371fe
empty flags
StanFromIreland Feb 18, 2025
d6ecbe2
push configure changes
StanFromIreland Feb 18, 2025
b024f1d
Retry from scratch
StanFromIreland Feb 18, 2025
3f5de24
Fix case
StanFromIreland Feb 18, 2025
a8b0313
Fix typo
StanFromIreland Feb 18, 2025
f74b981
Try being explicit
StanFromIreland Feb 18, 2025
76f5dcd
Try if statements
StanFromIreland Feb 18, 2025
3c37b06
Try be even more explicit
StanFromIreland Feb 18, 2025
8e368c6
Modify setups
StanFromIreland Feb 19, 2025
File filter

Filter by extension

Filter by extension .ac  (1) No extension  (1) All 2 file types selected
Viewed files
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Unified
Split
Hide whitespace
Diff view
Unified
Split
Hide whitespace
Prev Previous commit
Next Next commit
Fix case
  • Loading branch information
StanFromIreland committed Feb 18, 2025
commit 3f5de2437fc4f96feed1671edd82a21cd6920599
3 changes: 1 addition & 2 deletions configure
Show comments
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 3 additions & 6 deletions configure.ac
Show comments
View file
Open in desktop
This file contains hidden or 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
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -5325,12 +5325,9 @@ fi
dnl Check for compression libraries
AH_TEMPLATE([HAVE_ZLIB_COPY], [Define if the zlib library has inflateCopy; zlib 1.2.0 (2003) added inflateCopy.])

PKG_CHECK_MODULES([ZLIB], [zlib >= 1.2.0],
[
PKG_CHECK_MODULES([ZLIB], [zlib >= 1.2.0], [
have_zlib=yes
AC_DEFINE([HAVE_ZLIB_COPY], [1])
],
[
AC_DEFINE([HAVE_ZLIB_COPY], [1])], [
WITH_SAVE_ENV([
CPPFLAGS="$CPPFLAGS $ZLIB_CFLAGS"
LIBS="$LIBS $ZLIB_LIBS"
Expand All @@ -5344,7 +5341,7 @@ PKG_CHECK_MODULES([ZLIB], [zlib >= 1.2.0],
])
])
])
AS_CASE([$host_os],
AS_CASE([$ac_sys_system],
[WASI], [
dnl WASI: Do not use zlib for binascii
BINASCII_CFLAGS="-DNO_USE_ZLIB"
Expand Down
Back | FazBrowse Home | New Git URL