mirror of
https://github.com/NixOS/nixpkgs.git
synced 2026-07-06 17:13:24 -05:00
python314: 3.14.4 -> 3.14.5 (#518722)
This commit is contained in:
commit
384c44e341
3 changed files with 2 additions and 62 deletions
|
|
@ -1,50 +0,0 @@
|
|||
From ee1b8479cff97ca7e5ed4d51d6aa24ccb47deb8b Mon Sep 17 00:00:00 2001
|
||||
From: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>
|
||||
Date: Sat, 21 Mar 2026 18:34:50 -0400
|
||||
Subject: [PATCH] gh-146264: Use static HACL deps for static module builds
|
||||
|
||||
---
|
||||
.../next/Build/2026-03-21-18-51-31.gh-issue-146264.Q9Ej4m.rst | 3 +++
|
||||
configure | 2 +-
|
||||
configure.ac | 2 +-
|
||||
3 files changed, 5 insertions(+), 2 deletions(-)
|
||||
create mode 100644 Misc/NEWS.d/next/Build/2026-03-21-18-51-31.gh-issue-146264.Q9Ej4m.rst
|
||||
|
||||
diff --git a/Misc/NEWS.d/next/Build/2026-03-21-18-51-31.gh-issue-146264.Q9Ej4m.rst b/Misc/NEWS.d/next/Build/2026-03-21-18-51-31.gh-issue-146264.Q9Ej4m.rst
|
||||
new file mode 100644
|
||||
index 00000000000..1fdafe56043
|
||||
--- /dev/null
|
||||
+++ b/Misc/NEWS.d/next/Build/2026-03-21-18-51-31.gh-issue-146264.Q9Ej4m.rst
|
||||
@@ -0,0 +1,3 @@
|
||||
+Fix static module builds on non-WASI targets by linking HACL dependencies as
|
||||
+static libraries when ``MODULE_BUILDTYPE=static``, preventing duplicate
|
||||
+``_Py_LibHacl_*`` symbol errors at link time.
|
||||
diff --git a/configure b/configure
|
||||
index 23f24d51c79..db5c861f601 100755
|
||||
--- a/configure
|
||||
+++ b/configure
|
||||
@@ -33009,7 +33009,7 @@ fi
|
||||
|
||||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for HACL* library linking type" >&5
|
||||
printf %s "checking for HACL* library linking type... " >&6; }
|
||||
-if test "$ac_sys_system" = "WASI"; then
|
||||
+if test "$ac_sys_system" = "WASI" || test "$MODULE_BUILDTYPE" = "static"; then
|
||||
LIBHACL_LDEPS_LIBTYPE=STATIC
|
||||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: static" >&5
|
||||
printf "%s\n" "static" >&6; }
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 635fce3f2e6..59166d63e63 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -8171,7 +8171,7 @@ AC_SUBST([LIBHACL_BLAKE2_SIMD256_OBJS])
|
||||
# HACL*-based cryptographic primitives
|
||||
|
||||
AC_MSG_CHECKING([for HACL* library linking type])
|
||||
-if test "$ac_sys_system" = "WASI"; then
|
||||
+if test "$ac_sys_system" = "WASI" || test "$MODULE_BUILDTYPE" = "static"; then
|
||||
LIBHACL_LDEPS_LIBTYPE=STATIC
|
||||
AC_MSG_RESULT([static])
|
||||
else
|
||||
--
|
||||
2.53.0
|
||||
|
||||
|
|
@ -133,7 +133,6 @@ let
|
|||
getLib
|
||||
optionals
|
||||
optionalString
|
||||
replaceStrings
|
||||
;
|
||||
|
||||
withLibxcrypt =
|
||||
|
|
@ -427,15 +426,6 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
# backport fix for https://github.com/python/cpython/issues/95855
|
||||
./platform-triplet-detection.patch
|
||||
]
|
||||
++ optionals (pythonAtLeast "3.14" && pythonOlder "3.15") [
|
||||
# https://github.com/python/cpython/issues/146264
|
||||
# https://github.com/python/cpython/pull/146265
|
||||
./3.14/hacl-static-ldeps-for-static-modules.patch
|
||||
]
|
||||
++ optionals (version == "3.13.10" || version == "3.14.1") [
|
||||
# https://github.com/python/cpython/issues/142218
|
||||
./${lib.versions.majorMinor version}/gh-142218.patch
|
||||
]
|
||||
++ optionals (stdenv.hostPlatform.isMinGW) (
|
||||
let
|
||||
# https://src.fedoraproject.org/rpms/mingw-python3
|
||||
|
|
|
|||
|
|
@ -79,10 +79,10 @@
|
|||
sourceVersion = {
|
||||
major = "3";
|
||||
minor = "14";
|
||||
patch = "4";
|
||||
patch = "5";
|
||||
suffix = "";
|
||||
};
|
||||
hash = "sha256-2SPFEwPjjiSRNvwb3zVo1W7LAyFO/e9IUWF209f6rvg=";
|
||||
hash = "sha256-fjJZe5nl2aOavtNd5Gk/oWnfPlhQ1MM0M3/9ahmjbbY=";
|
||||
inherit passthruFun;
|
||||
};
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue