Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ zip_keys:
- channel_targets
- - c_compiler_version
- cxx_compiler_version
zlib:
- '1'
zlib_ng:
- '2.2'
zstd:
- '1.5'
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ zip_keys:
- channel_targets
- - c_compiler_version
- cxx_compiler_version
zlib:
- '1'
zlib_ng:
- '2.2'
zstd:
- '1.5'
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ zip_keys:
- channel_targets
- - c_compiler_version
- cxx_compiler_version
zlib:
- '1'
zlib_ng:
- '2.2'
zstd:
- '1.5'
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ zip_keys:
- channel_targets
- - c_compiler_version
- cxx_compiler_version
zlib:
- '1'
zlib_ng:
- '2.2'
zstd:
- '1.5'
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ zip_keys:
- channel_targets
- - c_compiler_version
- cxx_compiler_version
zlib:
- '1'
zlib_ng:
- '2.2'
zstd:
- '1.5'
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ zip_keys:
- channel_targets
- - c_compiler_version
- cxx_compiler_version
zlib:
- '1'
zlib_ng:
- '2.2'
zstd:
- '1.5'
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ zip_keys:
- channel_targets
- - c_compiler_version
- cxx_compiler_version
zlib:
- '1'
zlib_ng:
- '2.2'
zstd:
- '1.5'
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ zip_keys:
- channel_targets
- - c_compiler_version
- cxx_compiler_version
zlib:
- '1'
zlib_ng:
- '2.2'
zstd:
- '1.5'
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ zip_keys:
- channel_targets
- - c_compiler_version
- cxx_compiler_version
zlib:
- '1'
zlib_ng:
- '2.2'
zstd:
- '1.5'
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ zip_keys:
- channel_targets
- - c_compiler_version
- cxx_compiler_version
zlib:
- '1'
zlib_ng:
- '2.2'
zstd:
- '1.5'
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ zip_keys:
- channel_targets
- - c_compiler_version
- cxx_compiler_version
zlib:
- '1'
zlib_ng:
- '2.2'
zstd:
- '1.5'
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ zip_keys:
- channel_targets
- - c_compiler_version
- cxx_compiler_version
zlib:
- '1'
zlib_ng:
- '2.2'
zstd:
- '1.5'
8 changes: 0 additions & 8 deletions .ci_support/migrations/libffi35.yaml

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ zip_keys:
- channel_targets
- - c_compiler_version
- cxx_compiler_version
zlib:
- '1'
zlib_ng:
- '2.2'
zstd:
- '1.5'
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ zip_keys:
- channel_targets
- - c_compiler_version
- cxx_compiler_version
zlib:
- '1'
zlib_ng:
- '2.2'
zstd:
- '1.5'
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ zip_keys:
- channel_targets
- - c_compiler_version
- cxx_compiler_version
zlib:
- '1'
zlib_ng:
- '2.2'
zstd:
- '1.5'
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ zip_keys:
- channel_targets
- - c_compiler_version
- cxx_compiler_version
zlib:
- '1'
zlib_ng:
- '2.2'
zstd:
- '1.5'
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ zip_keys:
- channel_targets
- - c_compiler_version
- cxx_compiler_version
zlib:
- '1'
zlib_ng:
- '2.2'
zstd:
- '1.5'
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ zip_keys:
- channel_targets
- - c_compiler_version
- cxx_compiler_version
zlib:
- '1'
zlib_ng:
- '2.2'
zstd:
- '1.5'
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ zip_keys:
- channel_targets
- - c_compiler_version
- cxx_compiler_version
zlib:
- '1'
zlib_ng:
- '2.2'
zstd:
- '1.5'
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ zip_keys:
- channel_targets
- - c_compiler_version
- cxx_compiler_version
zlib:
- '1'
zlib_ng:
- '2.2'
zstd:
- '1.5'
4 changes: 2 additions & 2 deletions .ci_support/win_64_freethreadingno.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ tk:
zip_keys:
- - build_type
- channel_targets
zlib:
- '1'
zlib_ng:
- '2.2'
zstd:
- '1.5'
4 changes: 2 additions & 2 deletions .ci_support/win_64_freethreadingyes.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ tk:
zip_keys:
- - build_type
- channel_targets
zlib:
- '1'
zlib_ng:
- '2.2'
zstd:
- '1.5'
16 changes: 8 additions & 8 deletions README.md

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

15 changes: 15 additions & 0 deletions recipe/build_base.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,21 @@ if [[ ! -d ${SRC_DIR}/python-bin ]]; then
export PATH=${SRC_DIR}/python-bin/bin:${PATH}
fi

# tcl/tk seem to add a dependency against zlib
# but they actually do not appear in the header files
# so they aren't useful in the context off dynamic linking
# https://github.com/conda-forge/tk-feedstock/pull/70
sed -i.bak '/^Requires\.private/d' ${PREFIX}/lib/pkgconfig/tcl.pc
rm -f ${PREFIX}/lib/pkgconfig/tcl.pc.bak
sed -i.bak '/^Libs\.private/d' ${PREFIX}/lib/pkgconfig/tcl.pc
rm -f ${PREFIX}/lib/pkgconfig/tcl.pc.bak
if [[ "${CONDA_BUILD_CROSS_COMPILATION}" == "1" ]]; then
sed -i.bak '/^Requires\.private/d' ${BUILD_PREFIX}/lib/pkgconfig/tcl.pc
rm -f ${BUILD_PREFIX}/lib/pkgconfig/tcl.pc.bak
sed -i.bak '/^Libs\.private/d' ${BUILD_PREFIX}/lib/pkgconfig/tcl.pc
rm -f ${BUILD_PREFIX}/lib/pkgconfig/tcl.pc.bak
fi

# The LTO/PGO information was sourced from @pitrou and the Debian rules file in:
# http://http.debian.net/debian/pool/main/p/python3.6/python3.6_3.6.2-2.debian.tar.xz
# https://packages.debian.org/source/sid/python3.6
Expand Down
11 changes: 8 additions & 3 deletions recipe/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
{% set ver2 = '.'.join(version.split('.')[0:2]) %}
{% set ver2nd = ''.join(version.split('.')[0:2]) %}
{% set ver3nd = ''.join(version.split('.')[0:3]) %}
{% set build_number = 2 %}
{% set build_number = 3 %}

# this makes the linter happy
{% set channel_targets = channel_targets or 'conda-forge main' %}
Expand Down Expand Up @@ -78,6 +78,11 @@ source:
- patches/0024-Do-not-define-pid_t-as-it-might-conflict-with-the-ac.patch
- patches/0025-Unvendor-zstd.patch

# zlib-ng for all platforms
- patches/0026-Adjust-windows-project-for-zlib-ng.patch
- patches/0027-Use-zlib-ng-on-unix-instead-of-zlib.patch
- patches/0028-Update-usage-of-zlib-to-explicitely-use-zlib-ng.patch

build:
number: {{ build_number }}

Expand Down Expand Up @@ -163,7 +168,7 @@ outputs:
- bzip2 # [build_platform != target_platform]
- libsqlite # [build_platform != target_platform]
- liblzma-devel # [build_platform != target_platform]
- zlib # [build_platform != target_platform]
- zlib-ng # [build_platform != target_platform]
- zstd # [build_platform != target_platform]
- openssl # [build_platform != target_platform]
- readline # [not win and build_platform != target_platform]
Expand All @@ -177,7 +182,7 @@ outputs:
- bzip2
- libsqlite
- liblzma-devel
- zlib
- zlib-ng
- zstd
- openssl
- readline # [not win]
Expand Down
43 changes: 43 additions & 0 deletions recipe/patches/0026-Adjust-windows-project-for-zlib-ng.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
From 4f2f508e468c1c6a58d3dec71f11de03ce23df8d Mon Sep 17 00:00:00 2001
From: Mark Harfouche <mark.harfouche@gmail.com>
Date: Sat, 1 Nov 2025 17:00:02 -0400
Subject: [PATCH 26/28] Adjust windows project for zlib-ng

---
PCbuild/pythoncore.vcxproj | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/PCbuild/pythoncore.vcxproj b/PCbuild/pythoncore.vcxproj
index fc1a607..82909cc 100644
--- a/PCbuild/pythoncore.vcxproj
+++ b/PCbuild/pythoncore.vcxproj
@@ -82,7 +82,7 @@
<PropertyGroup>
<KillPython>true</KillPython>
<RequireProfileData>true</RequireProfileData>
- <IncludeExternals Condition="$(IncludeExternals) == '' and Exists('$(condaDir)\include\zlib.h')">true</IncludeExternals>
+ <IncludeExternals Condition="$(IncludeExternals) == '' and Exists('$(condaDir)\include\zlib-ng.h')">true</IncludeExternals>
<IncludeExternals Condition="$(IncludeExternals) == ''">false</IncludeExternals>
</PropertyGroup>
<ImportGroup Label="PropertySheets">
@@ -103,7 +103,7 @@
<AdditionalIncludeDirectories>$(PySourcePath)Modules\_hacl;$(PySourcePath)Modules\_hacl\include;$(PySourcePath)Python;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories Condition="$(IncludeExternals)">$(condaDir)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories Condition="'$(UseJIT)' == 'true'">$(GeneratedJitStencilsDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_USRDLL;Py_BUILD_CORE;Py_BUILD_CORE_BUILTIN;Py_ENABLE_SHARED;MS_DLL_ID="$(SysWinVer)";ZLIB_COMPAT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>_USRDLL;Py_BUILD_CORE;Py_BUILD_CORE_BUILTIN;Py_ENABLE_SHARED;MS_DLL_ID="$(SysWinVer)";%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="$(IncludeExternals)">_Py_HAVE_ZLIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(UseJIT)' == 'true'">_Py_JIT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(UseTIER2)' != '' and '$(UseTIER2)' != '0'">_Py_TIER2=$(UseTIER2);%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -112,7 +112,7 @@
<PreprocessorDefinitions Condition="'$(DisableRemoteDebug)' != 'true'">Py_REMOTE_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<Link>
- <AdditionalDependencies>version.lib;ws2_32.lib;pathcch.lib;bcrypt.lib;zlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>version.lib;ws2_32.lib;pathcch.lib;bcrypt.lib;zlib-ng.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(condaDir)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
</Link>
</ItemDefinitionGroup>
--
2.51.0

Loading