CVS commit: pkgsrc/devel/libatomic

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Thu Jan 15 11:09:49 UTC 2026

Modified Files:
        pkgsrc/devel/libatomic: distinfo
Added Files:
        pkgsrc/devel/libatomic/patches: patch-libatomic_config_x86_init.c

Log Message:
libatomic: fix build with older gcc's cpuid.h installed


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 pkgsrc/devel/libatomic/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/devel/libatomic/patches/patch-libatomic_config_x86_init.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/libatomic/distinfo
diff -u pkgsrc/devel/libatomic/distinfo:1.13 pkgsrc/devel/libatomic/distinfo:1.14
--- pkgsrc/devel/libatomic/distinfo:1.13        Wed Jan 14 15:24:48 2026
+++ pkgsrc/devel/libatomic/distinfo     Thu Jan 15 11:09:49 2026
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.13 2026/01/14 15:24:48 wiz Exp $
+$NetBSD: distinfo,v 1.14 2026/01/15 11:09:49 wiz Exp $
 
 BLAKE2s (gcc-15.1.0.tar.xz) = 260d64654fbfc0ee06540cc4604cd7071be53d616069a9dd57e5359a0b0ecf46
 SHA512 (gcc-15.1.0.tar.xz) = ddd35ca6c653dffa88f7c7ef9ee4cd806e156e0f3b30f4d63e75a8363361285cd566ee73127734cde6a934611de815bee3e32e24bfd2e0ab9f7ff35c929821c1
 Size (gcc-15.1.0.tar.xz) = 98268344 bytes
+SHA1 (patch-libatomic_config_x86_init.c) = 6ad99fa7ae5e3b22e09d3ef73d79bcad33d427ce
 SHA1 (patch-libatomic_configure) = 9ca952bc6e48dc37dd79d3fb050194de460f0898
 SHA1 (patch-libatomic_configure.tgt) = 813cea1aa1006af78db27e9f33b780eaa9482647

Added files:

Index: pkgsrc/devel/libatomic/patches/patch-libatomic_config_x86_init.c
diff -u /dev/null pkgsrc/devel/libatomic/patches/patch-libatomic_config_x86_init.c:1.1
--- /dev/null   Thu Jan 15 11:09:49 2026
+++ pkgsrc/devel/libatomic/patches/patch-libatomic_config_x86_init.c    Thu Jan 15 11:09:49 2026
@@ -0,0 +1,18 @@
+$NetBSD: patch-libatomic_config_x86_init.c,v 1.1 2026/01/15 11:09:49 wiz Exp $
+
+Fix build when an older gcc's cpuid.h is found.
+
+--- libatomic/config/x86/init.c.orig   2026-01-15 11:08:04.804533308 +0000
++++ libatomic/config/x86/init.c
+@@ -49,7 +49,10 @@ __libat_feat1_init (void)
+         if (ecx2 != signature_INTEL_ecx
+             && ecx2 != signature_AMD_ecx
+             && !(ecx2 == signature_CENTAUR_ecx && family > 6)
+-            && ecx2 != signature_SHANGHAI_ecx)
++#ifdef signature_SHANGHAI_ecx
++            && ecx2 != signature_SHANGHAI_ecx
++#endif
++              )
+           FEAT1_REGISTER &= ~bit_AVX;
+       }
+ #endif