* [gentoo-commits] repo/gentoo:master commit in: dev-lang/jwasm/files/, dev-lang/jwasm/
@ 2017-07-04 21:56 Sergei Trofimovich
0 siblings, 0 replies; 4+ messages in thread
From: Sergei Trofimovich @ 2017-07-04 21:56 UTC (permalink / raw
To: gentoo-commits
commit: ccbab3f85b5edc0004ae6c098c34215c36e19bdd
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 4 21:40:33 2017 +0000
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Tue Jul 4 21:56:11 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ccbab3f8
dev-lang/jwasm: drop old
Package-Manager: Portage-2.3.6, Repoman-2.3.2
dev-lang/jwasm/Manifest | 2 -
.../jwasm/files/jwasm-2.10-gcc-4.8-fwdecl.patch | 41 ---------------
dev-lang/jwasm/files/jwasm-2.10-types-test.patch | 60 ----------------------
.../jwasm/files/jwasm-2.10-uint_32-on-amd64.patch | 28 ----------
dev-lang/jwasm/jwasm-2.10-r1.ebuild | 41 ---------------
dev-lang/jwasm/jwasm-2.11.ebuild | 39 --------------
6 files changed, 211 deletions(-)
diff --git a/dev-lang/jwasm/Manifest b/dev-lang/jwasm/Manifest
index 9e7b14f3e3f..851e153f3f1 100644
--- a/dev-lang/jwasm/Manifest
+++ b/dev-lang/jwasm/Manifest
@@ -1,3 +1 @@
-DIST JWasm210s.zip 939008 SHA256 8d9a5ac95fa07a8e935423f3d1e44127c79d873e380f04d1ce8e1a65ca7daafd SHA512 fed6a02e9c58d8c8e4ad83cfd93207c99dc2cc73626188abc2f376465f72dea5ad2ac747b2832cfd8053220b76fdfd58b89d9e484f380c2eb0af2b541f24ca7e WHIRLPOOL 703f860303008cfadd6b42e36aee92e32d5b19af6f70040b083408e43ab5b7bbf83539c5ee96202c6a613ba8640ce2c8e18c465b853e1ac1727e03f30b2b10e8
DIST JWasm211as.zip 1004993 SHA256 6c7b8b4bc576a4e9d50a452f1b3117bb67e6043c34ac971f3cb250d2c2a55ae4 SHA512 3e48e09955ccf8e641b36f54c93c3f36b275a0e662013a17dfd1f52a3e2872eff54be869596d0e72bdb2cc7e59c8fd1dee13477bf89a59bba4b212959cff9006 WHIRLPOOL 2b2bfd100b86dc749e77a0c99d77adf355a76ffbb0fee5464dd57e506c9178338368a3be7240c46a78c66f573ce25c8d7e1d0a4bedd388268b2932af7c5efd85
-DIST JWasm211s.zip 1006791 SHA256 6d5ab10908fbedddf652b2c683e9fdf450caae9741082c1077100308d0879146 SHA512 acbe102b8c6c5d1fdc3ae80944cc3c0fcf287b6ee967b13251ea3e2bcf9547a772c7c658f4f90e8da70b60749add59d5ab321773dc317eac652325b2bd874dd6 WHIRLPOOL e2c28b46aa3d2d53e879f06931fa4ff3d7701541eb4fec7595b7df0c6682ddf72843ba04d072e2d55eb74139041c21a86298a03dad997c8f5b73cbc91958dbc6
diff --git a/dev-lang/jwasm/files/jwasm-2.10-gcc-4.8-fwdecl.patch b/dev-lang/jwasm/files/jwasm-2.10-gcc-4.8-fwdecl.patch
deleted file mode 100644
index 88bbcb94723..00000000000
--- a/dev-lang/jwasm/files/jwasm-2.10-gcc-4.8-fwdecl.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From c2b789403a1ca833bcabada5347bb18d7bd095c2 Mon Sep 17 00:00:00 2001
-From: Sergei Trofimovich <slyfox@gentoo.org>
-Date: Wed, 15 May 2013 22:04:01 +0300
-Subject: [PATCH] fix build failure on gcc-4.8 (missing forward declaration)
-
-Fixes the following build error:
-> gcc -c -IH -D__UNIX__ -DNDEBUG -O2 -o GccUnixR/parser.o parser.c
-> In file included from parser.c:35:0:
-> H/parser.h:305:48: warning: 'struct expr' declared inside parameter list [enabled by default]
-> extern void EmitConstError( const struct expr * );
-> ^
-> H/parser.h:305:48: warning: its scope is only this definition or declaration, which is probably not what you want [enabled by default]
-> parser.c:790:6: error: conflicting types for 'EmitConstError'
-> void EmitConstError( const struct expr *opnd )
-> ^
-> In file included from parser.c:35:0:
-> H/parser.h:305:19: note: previous declaration of 'EmitConstError' was here
-> extern void EmitConstError( const struct expr * );
-> ^
-> make: *** [GccUnixR/parser.o] Error 1
-
-Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
----
- H/parser.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/H/parser.h b/H/parser.h
-index 1744f0d..c2c7b99 100644
---- a/H/parser.h
-+++ b/H/parser.h
-@@ -302,6 +302,7 @@ extern int SizeFromMemtype( enum memtype, int, struct asym * );
- extern ret_code MemtypeFromSize( int, enum memtype * );
- extern int SizeFromRegister( int );
- extern ret_code GetLangType( int *, struct asm_tok[], enum lang_type * );
-+struct expr;
- extern void EmitConstError( const struct expr * );
-
- extern void sym_add_table( struct symbol_queue *, struct dsym * );
---
-1.8.2.1
-
diff --git a/dev-lang/jwasm/files/jwasm-2.10-types-test.patch b/dev-lang/jwasm/files/jwasm-2.10-types-test.patch
deleted file mode 100644
index e57c08afc83..00000000000
--- a/dev-lang/jwasm/files/jwasm-2.10-types-test.patch
+++ /dev/null
@@ -1,60 +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/GccUnix.mak b/GccUnix.mak
-index 567b842..bcb2fef 100644
---- a/GccUnix.mak
-+++ b/GccUnix.mak
-@@ -44,7 +44,7 @@ proj_obj = $(OUTD)/main.o $(OUTD)/assemble.o $(OUTD)/assume.o \
- $(OUTD)/apiemu.o $(OUTD)/dbgcv.o $(OUTD)/end.o \
- $(OUTD)/backptch.o $(OUTD)/msgtext.o $(OUTD)/tbyte.o \
- $(OUTD)/cpumodel.o $(OUTD)/safeseh.o $(OUTD)/cmdline.o \
-- $(OUTD)/fastpass.o
-+ $(OUTD)/fastpass.o $(OUTD)/checks.o
- ######
-
- #.c.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/jwasm-2.10-uint_32-on-amd64.patch b/dev-lang/jwasm/files/jwasm-2.10-uint_32-on-amd64.patch
deleted file mode 100644
index f6100f657fc..00000000000
--- a/dev-lang/jwasm/files/jwasm-2.10-uint_32-on-amd64.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 4399dabdd55fdf9da08c3604c5b3545391c1d44f Mon Sep 17 00:00:00 2001
-From: Sergei Trofimovich <slyfox@gentoo.org>
-Date: Thu, 16 May 2013 12:24:44 +0300
-Subject: [PATCH 2/2] H/inttype.h: make uint_32 be a 32-bit int on x86_64-gcc
-
-Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
----
- H/inttype.h | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/H/inttype.h b/H/inttype.h
-index 7316cbc..af2ef17 100644
---- a/H/inttype.h
-+++ b/H/inttype.h
-@@ -31,6 +31,10 @@
-
- #ifndef _INTTYPE_H_INCLUDED_
- #define _INTTYPE_H_INCLUDED_
-+/* some autoconfiguration */
-+#if defined(__LP64__)
-+# define LONG_IS_64BITS 1
-+#endif /* __LP64__ */
-
- typedef unsigned uint;
-
---
-1.8.2.1
-
diff --git a/dev-lang/jwasm/jwasm-2.10-r1.ebuild b/dev-lang/jwasm/jwasm-2.10-r1.ebuild
deleted file mode 100644
index f6939584b1e..00000000000
--- a/dev-lang/jwasm/jwasm-2.10-r1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils toolchain-funcs versionator
-
-# 2.10 -> 210s
-MY_PN=JWasm
-MY_PV="$(delete_version_separator 1)s"
-MY_P="${MY_PN}${MY_PV}"
-
-DESCRIPTION="MASM-compatible TASM-similar assembler (fork of Wasm)"
-HOMEPAGE="http://www.japheth.de/JWasm.html"
-SRC_URI="http://www.japheth.de/Download/${MY_PN}/${MY_P}.zip"
-LICENSE="Watcom-1.0"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND=""
-DEPEND=""
-
-S="${WORKDIR}"
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-gcc-4.8-fwdecl.patch
- epatch "${FILESDIR}"/${P}-types-test.patch
- epatch "${FILESDIR}"/${P}-uint_32-on-amd64.patch
- # 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
-}
diff --git a/dev-lang/jwasm/jwasm-2.11.ebuild b/dev-lang/jwasm/jwasm-2.11.ebuild
deleted file mode 100644
index fe8874ee00d..00000000000
--- a/dev-lang/jwasm/jwasm-2.11.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils toolchain-funcs versionator
-
-# 2.10 -> 210s
-MY_PN=JWasm
-MY_PV="$(delete_version_separator 1)s"
-MY_P="${MY_PN}${MY_PV}"
-
-DESCRIPTION="MASM-compatible TASM-similar assembler (fork of Wasm)"
-HOMEPAGE="http://www.japheth.de/JWasm.html"
-SRC_URI="http://www.japheth.de/Download/${MY_PN}/${MY_P}.zip"
-LICENSE="Watcom-1.0"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND=""
-DEPEND=""
-
-S="${WORKDIR}"
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-types-test.patch
- # 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
-}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-lang/jwasm/files/, dev-lang/jwasm/
@ 2024-06-11 5:32 Arthur Zamarin
0 siblings, 0 replies; 4+ messages in thread
From: Arthur Zamarin @ 2024-06-11 5:32 UTC (permalink / raw
To: gentoo-commits
commit: 50ec6920ed92ed9fc952d83698ba800faceba728
Author: NRK <nrk <AT> disroot <DOT> org>
AuthorDate: Sun Jun 9 12:08:05 2024 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Tue Jun 11 05:29:51 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=50ec6920
dev-lang/jwasm: fix makefile dependency order
Closes: https://bugs.gentoo.org/881519
Signed-off-by: NRK <nrk <AT> disroot.org>
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
dev-lang/jwasm/files/makefile-dep-fix.patch | 22 ++++++++++++++++++++++
dev-lang/jwasm/jwasm-2.13.ebuild | 7 +++++--
2 files changed, 27 insertions(+), 2 deletions(-)
diff --git a/dev-lang/jwasm/files/makefile-dep-fix.patch b/dev-lang/jwasm/files/makefile-dep-fix.patch
new file mode 100644
index 000000000000..1b97a7c5aca4
--- /dev/null
+++ b/dev-lang/jwasm/files/makefile-dep-fix.patch
@@ -0,0 +1,22 @@
+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
index ecb666549892..0242aa2b604c 100644
--- a/dev-lang/jwasm/jwasm-2.13.ebuild
+++ b/dev-lang/jwasm/jwasm-2.13.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -19,7 +19,10 @@ BDEPEND=""
S="${WORKDIR}/JWasm-${PV}"
-PATCHES=("${FILESDIR}"/${PN}-2.11-types-test.patch)
+PATCHES=(
+ "${FILESDIR}"/${PN}-2.11-types-test.patch
+ "${FILESDIR}/makefile-dep-fix.patch"
+)
src_prepare() {
default
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-lang/jwasm/files/, dev-lang/jwasm/
@ 2024-08-03 11:23 Arthur Zamarin
0 siblings, 0 replies; 4+ messages in thread
From: Arthur Zamarin @ 2024-08-03 11:23 UTC (permalink / raw
To: gentoo-commits
commit: 2023fb28f38eecc3ad2b87532c275c67d58a4879
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 3 11:21:37 2024 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sat Aug 3 11:23:09 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2023fb28
dev-lang/jwasm: add 2.18
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
dev-lang/jwasm/Manifest | 1 +
.../jwasm/files/jwasm-2.18-makefile-dep-fix.patch | 11 +++++
dev-lang/jwasm/files/jwasm-2.18-types-test.patch | 47 ++++++++++++++++++++++
dev-lang/jwasm/jwasm-2.18.ebuild | 36 +++++++++++++++++
4 files changed, 95 insertions(+)
diff --git a/dev-lang/jwasm/Manifest b/dev-lang/jwasm/Manifest
index e2626ac8ea5e..caed04a75758 100644
--- a/dev-lang/jwasm/Manifest
+++ b/dev-lang/jwasm/Manifest
@@ -1 +1,2 @@
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.18-makefile-dep-fix.patch b/dev-lang/jwasm/files/jwasm-2.18-makefile-dep-fix.patch
new file mode 100644
index 000000000000..277216cf18ef
--- /dev/null
+++ b/dev-lang/jwasm/files/jwasm-2.18-makefile-dep-fix.patch
@@ -0,0 +1,11 @@
+--- a/GccUnix.mak
++++ b/GccUnix.mak
+@@ -30,7 +30,7 @@ include gccmod.inc
+
+ #.c.o:
+ # $(CC) -c $(inc_dirs) $(c_flags) -o $(OUTD)/$*.o $<
+-$(OUTD)/%.o: src/%.c
++$(OUTD)/%.o: src/%.c | $(OUTD)
+ $(CC) -c $(inc_dirs) $(c_flags) -o $(OUTD)/$*.o $<
+
+ all: $(OUTD) $(OUTD)/$(TARGET1)
diff --git a/dev-lang/jwasm/files/jwasm-2.18-types-test.patch b/dev-lang/jwasm/files/jwasm-2.18-types-test.patch
new file mode 100644
index 000000000000..37b35208e96f
--- /dev/null
+++ b/dev-lang/jwasm/files/jwasm-2.18-types-test.patch
@@ -0,0 +1,47 @@
+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>
+--- 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 \
+--- /dev/null
++++ b/src/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/jwasm-2.18.ebuild b/dev-lang/jwasm/jwasm-2.18.ebuild
new file mode 100644
index 000000000000..f583e3ffd328
--- /dev/null
+++ b/dev-lang/jwasm/jwasm-2.18.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit 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
+)
+
+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 build/GccUnixR/jwasm
+ dodoc -r README.md History.txt Html/
+}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-lang/jwasm/files/, dev-lang/jwasm/
@ 2025-03-03 12:16 Petr Vaněk
0 siblings, 0 replies; 4+ messages in thread
From: Petr Vaněk @ 2025-03-03 12:16 UTC (permalink / raw
To: gentoo-commits
commit: f1015f45233053c975697981e6078b0dce19e5ba
Author: Petr Vaněk <arkamar <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 3 11:38:37 2025 +0000
Commit: Petr Vaněk <arkamar <AT> gentoo <DOT> org>
CommitDate: Mon Mar 3 12:05:49 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f1015f45
dev-lang/jwasm: GCC 15 fixes
- add missing includes and append -D_POSIX_SOURCE cppflag in order to
resolve implicit function declaration issues
- set -std=c17 because upstream typedefs bool in code base
Upstream-PR: https://github.com/Baron-von-Riedesel/JWasm/pull/34
Closes: https://bugs.gentoo.org/944893
Signed-off-by: Petr Vaněk <arkamar <AT> gentoo.org>
.../jwasm/files/jwasm-2.18-missing-includes.patch | 56 ++++++++++++++++++++++
.../{jwasm-2.18.ebuild => jwasm-2.18-r1.ebuild} | 9 ++--
2 files changed, 62 insertions(+), 3 deletions(-)
diff --git a/dev-lang/jwasm/files/jwasm-2.18-missing-includes.patch b/dev-lang/jwasm/files/jwasm-2.18-missing-includes.patch
new file mode 100644
index 000000000000..08a6aa40ebd2
--- /dev/null
+++ b/dev-lang/jwasm/files/jwasm-2.18-missing-includes.patch
@@ -0,0 +1,56 @@
+From fa8bf4476f74679c1a5e1a4ca55bf5327b4bd558 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Petr=20Van=C4=9Bk?= <arkamar@gentoo.org>
+Date: Mon, 3 Mar 2025 12:16:23 +0100
+Subject: [PATCH] add missing includes
+
+Several includes are missing based on linux man pages:
+
+- strings.h for strcasecmp
+- alloca.h for alloca
+- stdio.h for fileno
+
+The compilation with GCC 15 fails without those with implicit function
+declaration error.
+---
+
+Upstream-PR: https://github.com/Baron-von-Riedesel/JWasm/pull/34
+
+diff --git a/src/H/globals.h b/src/H/globals.h
+index 2992cc7..607e5f5 100644
+--- a/src/H/globals.h
++++ b/src/H/globals.h
+@@ -39,6 +39,7 @@
+
+ #if defined(__UNIX__) || defined(__CYGWIN__) || defined(__DJGPP__) /* avoid for MinGW! */
+
++#include <strings.h>
+ #define _stricmp strcasecmp
+ #ifndef __WATCOMC__
+ #define _memicmp strncasecmp
+diff --git a/src/H/memalloc.h b/src/H/memalloc.h
+index d2a8460..7a4e364 100644
+--- a/src/H/memalloc.h
++++ b/src/H/memalloc.h
+@@ -44,6 +44,7 @@ extern void MemFree( void *ptr );
+
+ #elif defined(__GNUC__) || defined(__TINYC__)
+
++#include <alloca.h>
+ #define myalloca alloca
+ #ifndef __FreeBSD__ /* added v2.08 */
+ #include <malloc.h> /* added v2.07 */
+diff --git a/src/omf.c b/src/omf.c
+index 8d98b1f..d90afae 100644
+--- a/src/omf.c
++++ b/src/omf.c
+@@ -62,6 +62,7 @@
+
+ #if TRUNCATE
+ #if defined(__UNIX__) || defined(__CYGWIN__) || defined(__DJGPP__)
++#include <stdio.h>
+ #include <unistd.h>
+ #else
+ #include <io.h>
+--
+2.45.3
+
diff --git a/dev-lang/jwasm/jwasm-2.18.ebuild b/dev-lang/jwasm/jwasm-2.18-r1.ebuild
similarity index 68%
rename from dev-lang/jwasm/jwasm-2.18.ebuild
rename to dev-lang/jwasm/jwasm-2.18-r1.ebuild
index 465a5756422b..513ad11b1401 100644
--- a/dev-lang/jwasm/jwasm-2.18.ebuild
+++ b/dev-lang/jwasm/jwasm-2.18-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-inherit toolchain-funcs
+inherit flag-o-matic toolchain-funcs
DESCRIPTION="MASM-compatible TASM-similar assembler (fork of Wasm)"
HOMEPAGE="https://github.com/Baron-von-Riedesel/JWasm"
@@ -17,6 +17,7 @@ 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
)
src_prepare() {
@@ -27,7 +28,9 @@ src_prepare() {
}
src_compile() {
- emake -f GccUnix.mak CC="$(tc-getCC) ${CFLAGS} ${LDFLAGS}"
+ # -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) ${CFLAGS} -D_POSIX_C_SOURCE=200809L ${LDFLAGS}"
}
src_install() {
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2025-03-03 12:16 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-03-03 12:16 [gentoo-commits] repo/gentoo:master commit in: dev-lang/jwasm/files/, dev-lang/jwasm/ Petr Vaněk
-- strict thread matches above, loose matches on Subject: below --
2024-08-03 11:23 Arthur Zamarin
2024-06-11 5:32 Arthur Zamarin
2017-07-04 21:56 Sergei Trofimovich
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox