CVS commit: pkgsrc/sysutils/pciutils

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Tue May 19 08:41:36 UTC 2026

Modified Files:
        pkgsrc/sysutils/pciutils: distinfo
        pkgsrc/sysutils/pciutils/patches: patch-lib_internal.h

Log Message:
pciutils: Improved fix for illumos.


To generate a diff of this commit:
cvs rdiff -u -r1.50 -r1.51 pkgsrc/sysutils/pciutils/distinfo
cvs rdiff -u -r1.8 -r1.9 \
    pkgsrc/sysutils/pciutils/patches/patch-lib_internal.h

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

Modified files:

Index: pkgsrc/sysutils/pciutils/distinfo
diff -u pkgsrc/sysutils/pciutils/distinfo:1.50 pkgsrc/sysutils/pciutils/distinfo:1.51
--- pkgsrc/sysutils/pciutils/distinfo:1.50      Wed May  6 09:27:00 2026
+++ pkgsrc/sysutils/pciutils/distinfo   Tue May 19 08:41:36 2026
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.50 2026/05/06 09:27:00 pin Exp $
+$NetBSD: distinfo,v 1.51 2026/05/19 08:41:36 jperkin Exp $
 
 BLAKE2s (pciutils-3.15.0.tar.gz) = 3123a6b8205ab331732e2f6fd27e6f4afcf5c75fc3bda5364d2cdc516c65c052
 SHA512 (pciutils-3.15.0.tar.gz) = c03c5617ed0c0f7c2e3b36889d93221521e449b93969256eb7512603b5dccf5ce0e5eb3c58662a091621e59257593a162f8ba36537d93e52386e227641a1a593
 Size (pciutils-3.15.0.tar.gz) = 728201 bytes
 SHA1 (patch-Makefile) = f187889cb6baf2714f2444f1f7d5e7e722fdd3da
 SHA1 (patch-lib_configure) = cd6b967852a50cf6e00ea51af39ea589cb67a307
-SHA1 (patch-lib_internal.h) = e25649f5bb3c8045016269b59597bb0e2f17e135
+SHA1 (patch-lib_internal.h) = 8590f5233c903f5c172e9493204c79ea27266733
 SHA1 (patch-lib_libpci.pc.in) = 9f7ccde7ac56385c19a7efe98c20f84f2a373437

Index: pkgsrc/sysutils/pciutils/patches/patch-lib_internal.h
diff -u pkgsrc/sysutils/pciutils/patches/patch-lib_internal.h:1.8 pkgsrc/sysutils/pciutils/patches/patch-lib_internal.h:1.9
--- pkgsrc/sysutils/pciutils/patches/patch-lib_internal.h:1.8   Wed May  6 09:27:01 2026
+++ pkgsrc/sysutils/pciutils/patches/patch-lib_internal.h       Tue May 19 08:41:36 2026
@@ -1,24 +1,15 @@
-$NetBSD: patch-lib_internal.h,v 1.8 2026/05/06 09:27:01 pin Exp $
+$NetBSD: patch-lib_internal.h,v 1.9 2026/05/19 08:41:36 jperkin Exp $
 
-No symbol versioning available on SunOS.
+Fix symbol versioning on illumos.
 
---- lib/internal.h.orig        2026-05-06 05:05:48.454312571 +0000
+--- lib/internal.h.orig        2026-04-05 18:16:44.000000000 +0000
 +++ lib/internal.h
-@@ -23,6 +23,17 @@
+@@ -19,7 +19,7 @@
+ // mechanism, have to be declared as VERSIONED. Otherwise, GCC with global
+ // optimizations is happy to optimize them away, leading to linker failures.
+ #define VERSIONED_ABI __attribute__((used)) PCI_ABI
+-#ifdef __APPLE__
++#if defined(__APPLE__) || defined(__illumos__)
  #define STATIC_ALIAS(_decl, _for) VERSIONED_ABI _decl { return _for; }
  #define DEFINE_ALIAS(_decl, _for)
  #define SYMBOL_VERSION(_int, _ext)
-+#elif defined(__sun__)
-+#define STATIC_ALIAS(_decl, _for)
-+#define DEFINE_ALIAS(_decl, _for)
-+#define SYMBOL_VERSION(_int, _ext)
-+#define pci_fill_info_v313 pci_fill_info
-+#define pci_filter_init_v38 pci_filter_init
-+#define pci_fill_info_v38 pci_fill_info
-+#define pci_init_v35 pci_init
-+#define pci_filter_parse_slot_v38 pci_filter_parse_slot
-+#define pci_filter_parse_id_v38 pci_filter_parse_id
-+#define pci_filter_match_v38 pci_filter_match
- #else
- #define DEFINE_ALIAS(_decl, _for) extern _decl __attribute__((alias(#_for))) VERSIONED_ABI
- #ifdef _WIN32