[gentoo-commits] repo/gentoo:master commit in: dev-lang/uasm/files/, dev-lang/uasm/

[gentoo-commits] repo/gentoo:master commit in: dev-lang/uasm/files/, dev-lang/uasm/

[Arthur Zamarin]

commit:     d77f855326c6b9cd1e12fd3bcd9a9f52db127115
Author:     NRK <nrk <AT> disroot <DOT> org>
AuthorDate: Sun Jun  9 11:18:16 2024 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Tue Jun 11 05:29:50 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d77f8553

dev-lang/uasm: fix makefile dependency order

Closes: https://bugs.gentoo.org/933867
Signed-off-by: NRK <nrk <AT> disroot.org>
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 dev-lang/uasm/files/makefile-dep-fix.patch | 22 ++++++++++++++++++++++
 dev-lang/uasm/uasm-2.56.2.ebuild           |  1 +
 2 files changed, 23 insertions(+)

diff --git a/dev-lang/uasm/files/makefile-dep-fix.patch b/dev-lang/uasm/files/makefile-dep-fix.patch
new file mode 100644
index 000000000000..66b5ab3d5293
--- /dev/null
+++ b/dev-lang/uasm/files/makefile-dep-fix.patch
@@ -0,0 +1,22 @@
+Bug: https://bugs.gentoo.org/933867
+
+diff --git a/gccLinux64.mak b/gccLinux64.mak
+index 9d4431a..e4fb10f 100644
+--- a/gccLinux64.mak
++++ b/gccLinux64.mak
+@@ -31,13 +31,13 @@ include gccmod.inc
+ 
+ #.c.o:
+ #	$(CC) -c $(inc_dirs) $(c_flags) -o $(OUTD)/$*.o $<
+-$(OUTD)/%.o: %.c
++$(OUTD)/%.o: %.c | $(OUTD)
+ 	$(CC) -D __UNIX__ -c $(inc_dirs) $(c_flags) $(CFLAGS) $(CPPFLAGS) -o $(OUTD)/$*.o $<
+ 
+ all:  $(OUTD) $(OUTD)/$(TARGET1)
+ 
+ $(OUTD):
+-	mkdir $(OUTD)
++	mkdir -p $(OUTD)
+ 
+ $(OUTD)/$(TARGET1) : $(OUTD)/main.o $(proj_obj)
+ ifeq ($(DEBUG),0)

diff --git a/dev-lang/uasm/uasm-2.56.2.ebuild b/dev-lang/uasm/uasm-2.56.2.ebuild
index 8210588c135e..3d96057ef673 100644
--- a/dev-lang/uasm/uasm-2.56.2.ebuild
+++ b/dev-lang/uasm/uasm-2.56.2.ebuild
@@ -15,6 +15,7 @@ SLOT="0"
 KEYWORDS="~amd64"
 PATCHES=(
 	"${FILESDIR}/build-fix.patch"
+	"${FILESDIR}/makefile-dep-fix.patch"
 )
 
 src_prepare() {

[gentoo-commits] repo/gentoo:master commit in: dev-lang/uasm/files/, dev-lang/uasm/

[Sam James]

commit:     f1ad5f3ab6fec658da13c94151de756ccc6373be
Author:     NRK <nrk <AT> disroot <DOT> org>
AuthorDate: Sat Mar  8 20:52:10 2025 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Mar 10 00:21:24 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f1ad5f3a

dev-lang/uasm: replace custom bool with stdbool.h

Closes: https://bugs.gentoo.org/944192
Signed-off-by: NRK <nrk <AT> disroot.org>
Closes: https://github.com/gentoo/gentoo/pull/40969
Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-lang/uasm/files/bool-fix.diff | 18 ++++++++++++++++++
 dev-lang/uasm/uasm-2.56.2.ebuild  |  3 ++-
 dev-lang/uasm/uasm-2.57.ebuild    |  1 +
 3 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/dev-lang/uasm/files/bool-fix.diff b/dev-lang/uasm/files/bool-fix.diff
new file mode 100644
index 000000000000..6071a0d42ba9
--- /dev/null
+++ b/dev-lang/uasm/files/bool-fix.diff
@@ -0,0 +1,18 @@
+https://bugs.gentoo.org/944192
+
+diff --git a/H/bool.h b/H/bool.h
+index fbf55c8..ddb7396 100644
+--- a/H/bool.h
++++ b/H/bool.h
+@@ -30,10 +30,7 @@
+ ****************************************************************************/
+ 
+ 
+-#if !defined( BOOL_DEFINED )  &&  !defined( bool ) && !(__WATCOMC__ >= 1070 && defined(__cplusplus))
+-    #define BOOL_DEFINED
+-    typedef unsigned char bool;
+-#endif
++#include <stdbool.h>
+ #ifndef TRUE
+     #define TRUE 1
+ #endif

diff --git a/dev-lang/uasm/uasm-2.56.2.ebuild b/dev-lang/uasm/uasm-2.56.2.ebuild
index 5a0d38620ed2..71f4e7f3518f 100644
--- a/dev-lang/uasm/uasm-2.56.2.ebuild
+++ b/dev-lang/uasm/uasm-2.56.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2024 Gentoo Authors
+# Copyright 2024-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -16,6 +16,7 @@ KEYWORDS="amd64"
 PATCHES=(
 	"${FILESDIR}/build-fix.patch"
 	"${FILESDIR}/makefile-dep-fix.patch"
+	"${FILESDIR}/bool-fix.diff"
 )
 
 src_prepare() {

diff --git a/dev-lang/uasm/uasm-2.57.ebuild b/dev-lang/uasm/uasm-2.57.ebuild
index bb8e70dfc0ff..4aff172e02f6 100644
--- a/dev-lang/uasm/uasm-2.57.ebuild
+++ b/dev-lang/uasm/uasm-2.57.ebuild
@@ -17,6 +17,7 @@ KEYWORDS="~amd64"
 PATCHES=(
 	"${FILESDIR}/build-fix.patch"
 	"${FILESDIR}/makefile-dep-fix-2.57.patch"
+	"${FILESDIR}/bool-fix.diff"
 )
 
 src_prepare() {