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

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

[Petr Vaněk]

commit:     584f2aa3e45b9a99bb766481ca13a564e34b4499
Author:     Petr Vaněk <arkamar <AT> gentoo <DOT> org>
AuthorDate: Mon Mar  3 12:00:10 2025 +0000
Commit:     Petr Vaněk <arkamar <AT> gentoo <DOT> org>
CommitDate: Mon Mar  3 12:05:51 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=584f2aa3

dev-lang/jwasm: add 2.19

This ebuild version newly fully respects CFLAGS and LDFLAGS.

Signed-off-by: Petr Vaněk <arkamar <AT> gentoo.org>

 dev-lang/jwasm/Manifest                            |  1 +
 .../jwasm/files/jwasm-2.19-respect-ldflags.patch   | 29 +++++++++++++++++++
 dev-lang/jwasm/jwasm-2.19.ebuild                   | 33 ++++++++++++++++++++++
 3 files changed, 63 insertions(+)

diff --git a/dev-lang/jwasm/Manifest b/dev-lang/jwasm/Manifest
index e694b093fe62..db8f525d3d74 100644
--- a/dev-lang/jwasm/Manifest
+++ b/dev-lang/jwasm/Manifest
@@ -1 +1,2 @@
 DIST jwasm-2.18.tar.gz 1169949 BLAKE2B 2a5d6c37f27dd5193390a5b5ab7d7ec260a800ead132dda4a49b16b5ae43b53ef397b663166767c8f4ce2de69dd9fa61e59e0537d837ba85da38cb17aa0da6e0 SHA512 f5ca9d2ec80b979e2acec7246861e13e11717917f59df126f28339e3c1ded3405c8a93daaef6ee817bc217d593151010bf18c85c9fc03600ff70cb18e793309c
+DIST jwasm-2.19.tar.gz 1187558 BLAKE2B ab932d61fddcb8b422ae8b4be43bc4d7b8a3b229b4f720768c69d41302b47d1fe1cf1d2761838f97ac4241a7e5cf2ca3f8f23cc4636365caca38e3c66a38924f SHA512 0b017f0f43d36a74faab2bc2da4023cc933f3b0c81eb65c59a98d0dedee20eaf6a5979943c387f39e34a188b5a7ec787e8effc61d1e70635b795e106e52399d0

diff --git a/dev-lang/jwasm/files/jwasm-2.19-respect-ldflags.patch b/dev-lang/jwasm/files/jwasm-2.19-respect-ldflags.patch
new file mode 100644
index 000000000000..5c4c2d0f7411
--- /dev/null
+++ b/dev-lang/jwasm/files/jwasm-2.19-respect-ldflags.patch
@@ -0,0 +1,29 @@
+From 5521f0dd6da40cc2a0325f0b2136fa066345328f Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Petr=20Van=C4=9Bk?= <arkamar@gentoo.org>
+Date: Mon, 3 Mar 2025 12:53:38 +0100
+Subject: [PATCH] respect LDFLAGS
+
+---
+ GccUnix.mak | 6 +-----
+ 1 file changed, 1 insertion(+), 5 deletions(-)
+
+diff --git a/GccUnix.mak b/GccUnix.mak
+index 5afdce2..588b155 100644
+--- a/GccUnix.mak
++++ b/GccUnix.mak
+@@ -39,11 +39,7 @@ $(OUTD):
+ 	mkdir -p $(OUTD)
+ 
+ $(OUTD)/$(TARGET1) : $(OUTD)/main.o $(proj_obj)
+-ifeq ($(DEBUG),0)
+-	$(CC) $(OUTD)/main.o $(proj_obj) -s -o $@ -Wl,-Map,$(OUTD)/$(TARGET1).map
+-else
+-	$(CC) $(OUTD)/main.o $(proj_obj) -o $@ -Wl,-Map,$(OUTD)/$(TARGET1).map
+-endif
++	$(CC) $(LDFLAGS) $(OUTD)/main.o $(proj_obj) -o $@ -Wl,-Map,$(OUTD)/$(TARGET1).map
+ 
+ $(OUTD)/msgtext.o: src/msgtext.c src/H/msgdef.h
+ 	$(CC) -c $(inc_dirs) $(c_flags) -o $*.o src/msgtext.c
+-- 
+2.45.3
+

