sm-commit AT lists.ibiblio.org
Subject: Source Mage code commit list
List archive
[[SM-Commit] ] GIT changes to master grimoire by Pavel Vinogradov (3f39cbee14ee68db2ada7369b79fcd11b47fdab9)
- From: Pavel Vinogradov <scm AT sourcemage.org>
- To: sm-commit AT lists.ibiblio.org, sm-commit AT lists.sourcemage.org
- Subject: [[SM-Commit] ] GIT changes to master grimoire by Pavel Vinogradov (3f39cbee14ee68db2ada7369b79fcd11b47fdab9)
- Date: Fri, 3 Jul 2026 03:09:03 +0000
GIT changes to master grimoire by Pavel Vinogradov <public AT sourcemage.org>:
devel/nasm/DETAILS
| 4
devel/nasm/HISTORY
| 6
devel/nasm/PRE_BUILD
| 3
devel/nasm/patches/0001-compiler.h-drop-the-stupid-C-style-cast-to-bool-hack.patch
| 77 ----------
devel/nasm/patches/0002-compiler.h-the-test-for-neither-C-nor-C23-still-wrong.patch
| 26 ---
5 files changed, 8 insertions(+), 108 deletions(-)
New commits:
commit 3f39cbee14ee68db2ada7369b79fcd11b47fdab9
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>
devel/nasm: version 3.02
diff --git a/devel/nasm/DETAILS b/devel/nasm/DETAILS
index 1a40c3a..189faa0 100755
--- a/devel/nasm/DETAILS
+++ b/devel/nasm/DETAILS
@@ -1,7 +1,7 @@
# Watch: https://nasm.us/ /nasm/releasebuilds/([0-9.]+)"
SPELL=nasm
- VERSION=3.01
-
SOURCE_HASH=sha512:ca9550ad3239cfaa9546a908e8de86e11a7c7dd9d6006f42d272d0b025b601cdb205e60b8b3929f31123ef450dd0f0403e1300328cadf0ffdfd459f443944482
+ VERSION=3.02
+
SOURCE_HASH=sha512:dc80d8a9a582423e62703da3cc3f37ee57735939b975faa8a72d061a8b596f763d206c7cc3e48c32d2ad726f38e430dc3b85cffd0c3b32e71e20ad9cc24f4804
SECURITY_PATCH=1
SOURCE=$SPELL-$VERSION.tar.xz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/devel/nasm/HISTORY b/devel/nasm/HISTORY
index a8d3417..d2288a2 100644
--- a/devel/nasm/HISTORY
+++ b/devel/nasm/HISTORY
@@ -1,3 +1,9 @@
+2026-07-02 Pavel Vinogradov <public AT sourcemage.org>
+ * DETAILS: version 3.02
+ *
patches/0001-compiler.h-drop-the-stupid-C-style-cast-to-bool-hack.patch,
+
patches/0002-compiler.h-the-test-for-neither-C-nor-C23-still-wrong.patch,
+ PRE_BUILD: removed, applied in upstream
+
2025-11-23 Ismael Luceno <ismael AT sourcemage.org>
*
patches/0001-compiler.h-drop-the-stupid-C-style-cast-to-bool-hack.patch,
patches/0002-compiler.h-the-test-for-neither-C-nor-C23-still-wrong.patch,
diff --git a/devel/nasm/PRE_BUILD b/devel/nasm/PRE_BUILD
deleted file mode 100755
index c230ad1..0000000
--- a/devel/nasm/PRE_BUILD
+++ /dev/null
@@ -1,3 +0,0 @@
-default_pre_build &&
-cd "$SOURCE_DIRECTORY" &&
-apply_patch_dir patches
diff --git
a/devel/nasm/patches/0001-compiler.h-drop-the-stupid-C-style-cast-to-bool-hack.patch
b/devel/nasm/patches/0001-compiler.h-drop-the-stupid-C-style-cast-to-bool-hack.patch
deleted file mode 100644
index fa43537..0000000
---
a/devel/nasm/patches/0001-compiler.h-drop-the-stupid-C-style-cast-to-bool-hack.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-From 44e89ba9b650b5e1533bca43682e167f51a3511f Mon Sep 17 00:00:00 2001
-From: "H. Peter Anvin (Intel)" <hpa AT zytor.com>
-Date: Sun, 12 Oct 2025 12:48:32 -0700
-Subject: [PATCH 1/2] compiler.h: drop the stupid C++-style cast-to-bool hack
-
-The C++-style cast-to-bool hack was broken in concept that it doesn't help
the
-fundamental problem -- implicit conversions are broken for the
-backwards compatibility enum definition -- as well as in
-implementation, as it misspelled __STDC_VERSION__ as __STDC_VERSION.
-
-The #ifdef bool test *should* have prevented this problem, but
-apparently several compilers do define "bool" in <stdbool.h> even when
-it is a keyword, in violation of the C23 spec.
-
-Signed-off-by: H. Peter Anvin (Intel) <hpa AT zytor.com>
----
- include/compiler.h | 27 +++++++--------------------
- 1 file changed, 7 insertions(+), 20 deletions(-)
-
-diff --git a/include/compiler.h b/include/compiler.h
-index 0ecd4e8d..53a9b5c1 100644
---- a/include/compiler.h
-+++ b/include/compiler.h
-@@ -181,19 +181,10 @@ size_t strlcpy(char *, const char *, size_t);
- char * pure_func strrchrnul(const char *, int);
- #endif
-
--#if !defined(__cplusplus) || (__STDC_VERSION >= 202311L)
- /* C++ and C23 have bool, false, and true as proper keywords */
-+#if !defined(__cplusplus) || (__STDC_VERSION__ >= 202311L)
- # 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. */
- # include <stdbool.h>
--# ifdef bool
--/* Force bool to be a typedef instead of a macro. What a "clever" hack
-- this is... */
-- typedef bool /* The macro definition of bool */
--# undef bool
-- bool; /* No longer the macro definition */
--# endif
- # elif defined(HAVE___BOOL)
- typedef _Bool bool;
- # define false 0
-@@ -201,14 +192,10 @@ char * pure_func strrchrnul(const char *, int);
- # else
- /* This is a bit dangerous, because casting to this ersatz bool
- will not produce the same result as the standard (bool) cast.
-- Instead, use the bool() constructor-style macro defined below. */
-+ Instead, use the explicit construct !!x instead of relying on
-+ implicit conversions or casts. */
- typedef enum bool { false, true } bool;
- # endif
--/* This amounts to a C++-style conversion cast to bool. This works
-- because C ignores an argument-taking macro when used without an
-- argument and because bool was redefined as a typedef if it previously
-- was defined as a macro (see above.) */
--# define bool(x) ((bool)!!(x))
- #endif
-
- /* Create a NULL pointer of the same type as the address of
-@@ -321,11 +308,11 @@ static inline void *mempset(void *dst, int c, size_t n)
- * less likely to be taken.
- */
- #ifdef HAVE___BUILTIN_EXPECT
--# define likely(x) __builtin_expect(bool(x), true)
--# define unlikely(x) __builtin_expect(bool(x), false)
-+# define likely(x) __builtin_expect(!!(x), true)
-+# define unlikely(x) __builtin_expect(!!(x), false)
- #else
--# define likely(x) bool(x)
--# define unlikely(x) bool(x)
-+# define likely(x) (!!(x))
-+# define unlikely(x) (!!(x))
- #endif
-
- #ifdef HAVE___BUILTIN_PREFETCH
diff --git
a/devel/nasm/patches/0002-compiler.h-the-test-for-neither-C-nor-C23-still-wrong.patch
b/devel/nasm/patches/0002-compiler.h-the-test-for-neither-C-nor-C23-still-wrong.patch
deleted file mode 100644
index b410643c..0000000
---
a/devel/nasm/patches/0002-compiler.h-the-test-for-neither-C-nor-C23-still-wrong.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 746e7c9efa37cec9a44d84a1e96b8c38f385cc1f Mon Sep 17 00:00:00 2001
-From: "H. Peter Anvin (Intel)" <hpa AT zytor.com>
-Date: Sun, 12 Oct 2025 13:05:55 -0700
-Subject: [PATCH 2/2] compiler.h: the test for "neither C++ nor C23" still
wrong
-
-The test needs to test for neither nor; as it was it tested "(not C++)
-or C23" which was not at all what was intended...
-
-Signed-off-by: H. Peter Anvin (Intel) <hpa AT zytor.com>
----
- include/compiler.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/include/compiler.h b/include/compiler.h
-index 53a9b5c1..d4cb7161 100644
---- a/include/compiler.h
-+++ b/include/compiler.h
-@@ -182,7 +182,7 @@ char * pure_func strrchrnul(const char *, int);
- #endif
-
- /* C++ and C23 have bool, false, and true as proper keywords */
--#if !defined(__cplusplus) || (__STDC_VERSION__ >= 202311L)
-+#if !defined(__cplusplus) && (__STDC_VERSION__ < 202311L)
- # ifdef HAVE_STDBOOL_H
- # include <stdbool.h>
- # elif defined(HAVE___BOOL)
- [[SM-Commit] ] GIT changes to master grimoire by Pavel Vinogradov (3f39cbee14ee68db2ada7369b79fcd11b47fdab9), Pavel Vinogradov, 07/02/2026
Archive powered by MHonArc 2.6.24.