summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorÁbel Futó2016-08-21 20:46:30 +0200
committerÁbel Futó2016-08-21 20:46:30 +0200
commita7809bf260b6074d99550b4a5b5100f1d6c08d6b (patch)
tree5282f3a04673e8f034a4f2f401230ad15a52a64a
parent54e0bb0c0d4922e45dd996fbd4baffbdfe7fa835 (diff)
downloadaur-a7809bf260b6074d99550b4a5b5100f1d6c08d6b.tar.gz
Updated to 1.99A
-rw-r--r--.SRCINFO12
-rw-r--r--PKGBUILD26
-rw-r--r--fix-build.patch34
3 files changed, 58 insertions, 14 deletions
diff --git a/.SRCINFO b/.SRCINFO
index b817184d20c..2804b2964c8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,16 +1,18 @@
pkgbase = z88dk
pkgdesc = A small C compiler for the Zilog Z80.
- pkgver = 1.10.1
- pkgrel = 2
+ pkgver = 1.99A
+ pkgrel = 1
url = http://z88dk.org
arch = i686
arch = x86_64
license = custom:The Clarified Artistic License
- depends = glibc
+ depends = perl
backup = etc/profile.d/z88dk.sh
- source = http://downloads.sourceforge.net/project/z88dk/z88dk/1.10/z88dk-1.10.1.tgz
+ source = http://downloads.sourceforge.net/project/z88dk/z88dk/1.99A/z88dk-src-1.99A-1.tgz
+ source = fix-build.patch
source = z88dk.sh
- md5sums = 7898bc04f9e5275845d6117cafa74096
+ md5sums = 1b70d264bd5b03185894e9e903c15517
+ md5sums = 78871c2414844d5fc812d8994a2e2121
md5sums = a7d56837ef0cc9fbb05d2e21ddcc335c
pkgname = z88dk
diff --git a/PKGBUILD b/PKGBUILD
index 0fd50e5be57..8861044b97b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,36 +1,44 @@
# Maintainer: Ábel Futó <lebaotuf+arch at gmail dot com>
# Contributor: John Schug <xtr.xtrnet@gmail.com>
pkgname=z88dk
-pkgver=1.10.1
-_pkgver=1.10
-pkgrel=2
+pkgver=1.99A
+#_pkgver=1.99A
+pkgrel=1
pkgdesc="A small C compiler for the Zilog Z80."
arch=('i686' 'x86_64')
url="http://z88dk.org"
license=('custom:The Clarified Artistic License')
-depends=('glibc')
+depends=('perl')
backup=(etc/profile.d/z88dk.sh)
-source=(http://downloads.sourceforge.net/project/z88dk/z88dk/${_pkgver}/${pkgname}-${pkgver}.tgz
+source=(http://downloads.sourceforge.net/project/z88dk/z88dk/${pkgver}/${pkgname}-src-${pkgver}-1.tgz
+ fix-build.patch
z88dk.sh)
-md5sums=('7898bc04f9e5275845d6117cafa74096'
+md5sums=('1b70d264bd5b03185894e9e903c15517'
+ '78871c2414844d5fc812d8994a2e2121'
'a7d56837ef0cc9fbb05d2e21ddcc335c')
prepare() {
cd "${srcdir}/${pkgname}"
- # Do not override bool definition
- sed -i "s/typedef int bool;//" src/z80asm/types.h
+ patch -Np1 < ../fix-build.patch
+ chmod +x config.sh
}
build() {
cd "${srcdir}/${pkgname}"
- make
+ export PATH="${srcdir}/${pkgname}"/bin:$PATH
+ export ZCCCFG="${srcdir}/${pkgname}"/lib/config
+ export Z80_OZFILES="${srcdir}/${pkgname}"/lib/
+ export MAKEFLAGS="-j1"
+ ./build.sh
+ make libs
}
package() {
cd "${srcdir}/${pkgname}"
make prefix="/usr" DESTDIR="${pkgdir}" install
+ make prefix="/usr" DESTDIR="${pkgdir}" install-libs
install -dm755 ${pkgdir}/etc/profile.d/
install -m755 ${srcdir}/z88dk.sh ${pkgdir}/etc/profile.d/
diff --git a/fix-build.patch b/fix-build.patch
new file mode 100644
index 00000000000..5a6c0c5b7f8
--- /dev/null
+++ b/fix-build.patch
@@ -0,0 +1,34 @@
+diff -Naur z88dk.old/build.sh z88dk/build.sh
+--- z88dk.old/build.sh 2013-11-20 04:00:16.000000000 +0100
++++ z88dk/build.sh 2016-08-21 15:37:40.462354542 +0200
+@@ -32,7 +32,7 @@
+ INSTALL="ginstall"
+ fi
+
+-$MAKE -e
++$MAKE
+ $MAKE -C `pwd`/libsrc
+ $MAKE -C `pwd`/libsrc install
+
+diff -Naur z88dk.old/Makefile z88dk/Makefile
+--- z88dk.old/Makefile 2015-02-05 17:11:42.000000000 +0100
++++ z88dk/Makefile 2016-08-21 15:39:13.704352445 +0200
+@@ -73,12 +73,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