CaROS/meta-openembedded
3
1
Fork 0
mirror of git://git.openembedded.org/meta-openembedded synced 2026-01-01 13:58:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

yasm: fix build with gcc-15

Browse Source 
* fixes:
libyasm/bitvect.h:86:32: error: cannot use keyword 'false' as enumeration constant
   86 |         typedef enum boolean { false = FALSE, true = TRUE } boolean;
      |                                ^~~~~
libyasm/bitvect.h:86:32: note: 'false' is a keyword with '-std=c23' onwards

as suggested in:
https://github.com/yasm/yasm/issues/283#issuecomment-2661108816

Signed-off-by: Martin Jansa <martin.jansa@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Martin Jansa 2025-04-22 19:57:39 +02:00 committed by Khem Raj
parent 08cf358dc3
commit c6864667a6
No known key found for this signature in database
GPG Key ID: BB053355919D3314
2 changed files with 39 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
meta-oe/recipes-devtools/yasm/yasm/0001-bitvect-fix-build-with-gcc-15.patch Normal file
View File

@ -0,0 +1,38 @@
From 64ef740eb262f329e55eebadf2ce276b146d44e9 Mon Sep 17 00:00:00 2001
From: Martin Jansa <martin.jansa@gmail.com>
Date: Tue, 22 Apr 2025 19:06:24 +0200
Subject: [PATCH] bitvect: fix build with gcc-15
* fixes:
libyasm/bitvect.h:86:32: error: cannot use keyword 'false' as enumeration constant
86 | typedef enum boolean { false = FALSE, true = TRUE } boolean;
| ^~~~~
../git/libyasm/bitvect.h:86:32: note: 'false' is a keyword with '-std=c23' onwards
as suggested in:
https://github.com/yasm/yasm/issues/283#issuecomment-2661108816
Upstream-Status: Submitted [https://github.com/yasm/yasm/pull/287]
Signed-off-by: Martin Jansa <martin.jansa@gmail.com>
---
libyasm/bitvect.h | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/libyasm/bitvect.h b/libyasm/bitvect.h
index 3aee3a53..a13470ad 100644
--- a/libyasm/bitvect.h
+++ b/libyasm/bitvect.h
@@ -83,7 +83,11 @@ typedef Z_longword *Z_longwordptr;
#ifdef MACOS_TRADITIONAL
#define boolean Boolean
#else
- typedef enum boolean { false = FALSE, true = TRUE } boolean;
+ #if __STDC_VERSION__ < 202311L
+ typedef enum boolean { false = FALSE, true = TRUE } boolean;
+ #else
+ typedef bool boolean;
+ #endif
#endif
#endif

1
meta-oe/recipes-devtools/yasm/yasm_git.bb
View File

@ -13,6 +13,7 @@ SRCREV = "121ab150b3577b666c79a79f4a511798d7ad2432"
SRC_URI = "git://github.com/yasm/yasm.git;branch=master;protocol=https \
file://0001-yasm-Set-build-date-to-SOURCE_DATE_EPOCH.patch \
file://0002-yasm-Use-BUILD_DATE-for-reproducibility.patch \
file://0001-bitvect-fix-build-with-gcc-15.patch \
"
S = "${WORKDIR}/git"