[z88dk] update to 20150221 nightly (#967408, #1037409)
Kevin Kofler
kkofler at fedoraproject.org
Sun Feb 22 02:12:54 UTC 2015
commit 9ae1f5df756bcd1f030fa4aa76e43c7acbcd31bf
Author: Kevin Kofler <Kevin at tigcc.ticalc.org>
Date: Sun Feb 22 03:12:45 2015 +0100
update to 20150221 nightly (#967408, #1037409)
* Sun Feb 22 2015 Kevin Kofler <Kevin at tigcc.ticalc.org> - 1.10.1-6.20150221
- update to 20150221 nightly (fixes licensing issue #967408 and FTBFS #1037409)
- drop z80asm hunks of 64bit patch, fixed upstream
- rebase makefile-usr-share patch
- Conflicts: z80asm until we sort out the file conflict (#823174)
.gitignore | 1 +
sources | 2 +-
z88dk-1.10-64bit.patch | 36 ------------------------------------
z88dk-1.10-makefile-usr-share.patch | 16 +++++++++++-----
z88dk.spec | 19 ++++++++++++++++++-
5 files changed, 31 insertions(+), 43 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index f4164e9..829c7dc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
z88dk-src-1.9.tgz
/z88dk-src-1.10.tgz
/z88dk-1.10.1.tgz
+/z88dk-20150221.tgz
diff --git a/sources b/sources
index 2a08eaf..c233d2e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7898bc04f9e5275845d6117cafa74096 z88dk-1.10.1.tgz
+e9d7e73e58870766123dd657fe11e8f7 z88dk-20150221.tgz
diff --git a/z88dk-1.10-64bit.patch b/z88dk-1.10-64bit.patch
index d4109e8..e3737df 100644
--- a/z88dk-1.10-64bit.patch
+++ b/z88dk-1.10-64bit.patch
@@ -63,39 +63,3 @@ diff -ur z88dk/src/sccz80/primary.c z88dk-64bit/src/sccz80/primary.c
-diff -ur z88dk/src/z80asm/config.h z88dk-64bit/src/z80asm/config.h
---- z88dk/src/z80asm/config.h 2012-05-25 04:00:28.000000000 +0200
-+++ z88dk-64bit/src/z80asm/config.h 2012-11-06 23:40:53.000000000 +0100
-@@ -150,6 +150,12 @@
- #define MAXCODESIZE 65536
- #endif
-
-+#ifdef __linux__
-+#include <endian.h>
-+#if __BYTE_ORDER == __BIG_ENDIAN
-+#define ENDIAN 1
-+#endif
-+#else
- /* Some clever config-ing if we're using GNUC */
- #ifdef __BIG_ENDIAN__
- /* Sadly the compiler on OS-X falls over with the #if below... */
-@@ -161,6 +167,7 @@
- #endif
- #endif /* __GNUC__ */
- #endif
-+#endif
-
- /* File name extension separator */
- #ifdef QDOS
-diff -ur z88dk/src/z80asm/options.c z88dk-64bit/src/z80asm/options.c
---- z88dk/src/z80asm/options.c 2012-11-04 04:00:45.000000000 +0100
-+++ z88dk-64bit/src/z80asm/options.c 2012-11-06 23:40:53.000000000 +0100
-@@ -395,7 +395,7 @@
-
- else if ( *flagid == 'r' )
- {
-- sscanf( flagid + 1, "%x", &EXPLICIT_ORIGIN );
-+ sscanf( flagid + 1, "%lx", &EXPLICIT_ORIGIN );
- deforigin = ON; /* explicit origin has been defined */
- }
-
diff --git a/z88dk-1.10-makefile-usr-share.patch b/z88dk-1.10-makefile-usr-share.patch
index 5c16d04..b828c07 100644
--- a/z88dk-1.10-makefile-usr-share.patch
+++ b/z88dk-1.10-makefile-usr-share.patch
@@ -1,6 +1,6 @@
diff -ur z88dk/Makefile z88dk-makefile-usr-share/Makefile
---- z88dk/Makefile 2012-04-19 04:01:38.000000000 +0200
-+++ z88dk-makefile-usr-share/Makefile 2012-11-06 22:29:36.000000000 +0100
+--- z88dk/Makefile 2015-02-05 17:11:42.000000000 +0100
++++ z88dk-makefile-usr-share/Makefile 2015-02-22 03:04:49.000000000 +0100
@@ -7,7 +7,7 @@
# ---> Configurable parameters are below his point
@@ -11,7 +11,7 @@ diff -ur z88dk/Makefile z88dk-makefile-usr-share/Makefile
# The default machine, the lib/config/DEFAULT.cfg file is copied to zcc.cfg
@@ -18,7 +18,7 @@
- all: setup appmake copt zcpp sccz80 z80asm zcc z80nm config
+ all: setup appmake copt zcpp sccz80 z80asm zcc zpragma zx7 z80nm ticks z80svg config
setup:
- echo '#define PREFIX "${prefix}$"/lib/z88dk"' > src/config.h
@@ -19,16 +19,22 @@ diff -ur z88dk/Makefile z88dk-makefile-usr-share/Makefile
echo '#define UNIX 1' >> src/config.h
appmake:
-@@ -57,9 +57,9 @@
+@@ -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_share)/z88dk/lib/config
++ cp -R lib/config/* $(DESTDIR)/$(prefix_share)/z88dk/lib/config/
++ find $(DESTDIR)/$(prefix_share)/z88dk/lib/config -type f | xargs chmod 644
+ mkdir -p $(DESTDIR)/$(prefix_share)/z88dk/lib/clibs
+ cp -R lib/clibs/* $(DESTDIR)/$(prefix_share)/z88dk/lib/clibs/
+ find $(DESTDIR)/$(prefix_share)/z88dk/lib/clibs -type f | xargs chmod 644
-
install:
+ mkdir -p -m 755 $(DESTDIR)/$(prefix)/bin $(DESTDIR)/$(prefix_share)/z88dk
diff --git a/z88dk.spec b/z88dk.spec
index 63b701d..ab767fb 100644
--- a/z88dk.spec
+++ b/z88dk.spec
@@ -1,12 +1,23 @@
+%global nightly 20150221
+
Name: z88dk
+# We use post-release snapshot versioning, because the source code has no idea
+# what version it is supposed to be. (README.1st still claims to be from version
+# 1.9 when they already released 1.10 and 1.10.1.)
Version: 1.10.1
-Release: 5%{?dist}
+Release: 6%{?nightly:.%{nightly}cvs}%{?dist}
Summary: A Z80 cross compiler
License: Artistic clarified
URL: http://www.z88dk.org/
+%if 0%{?nightly}
+Source: http://nightly.z88dk.org/z88dk-%{nightly}.tgz
+%else
Source: http://downloads.sourceforge.net/z88dk/z88dk-%{version}.tgz
+%endif
Patch0: z88dk-1.10-makefile-usr-share.patch
Patch1: z88dk-1.10-64bit.patch
+# FIXME: sort out the file conflict (#823174)
+Conflicts: z80asm
%description
z88dk is a Z80 cross compiler capable of generating binary files for a variety
@@ -69,6 +80,12 @@ cp -p netman/man3z/* %{buildroot}%{_mandir}/man3z
%{_mandir}/man3z/
%changelog
+* Sun Feb 22 2015 Kevin Kofler <Kevin at tigcc.ticalc.org> - 1.10.1-6.20150221
+- update to 20150221 nightly (fixes licensing issue #967408 and FTBFS #1037409)
+- drop z80asm hunks of 64bit patch, fixed upstream
+- rebase makefile-usr-share patch
+- Conflicts: z80asm until we sort out the file conflict (#823174)
+
* Mon Aug 18 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.10.1-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
More information about the scm-commits
mailing list