Patch cpuid.h guard

Author: zanieb

cpython-unix/build-cpython.sh

@@ -317,6 +317,12 @@ if [ -n "${PYTHON_MEETS_MINIMUM_VERSION_3_12}" ]; then
     patch -p1 -i ${ROOT}/patch-test-embed-prevent-segfault.patch
 fi
 
+
+# For Python 3.14+, the include for `cpuid.h` is improperly guarded
+if [[ -n "${PYTHON_MEETS_MINIMUM_VERSION_3_14}" && "${CC}" = "musl-clang" ]]; then
+    patch -p1 -i ${ROOT}/patch-blake-musl-314.patch
+fi
+
 # Most bits look at CFLAGS. But setup.py only looks at CPPFLAGS.
 # So we need to set both.
 CFLAGS="${EXTRA_TARGET_CFLAGS} -fPIC -I${TOOLS_PATH}/deps/include -I${TOOLS_PATH}/deps/include/ncursesw"

cpython-unix/extension-modules.yml

@@ -49,11 +49,6 @@ _blake2:
     # Disable `explicit_bzero`, it requires glib 2.25+
     - define: LINUX_NO_EXPLICIT_BZERO
       minimum-python-version: "3.14"
-    # Disable cpuid.h requirement for musl builds
-    - define: NO_CPUID
-      targets:
-        - .*-unknown-linux-musl
-      minimum-python-version: "3.14"
 
 _bz2:
   sources:

cpython-unix/patch-blake-musl-314.patch

@@ -0,0 +1,12 @@
+diff --git a/Modules/blake2module.c b/Modules/blake2module.c
+--- a/Modules/blake2module.c
++++ b/Modules/blake2module.c
+@@ -33,7 +33,7 @@
+ // pulled into the build automatically, and then only the CPU autodetection will
+ // need to be updated here.
+ 
+-#if defined(__x86_64__) && defined(__GNUC__)
++#if defined(__x86_64__) && defined(__GLIBC__)
+ #include <cpuid.h>
+ #elif defined(_M_X64)
+ #include <intrin.h>