From d3604bc82f1e04e435f3bc62070060de9df5c9ad83f699a49ada7381b8aa7c72 Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Wed, 16 Oct 2024 07:20:31 +0000 Subject: [PATCH] - Add patch to fix build: - gh125535-Lib_IntVector_Intrinsics_vec128.patch (gh#python/cpython#125535) OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:Factory/python314?expand=0&rev=4 --- ...5535-Lib_IntVector_Intrinsics_vec128.patch | 37 +++++++++++++++++++ python314.changes | 3 ++ python314.spec | 4 ++ 3 files changed, 44 insertions(+) create mode 100644 gh125535-Lib_IntVector_Intrinsics_vec128.patch diff --git a/gh125535-Lib_IntVector_Intrinsics_vec128.patch b/gh125535-Lib_IntVector_Intrinsics_vec128.patch new file mode 100644 index 0000000..40ba90e --- /dev/null +++ b/gh125535-Lib_IntVector_Intrinsics_vec128.patch @@ -0,0 +1,37 @@ +From 091fd6240c6b263d848e8a5d20da042258f648b5 Mon Sep 17 00:00:00 2001 +From: Jonathan Protzenko +Date: Thu, 10 Oct 2024 11:59:06 +0200 +Subject: [PATCH 1/2] Try for Debian x86 + +--- + Misc/sbom.spdx.json | 4 ++-- + Modules/_hacl/libintvector.h | 2 +- + 2 files changed, 3 insertions(+), 3 deletions(-) + +--- a/Misc/sbom.spdx.json ++++ b/Misc/sbom.spdx.json +@@ -804,11 +804,11 @@ + "checksums": [ + { + "algorithm": "SHA1", +- "checksumValue": "d5d85ee8f0bd52781fe470d0bf73ec388ddb3999" ++ "checksumValue": "f4a33ad535768b860362ab0bd033a70da0b524b7" + }, + { + "algorithm": "SHA256", +- "checksumValue": "9a421b998add98fe366374641c4edb27617ff539a59f0963879f345065d3d39d" ++ "checksumValue": "433cdf4ba80bc72e0cea5d4b420ff18676baeafdb5ba19adf5b7fb33e90b424b" + } + ], + "fileName": "Modules/_hacl/libintvector.h" +--- a/Modules/_hacl/libintvector.h ++++ b/Modules/_hacl/libintvector.h +@@ -19,7 +19,7 @@ + + #define Lib_IntVector_Intrinsics_bit_mask64(x) -((x) & 1) + +-#if defined(__x86_64__) || defined(_M_X64) ++#if defined(__x86_64__) || defined(_M_X64) || defined(__i386__) || defined(_M_IX86) + + #if defined(HACL_CAN_COMPILE_VEC128) + diff --git a/python314.changes b/python314.changes index 3b05033..9670cfc 100644 --- a/python314.changes +++ b/python314.changes @@ -13,6 +13,9 @@ Wed Oct 16 07:00:15 UTC 2024 - Matej Cepl - bpo-31046_ensurepip_honours_prefix.patch - fix-test-recursion-limit-15.6.patch - python-3.3.0b1-fix_date_time_compiler.patch +- Add patch to fix build: + - gh125535-Lib_IntVector_Intrinsics_vec128.patch + (gh#python/cpython#125535) ------------------------------------------------------------------- Thu Oct 10 11:18:19 UTC 2024 - Matej Cepl diff --git a/python314.spec b/python314.spec index c53c6b5..5211002 100644 --- a/python314.spec +++ b/python314.spec @@ -211,6 +211,10 @@ Patch39: CVE-2023-52425-libexpat-2.6.0-backport-15.6.patch # PATCH-FIX-OPENSUSE fix-test-recursion-limit-15.6.patch gh#python/cpython#115083 # Skip some failing tests in test_compile for i586 arch in 15.6. Patch40: fix-test-recursion-limit-15.6.patch +#### Python 3.14 DEVELOPMENT PATCHES +# PATCH-FIX-UPSTREAM gh125535-Lib_IntVector_Intrinsics_vec128.patch gh#python/cpython#125535 mcepl@suse.com +# Patch from https://github.com/python/cpython/pull/125244 +Patch41: gh125535-Lib_IntVector_Intrinsics_vec128.patch BuildRequires: autoconf-archive BuildRequires: automake BuildRequires: fdupes