CVS commit: pkgsrc/devel/nasm

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

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Fri Apr 10 09:36:39 UTC 2026

Modified Files:
        pkgsrc/devel/nasm: distinfo
        pkgsrc/devel/nasm/patches: patch-include_compiler.h

Log Message:
nasm: Fix build on SunOS.

nasm erroneously concludes that if stdbit.h is present then endian.h shouldn't
be included, breaking hto*() implicit declarations.


To generate a diff of this commit:
cvs rdiff -u -r1.39 -r1.40 pkgsrc/devel/nasm/distinfo
cvs rdiff -u -r1.2 -r1.3 pkgsrc/devel/nasm/patches/patch-include_compiler.h

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

Modified files:

Index: pkgsrc/devel/nasm/distinfo
diff -u pkgsrc/devel/nasm/distinfo:1.39 pkgsrc/devel/nasm/distinfo:1.40
--- pkgsrc/devel/nasm/distinfo:1.39     Sat Nov  8 01:43:44 2025
+++ pkgsrc/devel/nasm/distinfo  Fri Apr 10 09:36:39 2026
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.39 2025/11/08 01:43:44 ryoon Exp $
+$NetBSD: distinfo,v 1.40 2026/04/10 09:36:39 jperkin Exp $
 
 BLAKE2s (nasm-3.01.tar.xz) = 2033aac1add7082357ff032977389f4886d82a1027eb54286e9f5ef239da800b
 SHA512 (nasm-3.01.tar.xz) = ca9550ad3239cfaa9546a908e8de86e11a7c7dd9d6006f42d272d0b025b601cdb205e60b8b3929f31123ef450dd0f0403e1300328cadf0ffdfd459f443944482
 Size (nasm-3.01.tar.xz) = 1499136 bytes
 SHA1 (patch-Makefile.in) = 7c3066b1cd3af540ea39023c53a2f4949d10e68d
 SHA1 (patch-doc_Makefile.in) = b9507bf63f071790ed46293f915bb40d32a31d61
-SHA1 (patch-include_compiler.h) = 99abc011c363263651e0dad6625ca88af6b53c13
+SHA1 (patch-include_compiler.h) = e74758be522c11f3560e6ff3ad5d38cac5727b77

Index: pkgsrc/devel/nasm/patches/patch-include_compiler.h
diff -u pkgsrc/devel/nasm/patches/patch-include_compiler.h:1.2 pkgsrc/devel/nasm/patches/patch-include_compiler.h:1.3
--- pkgsrc/devel/nasm/patches/patch-include_compiler.h:1.2      Sat Nov  8 01:43:44 2025
+++ pkgsrc/devel/nasm/patches/patch-include_compiler.h  Fri Apr 10 09:36:39 2026
@@ -1,10 +1,21 @@
-$NetBSD: patch-include_compiler.h,v 1.2 2025/11/08 01:43:44 ryoon Exp $
+$NetBSD: patch-include_compiler.h,v 1.3 2026/04/10 09:36:39 jperkin Exp $
 
 * For NetBSD, do not use complicated trick. Only for c17 not for c23.
+* Fix SunOS, presence of stdbit.h doesn't mean endian.h shouldn't be included.
 
 --- include/compiler.h.orig    2025-10-11 06:44:05.000000000 +0000
 +++ include/compiler.h
-@@ -183,6 +183,7 @@ char * pure_func strrchrnul(const char *
+@@ -96,6 +96,9 @@
+ #ifdef HAVE_STDBIT_H
+ 
+ # include <stdbit.h>
++#ifdef __sun
++#include <endian.h>
++#endif
+ 
+ # undef WORDS_LITTLEENDIAN
+ # undef WORDS_BIGENDIAN
+@@ -183,6 +186,7 @@ char * pure_func strrchrnul(const char *
  
  #if !defined(__cplusplus) || (__STDC_VERSION >= 202311L)
  /* C++ and C23 have bool, false, and true as proper keywords */
@@ -12,7 +23,7 @@ $NetBSD: patch-include_compiler.h,v 1.2 
  # ifdef HAVE_STDBOOL_H
  /* If <stdbool.h> exists, include it explicitly to prevent it from
     begin included later, causing the "bool" macro to be defined. */
-@@ -209,6 +210,12 @@ typedef enum bool { false, true } bool;
+@@ -209,6 +213,12 @@ typedef enum bool { false, true } bool;
     argument and because bool was redefined as a typedef if it previously
     was defined as a macro (see above.) */
  # define bool(x) ((bool)!!(x))