[gentoo-commits] repo/gentoo:master commit in: app-emulation/dlx/, app-emulation/dlx/files/
commit: a1ddda5fc214f17bf6818cdb60ffcfc0789b46ea
Author: Pascal Jäger leimstift de>
AuthorDate: Sat Dec 10 12:30:34 2022 +
Commit: Sam James gentoo org>
CommitDate: Fri Dec 16 05:10:24 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a1ddda5f
app-emulation/dlx: revbump, fix build for clang16, fix lto
- fix implicit function declaration
- fix lto type mismatch
Closes: https://bugs.gentoo.org/874933
Closes: https://bugs.gentoo.org/854513
Signed-off-by: Pascal Jäger leimstift.de>
Closes: https://github.com/gentoo/gentoo/pull/28626
Signed-off-by: Sam James gentoo.org>
app-emulation/dlx/dlx-1.5.20-r1.ebuild | 34
...1.5.20-fix-implicit-function-declarations.patch | 102 +++
.../files/dlx-1.5.20-fix-lto-type-mismatch.patch | 193 +
3 files changed, 329 insertions(+)
diff --git a/app-emulation/dlx/dlx-1.5.20-r1.ebuild
b/app-emulation/dlx/dlx-1.5.20-r1.ebuild
new file mode 100644
index ..138eb0ed9f0d
--- /dev/null
+++ b/app-emulation/dlx/dlx-1.5.20-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="DLX Simulator"
+HOMEPAGE="https://www.davidviner.com/dlx;
+SRC_URI="https://www.davidviner.com/zip/dlx/dlx.zip -> ${P}.zip"
+S="${WORKDIR}"/dlx
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+BDEPEND="app-arch/unzip"
+
+PATCHES=(
+ "${FILESDIR}/${P}-fix-implicit-function-declarations.patch"
+ "${FILESDIR}/${P}-fix-lto-type-mismatch.patch"
+)
+
+src_compile() {
+ # CXX not used
+ emake CC="$(tc-getCC)" LINK="$(tc-getCC)" \
+ CFLAGS="${CFLAGS} ${CPPFLAGS}" \
+ LFLAGS="${CFLAGS} ${LDFLAGS}"
+}
+
+src_install() {
+ dobin masm mon dasm
+ dodoc README.txt MANUAL.TXT
+}
diff --git
a/app-emulation/dlx/files/dlx-1.5.20-fix-implicit-function-declarations.patch
b/app-emulation/dlx/files/dlx-1.5.20-fix-implicit-function-declarations.patch
new file mode 100644
index ..6bd0b4aff69a
--- /dev/null
+++
b/app-emulation/dlx/files/dlx-1.5.20-fix-implicit-function-declarations.patch
@@ -0,0 +1,102 @@
+Date: Sat, 10 Dec 2022 13:25:28 +0100
+Subject: [PATCH] fix implicit function declarations
+
+By default clang16 will not allow implicit function declarations.
+This patch overhauls the whole source code to fix that.
+
+Bug: https://bugs.gentoo.org/874933
+This patch has been sent upstream via mail.
+
+Pascal Jaeger (2022-12-10)
+
+--- a/cpu.h
b/cpu.h
+@@ -573,4 +573,4 @@ extern struct DecodeTables DecodeT [128];
+
+
/
+
+-
++VOID DoMcLoad (STRPTR Cmd);
+--- a/dsym.c
b/dsym.c
+@@ -19,6 +19,7 @@
+
+ SymTab SymBase = (SymTab) NULL;
+
++extern VOID Error (STRPTR Msg, BOOL PrintLine);
+ BOOLDoTitle;
+
+
/
+--- a/dsym.h
b/dsym.h
+@@ -38,6 +38,7 @@ extern SymTab AddSymbol (STRPTR Sym, ULONG Val, BOOL
SetUp);
+ extern VOID DeleteSymbolTable ();
+ extern VOID DisplaySymbolTable (BOOL NotFound);
+ extern SymTab FindSymbol (STRPTR Sym);
++extern VOID CopyMacro (SymTab S);
+
+
/
+
+--- a/io.c
b/io.c
+@@ -14,6 +14,8 @@
+
+ #include "cpu.h"
+
++extern ULONG ExtractNo (STRPTR Str, WORD *Pos, BOOL *Blank);
++
+ /**/
+ /* Extract a file name from Cmd at position Pos */
+ /**/
+--- a/masm.c
b/masm.c
+@@ -51,6 +51,8 @@ extern charLinkDate [];
+
+ /**/
+
++VOID Error (STRPTR Msg);
++
+ FILE*In;/* Input file */
+
+ BOOLLittleEndian = FALSE, Ok = TRUE, ESym = FALSE;
+--- a/masm.h
b/masm.h
+@@ -13,5 +13,3 @@
+
+ #define LINELEN 130
+
+-
+-
+--- a/mon.c
b/mon.c
+@@ -88,6 +88,7 @@
+ #include "mon.h"
+ #include "io.h"
+
++extern void Error (STRPTR Msg, BOOL PrintLine);
+ ULONG LastAddr = 0;
+
+ /**/
+--- a/mon.h
b/mon.h
+@@ -46,6 +46,7 @@ extern UBYTE PauseForKey (UBYTE Msg);
+
+ extern ULONG DebugLevel;
+ extern FILE*Log;
++VOID DisMicrocode ();
+
+ #define DB_DISASSEM 0x0001
+ #define DB_MICROCODE0x0002
+--- a/msym.c
b/msym.c
+@@ -15,6 +15,7 @@
+
+ SymTab SymBase = (SymTab) NULL;
+
++extern void Error (STRPTR Msg, BOOL PrintLine);
+ BOOLDoTitle;
+
+ /**/
+--
+2.38.1
+
diff --git
[gentoo-commits] repo/gentoo:master commit in: app-emulation/dlx/
commit: a3667aef055aaee37e56e0b1dd04a3eba7c03ebd
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Tue Aug 16 21:01:38 2022 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Wed Aug 17 13:00:44 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a3667aef
app-emulation/dlx: drop 1.0.0, EAPI-6--
Closes: https://bugs.gentoo.org/828279
Signed-off-by: Andreas Sturmlechner gentoo.org>
app-emulation/dlx/Manifest | 1 -
app-emulation/dlx/dlx-1.0.0.ebuild | 20
2 files changed, 21 deletions(-)
diff --git a/app-emulation/dlx/Manifest b/app-emulation/dlx/Manifest
index d495844051b6..ca76a9e2a7dc 100644
--- a/app-emulation/dlx/Manifest
+++ b/app-emulation/dlx/Manifest
@@ -1,2 +1 @@
-DIST dlx-1.0.0.tar.gz 112589 BLAKE2B
307785d08fd69e45264471fbc21e3b2bdba99798c0b7144c3d6a92819c29e4ac6449a6db83fdd55ba81d3b2e3f8ca6c991ee6c117ddc490a88ae210e5bc07ab8
SHA512
99297f14f6716ada7a29b204723a0c951002529362a22f695b3647517462f43af563ea55467985dda3e21d79a14d46b84dbc9b22a8c0751fba49257e30f70a7f
DIST dlx-1.5.20.zip 137039 BLAKE2B
99dbb2e5bcd89b3e9f3d8edc2fe7e7cc0a59f870f597a40a61a993b95d8b27c4f95b8d0490fdbcbc15693040d6e3abdfb8b0062e109916f5299c3da3c203d755
SHA512
5c832c2a486a82574ae03ec0cb4e30bfec74ef968658a38fbd896a1383dcdc558501baef7cbbdf99df453ba2840622d16c1619f9c5fe34b6cd058a7718bd3790
diff --git a/app-emulation/dlx/dlx-1.0.0.ebuild
b/app-emulation/dlx/dlx-1.0.0.ebuild
deleted file mode 100644
index 401c626c72df..
--- a/app-emulation/dlx/dlx-1.0.0.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-S=${WORKDIR}/dlx
-
-DESCRIPTION="DLX Simulator"
-HOMEPAGE="https://www.davidviner.com/dlx;
-SRC_URI="mirror://gentoo/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="ppc x86"
-IUSE=""
-
-src_install() {
- dobin masm mon dasm
- dodoc README.txt MANUAL.TXT
-}
[gentoo-commits] repo/gentoo:master commit in: app-emulation/dlx/
commit: cdd2797f81e6c2ca278485f80f2f06a16251ee74
Author: Sam James gentoo org>
AuthorDate: Sun Dec 5 18:36:53 2021 +
Commit: Sam James gentoo org>
CommitDate: Sun Dec 5 18:36:53 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cdd2797f
app-emulation/dlx: Stabilize 1.5.20 ppc, #828279
Signed-off-by: Sam James gentoo.org>
app-emulation/dlx/dlx-1.5.20.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-emulation/dlx/dlx-1.5.20.ebuild
b/app-emulation/dlx/dlx-1.5.20.ebuild
index ac3c77ef30da..e8a15ee06720 100644
--- a/app-emulation/dlx/dlx-1.5.20.ebuild
+++ b/app-emulation/dlx/dlx-1.5.20.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}"/dlx
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="~amd64 ~ppc x86"
+KEYWORDS="~amd64 ppc x86"
BDEPEND="app-arch/unzip"
[gentoo-commits] repo/gentoo:master commit in: app-emulation/dlx/
commit: 6c55cb86590d4ba6d95823547e0b1e07d3723e8b
Author: Sam James gentoo org>
AuthorDate: Sun Dec 5 18:30:23 2021 +
Commit: Sam James gentoo org>
CommitDate: Sun Dec 5 18:30:23 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6c55cb86
app-emulation/dlx: Stabilize 1.5.20 x86, #828279
Signed-off-by: Sam James gentoo.org>
app-emulation/dlx/dlx-1.5.20.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-emulation/dlx/dlx-1.5.20.ebuild
b/app-emulation/dlx/dlx-1.5.20.ebuild
index 8d9015504860..ac3c77ef30da 100644
--- a/app-emulation/dlx/dlx-1.5.20.ebuild
+++ b/app-emulation/dlx/dlx-1.5.20.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}"/dlx
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~ppc x86"
BDEPEND="app-arch/unzip"
[gentoo-commits] repo/gentoo:master commit in: app-emulation/dlx/
commit: 66951bf36a360f833c8b4dee474e016a4065b280
Author: Michał Górny gentoo org>
AuthorDate: Thu Aug 15 09:28:50 2019 +
Commit: Michał Górny gentoo org>
CommitDate: Thu Aug 15 09:42:46 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=66951bf3
app-emulation/dlx: Update HOMEPAGE, version distfile
Signed-off-by: Michał Górny gentoo.org>
app-emulation/dlx/Manifest | 2 +-
app-emulation/dlx/dlx-1.0.0.ebuild | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/app-emulation/dlx/Manifest b/app-emulation/dlx/Manifest
index d65a8e42f35..4de82a978b2 100644
--- a/app-emulation/dlx/Manifest
+++ b/app-emulation/dlx/Manifest
@@ -1 +1 @@
-DIST dlx.tar.gz 112589 BLAKE2B
307785d08fd69e45264471fbc21e3b2bdba99798c0b7144c3d6a92819c29e4ac6449a6db83fdd55ba81d3b2e3f8ca6c991ee6c117ddc490a88ae210e5bc07ab8
SHA512
99297f14f6716ada7a29b204723a0c951002529362a22f695b3647517462f43af563ea55467985dda3e21d79a14d46b84dbc9b22a8c0751fba49257e30f70a7f
+DIST dlx-1.0.0.tar.gz 112589 BLAKE2B
307785d08fd69e45264471fbc21e3b2bdba99798c0b7144c3d6a92819c29e4ac6449a6db83fdd55ba81d3b2e3f8ca6c991ee6c117ddc490a88ae210e5bc07ab8
SHA512
99297f14f6716ada7a29b204723a0c951002529362a22f695b3647517462f43af563ea55467985dda3e21d79a14d46b84dbc9b22a8c0751fba49257e30f70a7f
diff --git a/app-emulation/dlx/dlx-1.0.0.ebuild
b/app-emulation/dlx/dlx-1.0.0.ebuild
index 77c03ed90c3..07a21a90658 100644
--- a/app-emulation/dlx/dlx-1.0.0.ebuild
+++ b/app-emulation/dlx/dlx-1.0.0.ebuild
@@ -6,8 +6,8 @@ EAPI=6
S=${WORKDIR}/dlx
DESCRIPTION="DLX Simulator"
-HOMEPAGE="http://www.davidviner.com/dlx.php;
-SRC_URI="http://www.davidviner.com/dlx/dlx.tar.gz;
+HOMEPAGE="https://www.davidviner.com/dlx;
+SRC_URI="mirror://gentoo/dlx.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
[gentoo-commits] repo/gentoo:master commit in: app-emulation/dlx/
commit: 0547b99ec1b1c13c949b16053a3967823658377f
Author: Michał Górny gentoo org>
AuthorDate: Thu Aug 15 09:37:34 2019 +
Commit: Michał Górny gentoo org>
CommitDate: Thu Aug 15 09:42:47 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0547b99e
app-emulation/dlx: Bump to 1.5.20, major cleanup
Signed-off-by: Michał Górny gentoo.org>
app-emulation/dlx/Manifest | 1 +
app-emulation/dlx/dlx-1.5.20.ebuild | 30 ++
2 files changed, 31 insertions(+)
diff --git a/app-emulation/dlx/Manifest b/app-emulation/dlx/Manifest
index 4de82a978b2..d495844051b 100644
--- a/app-emulation/dlx/Manifest
+++ b/app-emulation/dlx/Manifest
@@ -1 +1,2 @@
DIST dlx-1.0.0.tar.gz 112589 BLAKE2B
307785d08fd69e45264471fbc21e3b2bdba99798c0b7144c3d6a92819c29e4ac6449a6db83fdd55ba81d3b2e3f8ca6c991ee6c117ddc490a88ae210e5bc07ab8
SHA512
99297f14f6716ada7a29b204723a0c951002529362a22f695b3647517462f43af563ea55467985dda3e21d79a14d46b84dbc9b22a8c0751fba49257e30f70a7f
+DIST dlx-1.5.20.zip 137039 BLAKE2B
99dbb2e5bcd89b3e9f3d8edc2fe7e7cc0a59f870f597a40a61a993b95d8b27c4f95b8d0490fdbcbc15693040d6e3abdfb8b0062e109916f5299c3da3c203d755
SHA512
5c832c2a486a82574ae03ec0cb4e30bfec74ef968658a38fbd896a1383dcdc558501baef7cbbdf99df453ba2840622d16c1619f9c5fe34b6cd058a7718bd3790
diff --git a/app-emulation/dlx/dlx-1.5.20.ebuild
b/app-emulation/dlx/dlx-1.5.20.ebuild
new file mode 100644
index 000..30e768088a5
--- /dev/null
+++ b/app-emulation/dlx/dlx-1.5.20.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="DLX Simulator"
+HOMEPAGE="https://www.davidviner.com/dlx;
+SRC_URI="https://www.davidviner.com/zip/dlx/dlx.zip -> ${P}.zip"
+S=${WORKDIR}/dlx
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+DEPEND="app-arch/unzip"
+
+src_compile() {
+ # CXX not used
+ emake CC="$(tc-getCC)" LINK="$(tc-getCC)" \
+ CFLAGS="${CFLAGS} ${CPPFLAGS}" \
+ LFLAGS="${CFLAGS} ${LDFLAGS}"
+}
+
+src_install() {
+ dobin masm mon dasm
+ dodoc README.txt MANUAL.TXT
+}
[gentoo-commits] repo/gentoo:master commit in: app-emulation/dlx/
commit: fdb73d1806f22562f1334dc1c33ab02c56adeecf
Author: Aaron Bauman gentoo org>
AuthorDate: Sun Jun 3 20:38:28 2018 +
Commit: Aaron Bauman gentoo org>
CommitDate: Mon Jun 4 01:12:24 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fdb73d18
app-emulation/dlx: drop DEPEND as nothing is there
Package-Manager: Portage-2.3.40, Repoman-2.3.9
app-emulation/dlx/dlx-1.0.0.ebuild | 2 --
1 file changed, 2 deletions(-)
diff --git a/app-emulation/dlx/dlx-1.0.0.ebuild
b/app-emulation/dlx/dlx-1.0.0.ebuild
index dde85866806..cea941115c4 100644
--- a/app-emulation/dlx/dlx-1.0.0.ebuild
+++ b/app-emulation/dlx/dlx-1.0.0.ebuild
@@ -14,8 +14,6 @@ SLOT="0"
KEYWORDS="x86 ppc"
IUSE=""
-DEPEND=""
-
src_install() {
dobin masm mon dasm
dodoc README.txt MANUAL.TXT
[gentoo-commits] repo/gentoo:master commit in: app-emulation/dlx/
commit: 7d088aad30168a275033825659696bb65f08c108
Author: Aaron Bauman gentoo org>
AuthorDate: Sun Jun 3 14:08:53 2018 +
Commit: Aaron Bauman gentoo org>
CommitDate: Mon Jun 4 01:12:19 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7d088aad
app-emulation/dlx: bump EAPI and drop old
Package-Manager: Portage-2.3.40, Repoman-2.3.9
app-emulation/dlx/dlx-1.0.0-r1.ebuild | 35 ---
app-emulation/dlx/dlx-1.0.0.ebuild| 8 +++-
2 files changed, 3 insertions(+), 40 deletions(-)
diff --git a/app-emulation/dlx/dlx-1.0.0-r1.ebuild
b/app-emulation/dlx/dlx-1.0.0-r1.ebuild
deleted file mode 100644
index 6b10ef9f780..000
--- a/app-emulation/dlx/dlx-1.0.0-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit toolchain-funcs
-
-DESCRIPTION="DLX Simulator"
-HOMEPAGE="http://www.davidviner.com/dlx.php;
-SRC_URI="http://www.davidviner.com/${PN}/${PN}.tar.gz;
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-S="${WORKDIR}/${PN}"
-
-src_compile() {
- emake CC="$(tc-getCC)" \
- LINK="$(tc-getCC)" \
- CFLAGS="${CFLAGS}" \
- LFLAGS="${LDFLAGS}" \
- || die "emake failed"
-}
-
-src_install() {
- dodir /usr/include/dlx /usr/share/dlx/examples
- dobin masm mon dasm
- insinto /usr/include/dlx
- doins *.i auto.a
- insinto /usr/share/dlx/examples
- doins *.a hp.m
- dodoc README.txt MANUAL.TXT
-}
diff --git a/app-emulation/dlx/dlx-1.0.0.ebuild
b/app-emulation/dlx/dlx-1.0.0.ebuild
index 60dd853d23b..dde85866806 100644
--- a/app-emulation/dlx/dlx-1.0.0.ebuild
+++ b/app-emulation/dlx/dlx-1.0.0.ebuild
@@ -1,9 +1,10 @@
# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=0
+EAPI=6
S=${WORKDIR}/dlx
+
DESCRIPTION="DLX Simulator"
HOMEPAGE="http://www.davidviner.com/dlx.php;
SRC_URI="http://www.davidviner.com/dlx/dlx.tar.gz;
@@ -12,11 +13,8 @@ LICENSE="GPL-2"
SLOT="0"
KEYWORDS="x86 ppc"
IUSE=""
-DEPEND=""
-src_compile() {
- emake || die
-}
+DEPEND=""
src_install() {
dobin masm mon dasm
