[gentoo-commits] repo/gentoo:master commit in: dev-embedded/xa/, dev-embedded/xa/files/
commit: 4b137bf898afd0f5c24c163006a42525676a
Author: Ionen Wolkens gentoo org>
AuthorDate: Wed Nov 22 15:19:01 2023 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Wed Nov 22 15:20:31 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b137bf8
dev-embedded/xa: add 2.4.0
Signed-off-by: Ionen Wolkens gentoo.org>
dev-embedded/xa/Manifest | 1 +
dev-embedded/xa/files/xa-2.4.0-make.patch | 28
dev-embedded/xa/xa-2.4.0.ebuild | 31 +++
3 files changed, 60 insertions(+)
diff --git a/dev-embedded/xa/Manifest b/dev-embedded/xa/Manifest
index 483ed5ecd16b..fa038a5830e3 100644
--- a/dev-embedded/xa/Manifest
+++ b/dev-embedded/xa/Manifest
@@ -1 +1,2 @@
DIST xa-2.3.14.tar.gz 156876 BLAKE2B
3dd4f369d69cd85c7c545e4aba7698deb9402946c755ac2709c43cb4a795d1cde730286a4a0df2615c39367443788cd4314bf526def863fa57bc85d36ca2dc60
SHA512
71d4631cb3e698b6522ca76c4b34078ded0632533bdaaa8b8d584eb27f0958ed288a6765136ff0ad03cd861a2dccbb76c6d8db0abf277a61ae864ad23212653d
+DIST xa-2.4.0.tar.gz 197862 BLAKE2B
27f8b41dafee9c1c4158681d57f971297a0a63e09df164469f665528cffae0cdd78441c0a939d742463e851f32a73ee30a95f2b2b41e2fe42137041a03041255
SHA512
eebaf67715324735203405016df7311bf2ed568ab0e609c0fec7d9d803c173cde5dea161b7f713cb5215454d1ce69acbde43372016dfe9866ed99acecb9aafb1
diff --git a/dev-embedded/xa/files/xa-2.4.0-make.patch
b/dev-embedded/xa/files/xa-2.4.0-make.patch
new file mode 100644
index ..a71ceef23bd7
--- /dev/null
+++ b/dev-embedded/xa/files/xa-2.4.0-make.patch
@@ -0,0 +1,28 @@
+https://bugs.gentoo.org/722600
+--- a/Makefile
b/Makefile
+@@ -4,2 +3,0 @@
+-CC = gcc
+-LD = gcc
+@@ -9,2 +6,0 @@
+-CFLAGS = -O2
+-LDFLAGS = -lc
+@@ -33 +29 @@
+-all: killxa xa uncpk
++all: xa uncpk
+@@ -39 +35 @@
+- (cd src && LD=${LD} CC="${CC} ${CFLAGS}" ${MAKE})
++ (cd src && ${MAKE})
+@@ -45 +41 @@
+- (cd misc && CC="${CC} ${CFLAGS}" ${MAKE})
++ (cd misc && ${MAKE})
+--- a/misc/Makefile
b/misc/Makefile
+@@ -5 +5 @@
+-CFLAGS = -O2 -g
++CFLAGS := $(CFLAGS) $(CPPFLAGS) $(LDFLAGS)
+--- a/src/Makefile
b/src/Makefile
+@@ -12 +12 @@
+- ${LD} -o ../xa ${OBJ} ${LDFLAGS}
++ ${CC} ${LDFLAGS} -o ../xa ${OBJ}
diff --git a/dev-embedded/xa/xa-2.4.0.ebuild b/dev-embedded/xa/xa-2.4.0.ebuild
new file mode 100644
index ..7ad46858840c
--- /dev/null
+++ b/dev-embedded/xa/xa-2.4.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="High-speed, two-pass portable 6502 cross-assembler"
+HOMEPAGE="https://www.floodgap.com/retrotech/xa/;
+SRC_URI="https://www.floodgap.com/retrotech/xa/dists/${P}.tar.gz;
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-2.4.0-make.patch
+)
+
+src_configure() {
+ tc-export CC
+}
+
+src_test() {
+ emake -j1 test
+}
+
+src_install() {
+ emake DESTDIR="${ED}"/usr install
+ einstalldocs
+}
[gentoo-commits] repo/gentoo:master commit in: dev-embedded/xa/, dev-embedded/xa/files/
commit: 2ef8ef8d2c972faed26819703bae15a937b10957
Author: Ionen Wolkens gentoo org>
AuthorDate: Sat Mar 25 01:59:28 2023 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Sat Mar 25 03:18:36 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ef8ef8d
dev-embedded/xa: drop 2.3.13
Signed-off-by: Ionen Wolkens gentoo.org>
dev-embedded/xa/Manifest | 1 -
dev-embedded/xa/files/xa-2.3.10-Makefile.patch | 77 --
dev-embedded/xa/xa-2.3.13.ebuild | 31 ---
3 files changed, 109 deletions(-)
diff --git a/dev-embedded/xa/Manifest b/dev-embedded/xa/Manifest
index 86eb602c8dc5..483ed5ecd16b 100644
--- a/dev-embedded/xa/Manifest
+++ b/dev-embedded/xa/Manifest
@@ -1,2 +1 @@
-DIST xa-2.3.13.tar.gz 155606 BLAKE2B
8196f8f88bee29dbab9ad026c0d4e3519159c4ed7579dc7db391c0bdd7b1bfe31e2884644258d863e299ac3b5fcc43718b3d95b9b7d7802541a9d58366728ffe
SHA512
b8a4c1856e51bbe212b98be06895987d6fb926a229511a67ea90a934da1fcc84daf29bd289c3c4c2254d2bce345333bb92747947f3286376761613b2e181e99b
DIST xa-2.3.14.tar.gz 156876 BLAKE2B
3dd4f369d69cd85c7c545e4aba7698deb9402946c755ac2709c43cb4a795d1cde730286a4a0df2615c39367443788cd4314bf526def863fa57bc85d36ca2dc60
SHA512
71d4631cb3e698b6522ca76c4b34078ded0632533bdaaa8b8d584eb27f0958ed288a6765136ff0ad03cd861a2dccbb76c6d8db0abf277a61ae864ad23212653d
diff --git a/dev-embedded/xa/files/xa-2.3.10-Makefile.patch
b/dev-embedded/xa/files/xa-2.3.10-Makefile.patch
deleted file mode 100644
index cabc7b99beec..
--- a/dev-embedded/xa/files/xa-2.3.10-Makefile.patch
+++ /dev/null
@@ -1,77 +0,0 @@
a/Makefile
-+++ b/Makefile
-@@ -1,11 +1,7 @@
- # Unix gcc or DOS go32 cross-compiling gcc
- #
--CC = gcc
--LD = gcc
- # for testing. not to be used; build failures in misc/.
- #CFLAGS = -O2 -W -Wall -pedantic -ansi
--CFLAGS = -O2
--LDFLAGS = -lc
-
- # for DOS?
- # CC = gcc-go32
-@@ -32,13 +28,13 @@
- rm -f xa
-
- xa:
-- (cd src && LD=${LD} CC="${CC} ${CFLAGS}" ${MAKE})
-+ (cd src && ${MAKE})
-
- load:
-- (cd loader && CC="${CC} ${CFLAGS}" ${MAKE})
-+ (cd loader && ${MAKE})
-
- uncpk:
-- (cd misc && CC="${CC} ${CFLAGS}" ${MAKE})
-+ (cd misc && ${MAKE})
-
- dos: clean
- (cd src && LD=gcc-go32 CC=gcc-go32 CFLAGS="-W -Wall -pedantic" ${MAKE})
a/misc/Makefile
-+++ b/misc/Makefile
-@@ -2,7 +2,6 @@
- XCBMLIB = ..
-
- # -Wall -ansi et al. cause compile problems.
--CFLAGS = -O2
-
- LIBS = #-lncurses -ltermcap -lm
-
-@@ -10,19 +9,19 @@
- all: ../mkrom.sh ../uncpk ../printcbm ../file65 ../reloc65 ../ldo65
-
- ../uncpk: uncpk.c
-- ${CC} ${CFLAGS} uncpk.c -o $(XCBMLIB)/uncpk
-+ ${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} uncpk.c -o $(XCBMLIB)/uncpk
-
- ../printcbm: printcbm.c
-- ${CC} ${CFLAGS} printcbm.c -o $(XCBMLIB)/printcbm
-+ ${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} printcbm.c -o $(XCBMLIB)/printcbm
-
- ../file65: file65.c
-- ${CC} ${CFLAGS} file65.c -o $(XCBMLIB)/file65
-+ ${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} file65.c -o $(XCBMLIB)/file65
-
- ../ldo65: ldo65.c
-- ${CC} ${CFLAGS} ldo65.c -o $(XCBMLIB)/ldo65
-+ ${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} ldo65.c -o $(XCBMLIB)/ldo65
-
- ../reloc65: reloc65.c
-- ${CC} ${CFLAGS} reloc65.c -o $(XCBMLIB)/reloc65
-+ ${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} reloc65.c -o $(XCBMLIB)/reloc65
-
- ../mkrom.sh: mkrom.sh
- cp mkrom.sh ../mkrom.sh
a/src/Makefile
-+++ b/src/Makefile
-@@ -8,7 +8,7 @@
- all: xa
-
- xa: ${OBJ}
-- ${LD} -o ../xa ${OBJ} ${LDFLAGS}
-+ ${CC} ${CFLAGS} ${LDFLAGS} -o ../xa ${OBJ}
-
- clean:
- rm -f *.o *.o65
diff --git a/dev-embedded/xa/xa-2.3.13.ebuild b/dev-embedded/xa/xa-2.3.13.ebuild
deleted file mode 100644
index ddaef3e9cb4a..
--- a/dev-embedded/xa/xa-2.3.13.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit toolchain-funcs
-
-DESCRIPTION="High-speed, two-pass portable 6502 cross-assembler"
-HOMEPAGE="https://www.floodgap.com/retrotech/xa/;
-SRC_URI="https://www.floodgap.com/retrotech/xa/dists/${P}.tar.gz;
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-2.3.10-Makefile.patch
-)
-
-src_configure() {
- tc-export CC
-}
-
-src_test() {
- emake -j1 test
-}
-
-src_install() {
- emake DESTDIR="${ED}"/usr install
- einstalldocs
-}
[gentoo-commits] repo/gentoo:master commit in: dev-embedded/xa/, dev-embedded/xa/files/
commit: 455ef7eca85e71c011a63cd66cc5479fdcb26cbf
Author: David Seifert gentoo org>
AuthorDate: Sun Jul 5 20:49:49 2020 +
Commit: David Seifert gentoo org>
CommitDate: Sun Jul 5 20:49:49 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=455ef7ec
dev-embedded/xa: Fix build system
Closes: https://bugs.gentoo.org/722600
Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: David Seifert gentoo.org>
dev-embedded/xa/files/xa-2.3.10-Makefile.patch | 77 ++
dev-embedded/xa/xa-2.3.10.ebuild | 17 +++---
2 files changed, 85 insertions(+), 9 deletions(-)
diff --git a/dev-embedded/xa/files/xa-2.3.10-Makefile.patch
b/dev-embedded/xa/files/xa-2.3.10-Makefile.patch
new file mode 100644
index 000..cabc7b99bee
--- /dev/null
+++ b/dev-embedded/xa/files/xa-2.3.10-Makefile.patch
@@ -0,0 +1,77 @@
+--- a/Makefile
b/Makefile
+@@ -1,11 +1,7 @@
+ # Unix gcc or DOS go32 cross-compiling gcc
+ #
+-CC = gcc
+-LD = gcc
+ # for testing. not to be used; build failures in misc/.
+ #CFLAGS = -O2 -W -Wall -pedantic -ansi
+-CFLAGS = -O2
+-LDFLAGS = -lc
+
+ # for DOS?
+ # CC = gcc-go32
+@@ -32,13 +28,13 @@
+ rm -f xa
+
+ xa:
+- (cd src && LD=${LD} CC="${CC} ${CFLAGS}" ${MAKE})
++ (cd src && ${MAKE})
+
+ load:
+- (cd loader && CC="${CC} ${CFLAGS}" ${MAKE})
++ (cd loader && ${MAKE})
+
+ uncpk:
+- (cd misc && CC="${CC} ${CFLAGS}" ${MAKE})
++ (cd misc && ${MAKE})
+
+ dos: clean
+ (cd src && LD=gcc-go32 CC=gcc-go32 CFLAGS="-W -Wall -pedantic" ${MAKE})
+--- a/misc/Makefile
b/misc/Makefile
+@@ -2,7 +2,6 @@
+ XCBMLIB = ..
+
+ # -Wall -ansi et al. cause compile problems.
+-CFLAGS = -O2
+
+ LIBS = #-lncurses -ltermcap -lm
+
+@@ -10,19 +9,19 @@
+ all: ../mkrom.sh ../uncpk ../printcbm ../file65 ../reloc65 ../ldo65
+
+ ../uncpk: uncpk.c
+- ${CC} ${CFLAGS} uncpk.c -o $(XCBMLIB)/uncpk
++ ${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} uncpk.c -o $(XCBMLIB)/uncpk
+
+ ../printcbm: printcbm.c
+- ${CC} ${CFLAGS} printcbm.c -o $(XCBMLIB)/printcbm
++ ${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} printcbm.c -o $(XCBMLIB)/printcbm
+
+ ../file65: file65.c
+- ${CC} ${CFLAGS} file65.c -o $(XCBMLIB)/file65
++ ${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} file65.c -o $(XCBMLIB)/file65
+
+ ../ldo65: ldo65.c
+- ${CC} ${CFLAGS} ldo65.c -o $(XCBMLIB)/ldo65
++ ${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} ldo65.c -o $(XCBMLIB)/ldo65
+
+ ../reloc65: reloc65.c
+- ${CC} ${CFLAGS} reloc65.c -o $(XCBMLIB)/reloc65
++ ${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} reloc65.c -o $(XCBMLIB)/reloc65
+
+ ../mkrom.sh: mkrom.sh
+ cp mkrom.sh ../mkrom.sh
+--- a/src/Makefile
b/src/Makefile
+@@ -8,7 +8,7 @@
+ all: xa
+
+ xa: ${OBJ}
+- ${LD} -o ../xa ${OBJ} ${LDFLAGS}
++ ${CC} ${CFLAGS} ${LDFLAGS} -o ../xa ${OBJ}
+
+ clean:
+ rm -f *.o *.o65
diff --git a/dev-embedded/xa/xa-2.3.10.ebuild b/dev-embedded/xa/xa-2.3.10.ebuild
index c3803fcb811..ea526d56aac 100644
--- a/dev-embedded/xa/xa-2.3.10.ebuild
+++ b/dev-embedded/xa/xa-2.3.10.ebuild
@@ -13,14 +13,13 @@ LICENSE="GPL-2"
SLOT="0"
KEYWORDS="amd64 x86"
-PATCHES=( "${FILESDIR}"/${PN}-2.3.10-fix-gcc10-fno-common.patch )
-
-src_compile() {
- emake \
- CC="$(tc-getCC)" \
- LD="$(tc-getCC) " \
- CFLAGS="${CFLAGS} ${LDFLAGS}" \
- LDFLAGS="${LDFLAGS}"
+PATCHES=(
+ "${FILESDIR}"/${PN}-2.3.10-Makefile.patch
+ "${FILESDIR}"/${PN}-2.3.10-fix-gcc10-fno-common.patch
+)
+
+src_configure() {
+ tc-export CC
}
src_test() {
@@ -28,6 +27,6 @@ src_test() {
}
src_install() {
- emake install DESTDIR="${ED}/usr"
+ emake DESTDIR="${ED}"/usr install
einstalldocs
}
