summarylogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.SRCINFO10
-rw-r--r--PKGBUILD10
-rw-r--r--fix-build.patch47
-rw-r--r--fix-makefile-v2.0.patch46
-rw-r--r--fix-makefile.patch54
5 files changed, 56 insertions, 111 deletions
diff --git a/.SRCINFO b/.SRCINFO
index f3d302a4d83f..ddbbe9f09c6b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = z88dk
pkgdesc = Developement kit for Z80 computers
- pkgver = 1.99C
+ pkgver = 2.0
pkgrel = 1
url = http://z88dk.org
arch = i686
@@ -9,11 +9,11 @@ pkgbase = z88dk
depends = perl
depends = libxml2
backup = etc/profile.d/z88dk.sh
- source = http://downloads.sourceforge.net/project/z88dk/z88dk/1.99C/z88dk-src-1.99C.tgz
- source = fix-makefile.patch
+ source = http://downloads.sourceforge.net/project/z88dk/z88dk/2.0/z88dk-src-2.0.tgz
+ source = fix-makefile-v2.0.patch
source = z88dk.sh
- sha256sums = f60932517116195993236cf28668522a3cbd19409cb430030754c7f0c0cb3a77
- sha256sums = 78aaeb862a714c632e7ed16872ada2c4e246291be716ddb1e7613a2d28405e5c
+ sha256sums = 285fb55858b3860fb7a152d6090eedd355a33863812d94ef56368825547d5506
+ sha256sums = 8a275f9240cbc89e7d7443cfe35875c3f1ffc2c57bd95375dee250d8031ba509
sha256sums = 4eef7c67e5b142db3006a4076876cdae9f386a7b94a66841a5a8fac869bea156
pkgname = z88dk
diff --git a/PKGBUILD b/PKGBUILD
index 39f70f09041f..d20cb0ac121f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
# Maintainer: Ábel Futó <lebaotuf+arch at gmail dot com>
# Contributor: John Schug <xtr.xtrnet@gmail.com>
pkgname=z88dk
-pkgver=1.99C
+pkgver=2.0
pkgrel=1
pkgdesc="Developement kit for Z80 computers"
arch=('i686' 'x86_64')
@@ -10,16 +10,16 @@ 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.patch
+ fix-makefile-v2.0.patch
z88dk.sh)
-sha256sums=('f60932517116195993236cf28668522a3cbd19409cb430030754c7f0c0cb3a77'
- '78aaeb862a714c632e7ed16872ada2c4e246291be716ddb1e7613a2d28405e5c'
+sha256sums=('285fb55858b3860fb7a152d6090eedd355a33863812d94ef56368825547d5506'
+ '8a275f9240cbc89e7d7443cfe35875c3f1ffc2c57bd95375dee250d8031ba509'
'4eef7c67e5b142db3006a4076876cdae9f386a7b94a66841a5a8fac869bea156')
prepare() {
cd "${srcdir}/${pkgname}"
- patch -Np1 < ../fix-makefile.patch
+ patch -Np0 < ../fix-makefile-v2.0.patch
}
diff --git a/fix-build.patch b/fix-build.patch
deleted file mode 100644
index e7d109f6a677..000000000000
--- a/fix-build.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-diff -Naur z88dk.old/build.sh z88dk/build.sh
---- z88dk.old/build.sh 2017-01-02 20:00:20.000000000 +0100
-+++ z88dk/build.sh 2017-05-06 00:15:52.089731837 +0200
-@@ -49,7 +49,7 @@
-
- export INSTALL
-
--$MAKE -e
-+$MAKE
- $MAKE -C `pwd`/libsrc
- $MAKE -C `pwd`/libsrc install
- $MAKE -C `pwd`/libsrc/_DEVELOPMENT
-diff -Naur z88dk.old/Makefile z88dk/Makefile
---- z88dk.old/Makefile 2016-09-09 20:00:16.000000000 +0200
-+++ z88dk/Makefile 2017-05-06 00:20:51.113124076 +0200
-@@ -78,12 +78,12 @@
- cd libsrc ; $(MAKE) install
-
- install-libs:
-- mkdir -p $(prefix)/lib/z88dk/lib/config
-- cp -R lib/config/* $(prefix)/lib/z88dk/lib/config/
-- find $(prefix)/lib/z88dk/lib/config -type f | xargs chmod 644
-- mkdir -p $(prefix)/lib/z88dk/lib/clibs
-- cp -R lib/clibs/* $(prefix)/lib/z88dk/lib/clibs/
-- find $(prefix)/lib/z88dk/lib/clibs -type f | xargs chmod 644
-+ mkdir -p $(DESTDIR)/$(prefix)/lib/z88dk/lib/config
-+ cp -R lib/config/* $(DESTDIR)/$(prefix)/lib/z88dk/lib/config/
-+ find $(DESTDIR)/$(prefix)/lib/z88dk/lib/config -type f | xargs chmod 644
-+ mkdir -p $(DESTDIR)/$(prefix)/lib/z88dk/lib/clibs
-+ cp -R lib/clibs/* $(DESTDIR)/$(prefix)/lib/z88dk/lib/clibs/
-+ find $(DESTDIR)/$(prefix)/lib/z88dk/lib/clibs -type f | xargs chmod 644
-
- install:
- mkdir -p -m 755 $(DESTDIR)/$(prefix)/bin $(DESTDIR)/$(prefix_share)/z88dk
-@@ -95,7 +95,12 @@
- cd src/cpp ; $(MAKE) PREFIX=$(DESTDIR)/$(prefix) install
- cd src/sccz80 ; $(MAKE) PREFIX=$(DESTDIR)/$(prefix) install
- cd src/z80asm ; $(MAKE) PREFIX=$(DESTDIR)/$(prefix) install
-+ cd src/z80nm ; $(MAKE) PREFIX=$(DESTDIR)/$(prefix) install
- cd src/zcc ; $(MAKE) PREFIX=$(DESTDIR)/$(prefix) install
-+ cd src/scanner ; $(MAKE) PREFIX=$(DESTDIR)/$(prefix) install
-+ cd src/zx7 ; $(MAKE) PREFIX=$(DESTDIR)/$(prefix) install
-+ cd src/ticks ; $(MAKE) PREFIX=$(DESTDIR)/$(prefix) install
-+ cd support/graphics ; $(MAKE) PREFIX=$(DESTDIR)/$(prefix) install
- ./config.sh $(prefix_share)/z88dk/ $(DEFAULT)
- cp -R -p include $(DESTDIR)/$(prefix_share)/z88dk
- cp -R -p lib $(DESTDIR)/$(prefix_share)/z88dk
diff --git a/fix-makefile-v2.0.patch b/fix-makefile-v2.0.patch
new file mode 100644
index 000000000000..56db47e64162
--- /dev/null
+++ b/fix-makefile-v2.0.patch
@@ -0,0 +1,46 @@
+--- 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.patch b/fix-makefile.patch
deleted file mode 100644
index af865b9359d5..000000000000
--- a/fix-makefile.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-diff -Naur z88dk.old/Makefile z88dk/Makefile
---- z88dk.old/Makefile 2018-09-06 05:00:11.000000000 +0200
-+++ z88dk/Makefile 2019-02-09 12:59:16.622305360 +0100
-@@ -25,11 +25,6 @@
- EXEC_PREFIX ?=
- CROSS ?= 0
-
--ifneq (, $(shell which ccache))
-- OCC := $(CC)
-- CC := ccache $(CC)
--endif
--
- SDCC_PATH = /tmp/sdcc
- Z88DK_PATH = $(shell pwd)
-
-@@ -38,7 +33,7 @@
- export CC INSTALL CFLAGS EXEC_PREFIX CROSS
-
- all: setup appmake copt zcpp ucpp sccz80 z80asm zcc zpragma zx7 z80nm zobjcopy \
-- lstmanip ticks z80svg font2pv1000 testsuite z88dk-lib zsdcc
-+ lstmanip ticks z80svg font2pv1000 testsuite z88dk-lib
-
- setup:
- $(shell if [ "${git_count}" != "" ]; then \
-@@ -64,9 +59,9 @@
- --disable-avr-port --disable-ds390-port \
- --disable-ds400-port --disable-hc08-port \
- --disable-pic-port --disable-pic14-port \
-- --disable-pic16-port --disable-stm8-port \
-+ --disable-pic16-port --disable-stm8-port \
- --disable-tlcs90-port --disable-s08-port \
-- --disable-ucsim --disable-device-lib \
-+ --disable-ucsim --disable-device-lib \
- --disable-packihx
- cd $(SDCC_PATH) && $(MAKE)
- cd $(SDCC_PATH) && mv ./bin/sdcc $(Z88DK_PATH)/bin/zsdcc
-@@ -143,7 +138,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
-@@ -204,6 +199,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
-+