Make zlib default in binascii, update news/whatsnew with pr no

Author: StanFromIreland

Doc/whatsnew/3.14.rst

@@ -1314,7 +1314,7 @@ Build changes
   It is still technically possible to build CPython without it for special needs, like bootstrapping.
   Such builds are not supported, but we can accept pull requests to keep them working.
   As an exception, zlib is not required on WASI.
-  (Contributed by Stan Ulbrych in :gh:`xxxxxx`.)
+  (Contributed by Stan Ulbrych in :gh:`130297`.)
 
 .. _whatsnew314-pep761:
 

Misc/NEWS.d/next/Build/2025-02-19-00-00-00.gh-issue-91246.ahsgd3.rst

@@ -1,2 +1,2 @@
 Make zlib required to build CPython with the exception of WASI.
-(Contributed by Stan Ulbrych in :gh:`xxxxxx`.)
+(Contributed by Stan Ulbrych in :gh:`130297`.)

Modules/binascii.c

@@ -60,7 +60,7 @@
 #include "Python.h"
 #include "pycore_long.h"          // _PyLong_DigitValue
 #include "pycore_strhex.h"        // _Py_strhex_bytes_with_sep()
-#ifdef USE_ZLIB_CRC32
+#ifndef NO_ZLIB_CRC32
 #  include "zlib.h"
 #endif
 
@@ -616,7 +616,7 @@ binascii_crc_hqx_impl(PyObject *module, Py_buffer *data, unsigned int crc)
     return PyLong_FromUnsignedLong(crc);
 }
 
-#ifndef USE_ZLIB_CRC32
+#ifdef NO_ZLIB_CRC32
 /*  Crc - 32 BIT ANSI X3.66 CRC checksum files
     Also known as: ISO 3307
 **********************************************************************|
@@ -749,7 +749,7 @@ internal_crc32(const unsigned char *bin_data, Py_ssize_t len, unsigned int crc)
     result = (crc ^ 0xFFFFFFFF);
     return result & 0xffffffff;
 }
-#endif  /* USE_ZLIB_CRC32 */
+#endif  /* NO_ZLIB_CRC32 */
 
 /*[clinic input]
 binascii.crc32 -> unsigned_int
@@ -765,9 +765,11 @@ static unsigned int
 binascii_crc32_impl(PyObject *module, Py_buffer *data, unsigned int crc)
 /*[clinic end generated code: output=52cf59056a78593b input=bbe340bc99d25aa8]*/
 
-#ifdef USE_ZLIB_CRC32
+#ifndef NO_ZLIB_CRC32
 /* This is the same as zlibmodule.c zlib_crc32_impl. It exists in two
- * modules for historical reasons. */
+ * modules for historical reasons. They should be consolidated in the future
+ * once WASI supports zlib.
+ */
 {
     /* Releasing the GIL for very small buffers is inefficient
        and may lower performance */
@@ -798,7 +800,7 @@ binascii_crc32_impl(PyObject *module, Py_buffer *data, unsigned int crc)
     }
     return crc & 0xffffffff;
 }
-#else  /* USE_ZLIB_CRC32 */
+#else  /* NO_ZLIB_CRC32 */
 {
     const unsigned char *bin_data = data->buf;
     Py_ssize_t len = data->len;
@@ -815,7 +817,7 @@ binascii_crc32_impl(PyObject *module, Py_buffer *data, unsigned int crc)
         return internal_crc32(bin_data, len, crc);
     }
 }
-#endif  /* USE_ZLIB_CRC32 */
+#endif  /* NO_ZLIB_CRC32 */
 
 /*[clinic input]
 binascii.b2a_hex

PCbuild/pythoncore.vcxproj

@@ -457,9 +457,7 @@
     <ClCompile Include="..\Modules\_weakref.c" />
     <ClCompile Include="..\Modules\arraymodule.c" />
     <ClCompile Include="..\Modules\atexitmodule.c" />
-    <ClCompile Include="..\Modules\binascii.c">
-      <PreprocessorDefinitions>USE_ZLIB_CRC32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
+    <ClCompile Include="..\Modules\binascii.c" />
     <ClCompile Include="..\Modules\cmathmodule.c" />
     <ClCompile Include="..\Modules\_datetimemodule.c" />
     <ClCompile Include="..\Modules\errnomodule.c" />

configure

@@ -5325,9 +5325,6 @@ 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.])
 
-dnl detect zlib from Emscripten emport
-PY_CHECK_EMSCRIPTEN_PORT([ZLIB], [-sUSE_ZLIB])
-
 PKG_CHECK_MODULES([ZLIB], [zlib >= 1.2.0], [
   have_zlib=yes
   dnl zlib 1.2.0 (2003) added inflateCopy
@@ -5342,15 +5339,17 @@ PKG_CHECK_MODULES([ZLIB], [zlib >= 1.2.0], [
     AS_VAR_IF([have_zlib], [yes], [
       ZLIB_CFLAGS=${ZLIB_CFLAGS-""}
       ZLIB_LIBS=${ZLIB_LIBS-"-lz"}
+      BINASCII_CFLAGS="$ZLIB_CFLAGS"
+      BINASCII_LIBS="$ZLIB_LIBS"
       PY_CHECK_LIB([z], [inflateCopy], [AC_DEFINE([HAVE_ZLIB_COPY], [1])])
     ])
   ])
 ])
 
-dnl binascii can use zlib for optimized crc32.
-AS_VAR_IF([have_zlib], [yes], [
-  BINASCII_CFLAGS="-DUSE_ZLIB_CRC32 $ZLIB_CFLAGS"
-  BINASCII_LIBS="$ZLIB_LIBS"
+dnl wasi does not support zlib
+AS_VAR_IF([have_zlib], [no], [
+  BINASCII_CFLAGS="-DNO_ZLIB_CRC32"
+  BINASCII_LIBS=""
 ])
 
 dnl detect bzip2 from Emscripten emport

configure.ac

@@ -1609,7 +1609,8 @@
 /* Define to 1 if you have the 'writev' function. */
 #undef HAVE_WRITEV
 
-/* Define if the zlib library has inflateCopy */
+/* Define if the zlib library has inflateCopy; zlib 1.2.0 (2003) added
+   inflateCopy. */
 #undef HAVE_ZLIB_COPY
 
 /* Define to 1 if you have the <zlib.h> header file. */