diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 8a481e4..e30b5ea 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -9,6 +9,7 @@ Changelog version 1.0.1-dev ----------------- ++ Update included zlib-ng distribution to 2.3.3. + Fix ``gzip_ng_threaded`` writers that waited forever when writing to the underlying file failed, for example, because the disk was full. A later call to ``write()``, ``flush()``, or ``close()`` raises the error. After an error, diff --git a/setup.py b/setup.py index f58cbf8..6d9f267 100644 --- a/setup.py +++ b/setup.py @@ -107,15 +107,12 @@ def build_zlib_ng(): subprocess.run([os.path.join(build_dir, "configure")], **run_args) make_program = "gmake" if shutil.which("gmake") else "make" subprocess.run([make_program, "libz-ng.a"], **run_args) - elif sys.platform == "linux": - subprocess.run([os.path.join(build_dir, "configure")], **run_args) - subprocess.run(["make", "libz-ng.a", "-j", str(cpu_count)], **run_args) else: subprocess.run(["cmake", build_dir], **run_args) # Do not create test suite and do not perform tests to shorten build times. # There is no need when stable releases of zlib-ng are used. subprocess.run(["cmake", "--build", build_dir, "--config", "Release", - "--target", "zlibstatic", + "--target", "zlib-ng-static", "-j", str(cpu_count)], **run_args) if BUILD_CACHE: BUILD_CACHE_FILE.write_text(build_dir) diff --git a/src/zlib_ng/zlib-ng b/src/zlib_ng/zlib-ng index 4254390..1273109 160000 --- a/src/zlib_ng/zlib-ng +++ b/src/zlib_ng/zlib-ng @@ -1 +1 @@ -Subproject commit 425439062b114a0f6cf625022c41d929c7e879f9 +Subproject commit 12731092979c6d07f42da27da673a9f6c7b13586