diff --git a/dev-lang/jwasm/jwasm-2.19.ebuild b/dev-lang/jwasm/jwasm-2.19.ebuild
new file mode 100644
index 000000000000..817473af0ee0
--- /dev/null
+++ b/dev-lang/jwasm/jwasm-2.19.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="MASM-compatible TASM-similar assembler (fork of Wasm)"
+HOMEPAGE="https://github.com/Baron-von-Riedesel/JWasm"
+SRC_URI="https://github.com/Baron-von-Riedesel/JWasm/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/JWasm-${PV}"
+
+LICENSE="Watcom-1.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.18-types-test.patch
+	"${FILESDIR}"/${PN}-2.18-makefile-dep-fix.patch
+	"${FILESDIR}"/${PN}-2.18-missing-includes.patch #944893
+	"${FILESDIR}"/${PN}-2.19-respect-ldflags.patch
+)
+
+src_compile() {
+	# -std=c17 and -D_POSIX_C_SOURCE=200809L are both related to bug #944893
+	append-cflags -std=c17
+	emake -f GccUnix.mak CC="$(tc-getCC)" extra_c_flags="-D_POSIX_C_SOURCE=200809L ${CFLAGS}"
+}
+
+src_install() {
+	dobin build/GccUnixR/jwasm
+	dodoc -r README.md History.txt Html/
+}

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

[Petr Vaněk]

commit:     b02b71d3cc17c6766720bc5076d93cd65b8e5001
Author:     Petr Vaněk <arkamar <AT> gentoo <DOT> org>
AuthorDate: Mon Mar  3 11:44:41 2025 +0000
Commit:     Petr Vaněk <arkamar <AT> gentoo <DOT> org>
CommitDate: Mon Mar  3 12:05:50 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b02b71d3

dev-lang/jwasm: drop 2.13

Signed-off-by: Petr Vaněk <arkamar <AT> gentoo.org>

 dev-lang/jwasm/Manifest                          |  1 -
 dev-lang/jwasm/files/jwasm-2.11-types-test.patch | 58 ------------------------
 dev-lang/jwasm/files/makefile-dep-fix.patch      | 22 ---------
 dev-lang/jwasm/jwasm-2.13.ebuild                 | 41 -----------------
 4 files changed, 122 deletions(-)

diff --git a/dev-lang/jwasm/Manifest b/dev-lang/jwasm/Manifest
index caed04a75758..e694b093fe62 100644
--- a/dev-lang/jwasm/Manifest
+++ b/dev-lang/jwasm/Manifest
@@ -1,2 +1 @@
-DIST jwasm-2.13.tar.gz 578365 BLAKE2B 8c6fbe3e6cb56c0fe8135c30c629534d2b6e2a2ed534249834e0e2674bf6635cb15ab94d4fa05c5378cb0db8569ddc3ba49d2d7c9615b7ddb769cba1a2d5b715 SHA512 03f80f4a74b39c6093f5cd5334364f7458836a52ad01279c95683e7053cb4211c40235e16f6f2ee40bc7316dcd8a4fbcb57bf3606d31249d96d01933a8aa0563
 DIST jwasm-2.18.tar.gz 1169949 BLAKE2B 2a5d6c37f27dd5193390a5b5ab7d7ec260a800ead132dda4a49b16b5ae43b53ef397b663166767c8f4ce2de69dd9fa61e59e0537d837ba85da38cb17aa0da6e0 SHA512 f5ca9d2ec80b979e2acec7246861e13e11717917f59df126f28339e3c1ded3405c8a93daaef6ee817bc217d593151010bf18c85c9fc03600ff70cb18e793309c

