CVS commit: pkgsrc/devel/nasm

["Ryo ONODERA" <ryoon%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   ryoon
Date:           Sat Nov  8 01:43:44 UTC 2025

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

Log Message:
devel/nasm: Fix build under NetBSD 10

The previous patch is for c23 and it does not work for c17.
Force c17 use and update the patch for c17.


To generate a diff of this commit:
cvs rdiff -u -r1.71 -r1.72 pkgsrc/devel/nasm/Makefile
cvs rdiff -u -r1.38 -r1.39 pkgsrc/devel/nasm/distinfo
cvs rdiff -u -r1.1 -r1.2 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/Makefile
diff -u pkgsrc/devel/nasm/Makefile:1.71 pkgsrc/devel/nasm/Makefile:1.72
--- pkgsrc/devel/nasm/Makefile:1.71     Fri Nov  7 22:10:31 2025
+++ pkgsrc/devel/nasm/Makefile  Sat Nov  8 01:43:44 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.71 2025/11/07 22:10:31 ryoon Exp $
+# $NetBSD: Makefile,v 1.72 2025/11/08 01:43:44 ryoon Exp $
 
 DISTNAME=      nasm-3.01
 CATEGORIES=    devel lang
@@ -10,6 +10,10 @@ HOMEPAGE=    https://www.nasm.us/
 COMMENT=       General-purpose x86 assembler
 LICENSE=       2-clause-bsd
 
+USE_LANGUAGE=          c
+USE_CC_FEATURES=       c17
+FORCE_C_STD=           c17
+
 USE_TOOLS+=            gmake makeinfo perl
 GNU_CONFIGURE=         yes
 CONFIGURE_ARGS+=       --docdir=${PREFIX}/share/doc/nasm

Index: pkgsrc/devel/nasm/distinfo
diff -u pkgsrc/devel/nasm/distinfo:1.38 pkgsrc/devel/nasm/distinfo:1.39
--- pkgsrc/devel/nasm/distinfo:1.38     Fri Nov  7 22:10:31 2025
+++ pkgsrc/devel/nasm/distinfo  Sat Nov  8 01:43:44 2025
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.38 2025/11/07 22:10:31 ryoon Exp $
+$NetBSD: distinfo,v 1.39 2025/11/08 01:43:44 ryoon 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) = ab9f0b45e4eff19c13fc362c217052ec6f86fa90
+SHA1 (patch-include_compiler.h) = 99abc011c363263651e0dad6625ca88af6b53c13

Index: pkgsrc/devel/nasm/patches/patch-include_compiler.h
diff -u pkgsrc/devel/nasm/patches/patch-include_compiler.h:1.1 pkgsrc/devel/nasm/patches/patch-include_compiler.h:1.2
--- pkgsrc/devel/nasm/patches/patch-include_compiler.h:1.1      Fri Nov  7 22:10:31 2025
+++ pkgsrc/devel/nasm/patches/patch-include_compiler.h  Sat Nov  8 01:43:44 2025
@@ -1,6 +1,6 @@
-$NetBSD: patch-include_compiler.h,v 1.1 2025/11/07 22:10:31 ryoon Exp $
+$NetBSD: patch-include_compiler.h,v 1.2 2025/11/08 01:43:44 ryoon Exp $
 
-* For NetBSD, do not use complicated trick.
+* For NetBSD, do not use complicated trick. Only for c17 not for c23.
 
 --- include/compiler.h.orig    2025-10-11 06:44:05.000000000 +0000
 +++ include/compiler.h
@@ -12,7 +12,7 @@ $NetBSD: patch-include_compiler.h,v 1.1 
  # 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,11 @@ typedef enum bool { false, true } bool;
+@@ -209,6 +210,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))
@@ -20,6 +20,7 @@ $NetBSD: patch-include_compiler.h,v 1.1 
 +#include <stdbool.h>
 +#undef bool
 +#define bool(x) ((bool)!!(x))
++typedef _Bool bool;
 +#endif
  #endif