summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorÁbel Futó2021-03-30 20:30:44 +0200
committerÁbel Futó2021-03-30 20:30:44 +0200
commit6d255804e9f87f8a8fd2aebf684a531d73add17a (patch)
tree4515e33387d77511cee39ff5d0fbd2c1a9d7b983
parent98bb26f1c56cb34753f6f551b0ba5c744770ea1b (diff)
downloadaur-6d255804e9f87f8a8fd2aebf684a531d73add17a.tar.gz
Updated to 2.1
-rw-r--r--.SRCINFO16
-rw-r--r--PKGBUILD32
-rw-r--r--fix-gcc10-fnocommon.patch40
-rw-r--r--fix-makefile-v2.0.patch46
-rw-r--r--fix-makefile-v2.1.patch77
-rw-r--r--fix-whitespace-Makefile.patch63
6 files changed, 167 insertions, 107 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 8a36e4a5678..175bc5fba9d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = z88dk
pkgdesc = Developement kit for Z80 computers
- pkgver = 2.0
- pkgrel = 2
+ pkgver = 2.1
+ pkgrel = 1
url = http://z88dk.org
arch = i686
arch = x86_64
@@ -9,13 +9,13 @@ pkgbase = z88dk
depends = perl
depends = libxml2
backup = etc/profile.d/z88dk.sh
- source = http://downloads.sourceforge.net/project/z88dk/z88dk/2.0/z88dk-src-2.0.tgz
- source = fix-makefile-v2.0.patch
- source = fix-gcc10-fnocommon.patch
+ source = https://github.com/z88dk/z88dk/releases/download/v2.1/z88dk-src-2.1.tgz
+ source = fix-whitespace-Makefile.patch
+ source = fix-makefile-v2.1.patch
source = z88dk.sh
- sha256sums = 285fb55858b3860fb7a152d6090eedd355a33863812d94ef56368825547d5506
- sha256sums = 8a275f9240cbc89e7d7443cfe35875c3f1ffc2c57bd95375dee250d8031ba509
- sha256sums = e55d7d1f262429cedc478f87cadbbe1eff8c7a874c2d7bdc8019174e46a9c2ac
+ sha256sums = f3579ee59b4af552721173165af38223b115ccb67179e79d2f3c0ae64338dc7c
+ sha256sums = 3ae2c544e97a49298e81c3fbd19ff4458b7627a827d83534c34499f7570cfaa8
+ sha256sums = 02ad318eb810f2dff140f66e8c77b946f66018e077a7c27b87824081f6601646
sha256sums = 4eef7c67e5b142db3006a4076876cdae9f386a7b94a66841a5a8fac869bea156
pkgname = z88dk
diff --git a/PKGBUILD b/PKGBUILD
index 75d35043b4d..38c380e5cab 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,29 +1,28 @@
# Maintainer: Ábel Futó <lebaotuf+arch at gmail dot com>
# Contributor: John Schug <xtr.xtrnet@gmail.com>
pkgname=z88dk
-pkgver=2.0
-pkgrel=2
+pkgver=2.1
+pkgrel=1
pkgdesc="Developement kit for Z80 computers"
arch=('i686' 'x86_64')
url="http://z88dk.org"
license=('custom:The Clarified Artistic License')
depends=('perl' 'libxml2')
backup=(etc/profile.d/z88dk.sh)
-source=(http://downloads.sourceforge.net/project/z88dk/z88dk/${pkgver}/${pkgname}-src-${pkgver}.tgz
- fix-makefile-v2.0.patch
- fix-gcc10-fnocommon.patch
+source=(https://github.com/${pkgname}/${pkgname}/releases/download/v${pkgver}/${pkgname}-src-${pkgver}.tgz
+ fix-whitespace-Makefile.patch
+ fix-makefile-v2.1.patch
z88dk.sh)
-sha256sums=('285fb55858b3860fb7a152d6090eedd355a33863812d94ef56368825547d5506'
- '8a275f9240cbc89e7d7443cfe35875c3f1ffc2c57bd95375dee250d8031ba509'
- 'e55d7d1f262429cedc478f87cadbbe1eff8c7a874c2d7bdc8019174e46a9c2ac'
+sha256sums=('f3579ee59b4af552721173165af38223b115ccb67179e79d2f3c0ae64338dc7c'
+ '3ae2c544e97a49298e81c3fbd19ff4458b7627a827d83534c34499f7570cfaa8'
+ '02ad318eb810f2dff140f66e8c77b946f66018e077a7c27b87824081f6601646'
'4eef7c67e5b142db3006a4076876cdae9f386a7b94a66841a5a8fac869bea156')
prepare() {
cd "${srcdir}/${pkgname}"
- patch -Np0 < ../fix-makefile-v2.0.patch
- patch -Np1 < ../fix-gcc10-fnocommon.patch
-
+ patch -Np0 < ../fix-whitespace-Makefile.patch
+ patch -Np0 < ../fix-makefile-v2.1.patch
}
build() {
@@ -33,14 +32,21 @@ build() {
export ZCCCFG="${srcdir}/${pkgname}"/lib/config
export Z80_OZFILES="${srcdir}/${pkgname}"/lib/
export MAKEFLAGS="-j1"
- ./build.sh
- make libs
+ make
+ make -C libsrc clean
+ make -C libsrc
}
package() {
cd "${srcdir}/${pkgname}"
+ make -C libsrc prefix="/usr" DESTDIR="${pkgdir}" install
make prefix="/usr" DESTDIR="${pkgdir}" install
+ # Uncomment for a cleaner install directory - no functionality will be lost
+ #rm -rf ${pkgdir}/usr/share/z88dk/libsrc/target/{zx,zxn,ts2068}/newlib/obj
+ #rm -rf ${pkgdir}/usr/share/z88dk/libsrc/target/zx-common/fcntl/esxdos/obj
+ #rm -rf ${pkgdir}/usr/share/z88dk/libsrc/target/zx/fzx/obj/{z80,z80n}
+
install -dm755 ${pkgdir}/etc/profile.d/
install -m755 ${srcdir}/z88dk.sh ${pkgdir}/etc/profile.d/
# Include docs
diff --git a/fix-gcc10-fnocommon.patch b/fix-gcc10-fnocommon.patch
deleted file mode 100644
index 005732b89cc..00000000000
--- a/fix-gcc10-fnocommon.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-diff -Naur z88dk.old/src/appmake/m5.c z88dk/src/appmake/m5.c
---- z88dk.old/src/appmake/m5.c 2018-09-17 05:00:12.000000000 +0200
-+++ z88dk/src/appmake/m5.c 2020-05-31 14:52:29.889764807 +0200
-@@ -15,7 +15,6 @@
- static char help = 0;
- static char audio = 0;
- static char fast = 0;
--unsigned long checksum;
-
-
- /* Options that are available for this module */
-@@ -83,6 +82,7 @@
- int c;
- int i;
- int len, blocklen;
-+ unsigned long checksum;
-
- if (help)
- return -1;
-diff -Naur z88dk.old/src/appmake/sc3000.c z88dk/src/appmake/sc3000.c
---- z88dk.old/src/appmake/sc3000.c 2019-06-12 05:00:08.000000000 +0200
-+++ z88dk/src/appmake/sc3000.c 2020-05-31 14:51:58.861726767 +0200
-@@ -21,8 +21,6 @@
- static char survivors = 0;
- static char sf7000 = 0;
-
--unsigned long checksum;
--
-
- /* Options that are available for this module */
- option_t sc3000_options[] = {
-@@ -112,6 +110,8 @@
- FILE *fpin, *fpout;
- long pos=0, blocklen;
- int c, i, len;
-+ unsigned long checksum;
-+
-
- if (help)
- return -1;
diff --git a/fix-makefile-v2.0.patch b/fix-makefile-v2.0.patch
deleted file mode 100644
index 56db47e6416..00000000000
--- a/fix-makefile-v2.0.patch
+++ /dev/null
@@ -1,46 +0,0 @@
---- Makefile.old 2020-03-06 13:11:55.074410494 +0100
-+++ Makefile 2020-03-06 13:12:14.445682667 +0100
-@@ -27,11 +27,6 @@
- EXEC_PREFIX ?=
- CROSS ?= 0
-
--ifneq (, $(shell which ccache))
-- OCC := $(CC)
-- CC := ccache $(CC)
--endif
--
- SDCC_PATH = /tmp/sdcc
- Z88DK_PATH = $(shell pwd)
-
-@@ -45,11 +40,11 @@
- bin/z80nm$(EXESUFFIX) bin/zobjcopy$(EXESUFFIX) \
- bin/z88dk-ticks$(EXESUFFIX) bin/z88dk-z80svg$(EXESUFFIX) \
- bin/z88dk-font2pv1000$(EXESUFFIX) bin/z88dk-basck$(EXESUFFIX) \
-- testsuite bin/z88dk-lib$(EXESUFFIX)
-+ testsuite bin/z88dk-lib$(EXESUFFIX)
- ALL_EXT = bin/zsdcc$(EXESUFFIX)
-
- .PHONY: $(ALL)
--all: $(ALL) $(ALL_EXT)
-+all: $(ALL)
-
- setup:
- $(shell if [ "${git_count}" != "" ]; then \
-@@ -137,7 +132,7 @@
- cd libsrc ; $(MAKE) install
-
- install: install-clean
-- install -d $(DESTDIR)/$(prefix) $(DESTDIR)/$(prefix_share)/lib
-+ install -d $(DESTDIR)/$(prefix) $(DESTDIR)/$(prefix)/bin $(DESTDIR)/$(prefix_share)/lib
- $(MAKE) -C src/appmake PREFIX=$(DESTDIR)/$(prefix) install
- $(MAKE) -C src/copt PREFIX=$(DESTDIR)/$(prefix) install
- $(MAKE) -C src/ucpp PREFIX=$(DESTDIR)/$(prefix) install
-@@ -196,6 +191,7 @@
- $(MAKE) -C test clean
- $(MAKE) -C testsuite clean
- $(MAKE) -C src/z88dk-lib clean
-- #if [ -d bin ]; then find bin -type f -exec rm -f {} ';' ; fi
-+# if [ -d bin ]; then find bin -type f -exec rm -f {} ';' ; fi
-
- .PHONY: test testsuite
-+
diff --git a/fix-makefile-v2.1.patch b/fix-makefile-v2.1.patch
new file mode 100644
index 00000000000..4050481b98c
--- /dev/null
+++ b/fix-makefile-v2.1.patch
@@ -0,0 +1,77 @@
+--- Makefile 2021-02-14 14:08:54.860536559 +0100
++++ Makefile 2021-02-14 14:19:49.782369663 +0100
+@@ -14,9 +14,8 @@
+ EXESUFFIX ?=
+ endif
+
+-DESTDIR ?= /usr/local
+-
+-prefix_share = $(DESTDIR)/share/z88dk
++prefix ?= /usr/local
++prefix_share = $(prefix)/share/z88dk
+ git_rev ?= $(shell git rev-parse --short HEAD)
+ git_count ?= $(shell git rev-list --count HEAD)
+ version ?= $(shell date +%Y%m%d)
+@@ -59,7 +58,7 @@
+ ALL_EXT = bin/zsdcc$(EXESUFFIX)
+
+ .PHONY: all
+-all: $(ALL) $(ALL_EXT)
++all: $(ALL)
+
+ src/config.h:
+ $(shell if [ "${git_count}" != "" ]; then \
+@@ -175,29 +174,30 @@
+ cd libsrc ; $(MAKE) install
+
+ install: install-clean
+- install -d $(DESTDIR) $(DESTDIR)/bin $(prefix_share)/lib $(prefix_share)/src
+- $(MAKE) -C src/appmake PREFIX=$(DESTDIR) install
+- $(MAKE) -C src/copt PREFIX=$(DESTDIR) install
+- $(MAKE) -C src/ucpp PREFIX=$(DESTDIR) install
+- $(MAKE) -C src/cpp PREFIX=$(DESTDIR) install
+- $(MAKE) -C src/sccz80 PREFIX=$(DESTDIR) install
+- $(MAKE) -C src/z80asm PREFIX=$(DESTDIR) PREFIX_SHARE=$(prefix_share) install
+- $(MAKE) -C src/zcc PREFIX=$(DESTDIR) install
+- $(MAKE) -C src/zpragma PREFIX=$(DESTDIR) install
+- $(MAKE) -C src/zx7 PREFIX=$(DESTDIR) install
+- $(MAKE) -C src/z80nm PREFIX=$(DESTDIR) install
+- $(MAKE) -C src/zobjcopy PREFIX=$(DESTDIR) install
+- $(MAKE) -C src/ticks PREFIX=$(DESTDIR) install
+- $(MAKE) -C src/z88dk-lib PREFIX=$(DESTDIR) install
+- $(MAKE) -C support/graphics PREFIX=$(DESTDIR) install
+- $(MAKE) -C support/basck PREFIX=$(DESTDIR) install
+- $(MAKE) -C support/pv1000 PREFIX=$(DESTDIR) install
+- if [ -f bin/zsdcpp$(EXESUFFIX) ]; then cp bin/zsdcpp$(EXESUFFIX) $(DESTDIR)/bin/; fi
+- if [ -f bin/zsdcc$(EXESUFFIX) ]; then cp bin/zsdcc$(EXESUFFIX) $(DESTDIR)/bin/; fi
+- cp -r include $(prefix_share)/
+- cp -r lib $(prefix_share)/
+- cp -r libsrc $(prefix_share)/
+- cp -r src/m4 $(prefix_share)/src/
++ install -d $(DESTDIR)$(prefix) $(DESTDIR)$(prefix)/bin
++ install -d $(DESTDIR)$(prefix_share)/lib $(DESTDIR)$(prefix_share)/src
++ $(MAKE) -C src/appmake PREFIX=$(DESTDIR)$(prefix) install
++ $(MAKE) -C src/copt PREFIX=$(DESTDIR)$(prefix) install
++ $(MAKE) -C src/ucpp PREFIX=$(DESTDIR)$(prefix) install
++ $(MAKE) -C src/cpp PREFIX=$(DESTDIR)$(prefix) install
++ $(MAKE) -C src/sccz80 PREFIX=$(DESTDIR)$(prefix) install
++ $(MAKE) -C src/z80asm PREFIX=$(DESTDIR)$(prefix) PREFIX_SHARE=$(DESTDIR)$(prefix_share) install
++ $(MAKE) -C src/zcc PREFIX=$(DESTDIR)$(prefix) install
++ $(MAKE) -C src/zpragma PREFIX=$(DESTDIR)$(prefix) install
++ $(MAKE) -C src/zx7 PREFIX=$(DESTDIR)$(prefix) install
++ $(MAKE) -C src/z80nm PREFIX=$(DESTDIR)$(prefix) install
++ $(MAKE) -C src/zobjcopy PREFIX=$(DESTDIR)$(prefix) install
++ $(MAKE) -C src/ticks PREFIX=$(DESTDIR)$(prefix) install
++ $(MAKE) -C src/z88dk-lib PREFIX=$(DESTDIR)$(prefix) install
++ $(MAKE) -C support/graphics PREFIX=$(DESTDIR)$(prefix) install
++ $(MAKE) -C support/basck PREFIX=$(DESTDIR)$(prefix) install
++ $(MAKE) -C support/pv1000 PREFIX=$(DESTDIR)$(prefix) install
++ if [ -f bin/zsdcpp$(EXESUFFIX) ]; then cp bin/zsdcpp$(EXESUFFIX) $(DESTDIR)$(prefix)/bin/; fi
++ if [ -f bin/zsdcc$(EXESUFFIX) ]; then cp bin/zsdcc$(EXESUFFIX) $(DESTDIR)$(prefix)/bin/; fi
++ cp -r include $(DESTDIR)$(prefix_share)/
++ cp -r lib $(DESTDIR)$(prefix_share)/
++ cp -r libsrc $(DESTDIR)$(prefix_share)/
++ cp -r src/m4 $(DESTDIR)$(prefix_share)/src/
+
+
+ # BSD install syntax below
diff --git a/fix-whitespace-Makefile.patch b/fix-whitespace-Makefile.patch
new file mode 100644
index 00000000000..c857e3e0b22
--- /dev/null
+++ b/fix-whitespace-Makefile.patch
@@ -0,0 +1,63 @@
+--- Makefile 2021-02-14 12:59:55.868073893 +0100
++++ Makefile 2021-02-14 13:02:54.451661445 +0100
+@@ -53,7 +53,7 @@
+ bin/z88dk-ticks$(EXESUFFIX) bin/z88dk-z80svg$(EXESUFFIX) \
+ bin/z88dk-font2pv1000$(EXESUFFIX) bin/z88dk-basck$(EXESUFFIX) \
+ bin/z88dk-lib$(EXESUFFIX)
+-
++
+ ALL = $(BINS) testsuite
+
+ ALL_EXT = bin/zsdcc$(EXESUFFIX)
+@@ -81,7 +81,7 @@
+ tar xzf $^
+ touch $@
+ else
+- svn checkout -r $(SDCC_VERSION) https://svn.code.sf.net/p/sdcc/code/trunk/sdcc -q $(SDCC_PATH)
++ svn checkout -r $(SDCC_VERSION) https://svn.code.sf.net/p/sdcc/code/trunk/sdcc -q $(SDCC_PATH)
+ patch -d $(SDCC_PATH) -p0 < $(Z88DK_PATH)/src/zsdcc/sdcc-z88dk.patch
+ endif
+ endif
+@@ -93,7 +93,7 @@
+ zsdcc-tarball: $(SDCC_PATH)/configure
+ @mkdir -p dist
+ tar --exclude=.svn -cvzf dist/zsdcc_r$(SDCC_VERSION)_src.tar.gz src/sdcc-build
+-
++
+
+ $(SDCC_PATH)/Makefile: $(SDCC_PATH)/configure
+ ifdef BUILD_SDCC
+@@ -200,17 +200,17 @@
+ cp -r src/m4 $(prefix_share)/src/
+
+
+- # BSD install syntax below
+- #find include -type d -exec $(INSTALL) -d -m 755 {,$(prefix_share)/}{} \;
+- #find include -type f -exec $(INSTALL) -m 664 {,$(prefix_share)/}{} \;
+- #find lib -type d -exec $(INSTALL) -d -m 755 {,$(prefix_share)/}{} \;
+- #find lib -type f -exec $(INSTALL) -m 664 {,$(prefix_share)/}{} \;
+- #find libsrc -type d -exec $(INSTALL) -d -m 755 {,$(prefix_share)/}{} \;
+- #find libsrc -type f -exec $(INSTALL) -m 664 {,$(prefix_share)/}{} \;
++# BSD install syntax below
++#find include -type d -exec $(INSTALL) -d -m 755 {,$(prefix_share)/}{} \;
++#find include -type f -exec $(INSTALL) -m 664 {,$(prefix_share)/}{} \;
++#find lib -type d -exec $(INSTALL) -d -m 755 {,$(prefix_share)/}{} \;
++#find lib -type f -exec $(INSTALL) -m 664 {,$(prefix_share)/}{} \;
++#find libsrc -type d -exec $(INSTALL) -d -m 755 {,$(prefix_share)/}{} \;
++#find libsrc -type f -exec $(INSTALL) -m 664 {,$(prefix_share)/}{} \;
+
+
+ # Needs to have a dependency on libs
+-test: $(ALL)
++test: $(ALL)
+ $(MAKE) -C test
+
+ testsuite: $(BINS)
+@@ -251,6 +251,6 @@
+ $(RM) $(SDCC_DEPS)
+ endif
+ endif
+- #if [ -d bin ]; then find bin -type f -exec rm -f {} ';' ; fi
++#if [ -d bin ]; then find bin -type f -exec rm -f {} ';' ; fi
+
+ .PHONY: test testsuite