diff --git a/dev-lang/jwasm/files/jwasm-2.11-types-test.patch b/dev-lang/jwasm/files/jwasm-2.11-types-test.patch
deleted file mode 100644
index 047d1d005510..000000000000
--- a/dev-lang/jwasm/files/jwasm-2.11-types-test.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From b19339d4356efbd9b49f73e67ed7c09b9dad4b75 Mon Sep 17 00:00:00 2001
-From: Sergei Trofimovich <slyfox@gentoo.org>
-Date: Thu, 16 May 2013 12:24:17 +0300
-Subject: [PATCH 1/2] types: add sanity tests for used sizes
-
-Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
----
- GccUnix.mak |  2 +-
- checks.c    | 26 ++++++++++++++++++++++++++
- 2 files changed, 27 insertions(+), 1 deletion(-)
- create mode 100644 checks.c
-
-diff --git a/gccmod.inc b/gccmod.inc
-index 70f388a..86cb2bf 100644
---- a/gccmod.inc
-+++ b/gccmod.inc
-@@ -6,6 +6,7 @@ $(OUTD)/atofloat.o \
- $(OUTD)/backptch.o \
- $(OUTD)/bin.o      \
- $(OUTD)/branch.o   \
-+$(OUTD)/checks.o   \
- $(OUTD)/cmdline.o  \
- $(OUTD)/codegen.o  \
- $(OUTD)/coff.o     \
-diff --git a/checks.c b/checks.c
-new file mode 100644
-index 0000000..af8630f
---- /dev/null
-+++ b/checks.c
-@@ -0,0 +1,26 @@
-+/****************************************************************************
-+*
-+*  This code is Public Domain.
-+*
-+*  ========================================================================
-+*
-+* Description:  make sure "inttype.h" filelds are of the desired size.
-+*
-+****************************************************************************/
-+
-+#include "inttype.h"
-+
-+/* fails to compile if type sizes are of unexpected size */
-+static void validate_inttype_sizes()
-+{
-+/* try to create */
-+#define T_IS_SIZE(__type, __expected_size, __test_name) \
-+    char __test_name[2 * (sizeof (__type) == (__expected_size)) - 1];
-+
-+    T_IS_SIZE(uint_8,  1, size_of_uint_8_must_be_1_byte);
-+    T_IS_SIZE(uint_16, 2, size_of_uint_16_must_be_2_bytes);
-+    T_IS_SIZE(uint_32, 4, size_of_uint_32_must_be_4_bytes);
-+    T_IS_SIZE(uint_64, 8, size_of_uint_64_must_be_8_bytes);
-+
-+#undef T_IS_SIZE
-+}
--- 
-1.8.2.1

diff --git a/dev-lang/jwasm/files/makefile-dep-fix.patch b/dev-lang/jwasm/files/makefile-dep-fix.patch
deleted file mode 100644
index 1b97a7c5aca4..000000000000
--- a/dev-lang/jwasm/files/makefile-dep-fix.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Bug: https://bugs.gentoo.org/881519
-
-diff --git a/GccUnix.mak b/GccUnix.mak
-index 3f53d5b..8eb434e 100644
---- a/GccUnix.mak
-+++ b/GccUnix.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) -c $(inc_dirs) $(c_flags) -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/jwasm/jwasm-2.13.ebuild b/dev-lang/jwasm/jwasm-2.13.ebuild
deleted file mode 100644
index 2cac391deb8d..000000000000
--- a/dev-lang/jwasm/jwasm-2.13.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="MASM-compatible TASM-similar assembler (fork of Wasm)"
-HOMEPAGE="https://github.com/JWasm/JWasm"
-SRC_URI="https://github.com/JWasm/JWasm/archive/${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="Watcom-1.0"
-
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-
-RDEPEND=""
-DEPEND=""
-BDEPEND=""
-
-S="${WORKDIR}/JWasm-${PV}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.11-types-test.patch
-	"${FILESDIR}/makefile-dep-fix.patch"
-)
-
-src_prepare() {
-	default
-
-	# don't strip binary
-	sed -i GccUnix.mak -e 's/ -s / /g' || die
-}
-
-src_compile() {
-	emake -f GccUnix.mak CC="$(tc-getCC) ${CFLAGS} ${LDFLAGS}"
-}
-
-src_install() {
-	dobin GccUnixR/jwasm
-	dodoc *.txt Doc/*.txt
-}