rpms/z88dk/devel z88dk-1.7-makefile-fixes.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 z88dk.spec, 1.9, 1.10

Kevin Kofler (kkofler) fedora-extras-commits at redhat.com
Thu Dec 6 08:09:08 UTC 2007 

Author: kkofler

Update of /cvs/pkgs/rpms/z88dk/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14734/devel

Modified Files:
	.cvsignore sources z88dk.spec 
Added Files:
	z88dk-1.7-makefile-fixes.patch 
Log Message:
- don't try to build target libs with host CFLAGS
- fix buggy makefiles leading to silently missing libraries

z88dk-1.7-makefile-fixes.patch:

--- NEW FILE z88dk-1.7-makefile-fixes.patch ---
diff -ur z88dk/libsrc/fcntl/dummy/Makefile z88dk-makefile-fixes/libsrc/fcntl/dummy/Makefile
--- z88dk/libsrc/fcntl/dummy/Makefile	2007-06-03 17:13:05.000000000 +0200
+++ z88dk-makefile-fixes/libsrc/fcntl/dummy/Makefile	2007-12-06 08:53:02.000000000 +0100
@@ -6,7 +6,7 @@
 	@echo ''
 	@echo '---> Building NDOS library <---'
 	@echo ''
-	$(LIBLINKER) -x$(OUTPUT_DIRECTORY)/ndos @ndoslist
+	$(LIBLINKER) -x../../$(OUTPUT_DIRECTORY)/ndos @ndoslist
 
 clean:
 	$(RM) *.sym *.map zcc_opt.def *.o*
diff -ur z88dk/libsrc/genmath/Makefile z88dk-makefile-fixes/libsrc/genmath/Makefile
--- z88dk/libsrc/genmath/Makefile	2007-06-11 14:45:08.000000000 +0200
+++ z88dk-makefile-fixes/libsrc/genmath/Makefile	2007-12-06 08:53:25.000000000 +0100
@@ -22,7 +22,7 @@
 all: genmath
 
 genmath: $(OBJECTS)
-	$(LIBLINKER) -x$../$(OUTPUT_DIRECTORY)/gen_math @genlist
+	$(LIBLINKER) -x../$(OUTPUT_DIRECTORY)/gen_math @genlist
 
 .c.o:
 	zcc $(CFLAGS) $*.c
diff -ur z88dk/libsrc/malloc/Makefile z88dk-makefile-fixes/libsrc/malloc/Makefile
--- z88dk/libsrc/malloc/Makefile	2007-06-11 14:45:09.000000000 +0200
+++ z88dk-makefile-fixes/libsrc/malloc/Makefile	2007-12-06 08:53:37.000000000 +0100
@@ -6,7 +6,7 @@
 include ../Make.config
 
 default:
-	$(LIBLINKER) -x$../$(OUTPUT_DIRECTORY)/malloc @malllist
+	$(LIBLINKER) -x../$(OUTPUT_DIRECTORY)/malloc @malllist
 
 clean:
 	$(RM) *.o* *.sym *.map *~ *.err zcc_opt.def *.i 
diff -ur z88dk/libsrc/time/Makefile z88dk-makefile-fixes/libsrc/time/Makefile
--- z88dk/libsrc/time/Makefile	2006-06-18 19:59:40.000000000 +0200
+++ z88dk-makefile-fixes/libsrc/time/Makefile	2007-12-06 08:52:10.000000000 +0100
@@ -11,6 +11,8 @@
 
 lzx: spectrum_time
 
+lnewbrain: time newbrain_time
+
 time: gmtime.o localtime.o mktime.o
 
 .c.o:
@@ -25,6 +27,9 @@
 spectrum_time:
 	cd spectrum ; $(MAKE) ; cd ..
 
+newbrain_time:
+	cd newbrain ; $(MAKE) ; cd ..
+
 clean:
 	$(RM) *.o* *.i *.sym *.map zcc_opt.def
 	$(RM) zx81/*.o*
diff -ur z88dk/libsrc/z88math/Makefile z88dk-makefile-fixes/libsrc/z88math/Makefile
--- z88dk/libsrc/z88math/Makefile	2007-06-03 17:13:07.000000000 +0200
+++ z88dk-makefile-fixes/libsrc/z88math/Makefile	2007-12-06 08:54:01.000000000 +0100
@@ -17,7 +17,7 @@
 
 
 z88math: $(OBJECTS)
-	$(LIBLINKER) -x$(OUTPUT_DIRECTORY)/z88_math @z88list
+	$(LIBLINKER) -x../$(OUTPUT_DIRECTORY)/z88_math @z88list
 
 .c.o:
 	zcc $(CFLAGS) -math-z88 -D__Z88__ -D__NATIVE_MATH__ $*.c
diff -ur z88dk/libsrc/zxmath/Makefile z88dk-makefile-fixes/libsrc/zxmath/Makefile
--- z88dk/libsrc/zxmath/Makefile	2007-06-03 17:13:07.000000000 +0200
+++ z88dk-makefile-fixes/libsrc/zxmath/Makefile	2007-12-06 08:54:30.000000000 +0100
@@ -9,19 +9,19 @@
 
 zx_mathtiny:
 	rm -f *.o* ../mzx_tiny.lib
-	$(LIBLINKER) -DFORzx -DTINYMODE -x$(OUTPUT_DIRECTORY)/mzx_tiny @zxmlist
+	$(LIBLINKER) -DFORzx -DTINYMODE -x../$(OUTPUT_DIRECTORY)/mzx_tiny @zxmlist
 
 zx81_mathtiny:
 	rm -f *.o* ../m81_tiny.lib
-	$(LIBLINKER) -DFORzx81 -DTINYMODE -x$(OUTPUT_DIRECTORY)/m81_tiny @zxmlist
+	$(LIBLINKER) -DFORzx81 -DTINYMODE -x../$(OUTPUT_DIRECTORY)/m81_tiny @zxmlist
 
 zx_math:
 	rm -f *.o* ../mzx.lib
-	$(LIBLINKER) -DFORzx -x$(OUTPUT_DIRECTORY)/mzx @zxmlist
+	$(LIBLINKER) -DFORzx -x../$(OUTPUT_DIRECTORY)/mzx @zxmlist
 
 zx81_math:
 	rm -f *.o* ../m81.lib
-	$(LIBLINKER) -DFORzx81 -x$(OUTPUT_DIRECTORY)/m81 @zxmlist
+	$(LIBLINKER) -DFORzx81 -x../$(OUTPUT_DIRECTORY)/m81 @zxmlist
 
 clean:
 	rm -f *.o* *.sym *.map *.err 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/z88dk/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	13 Jan 2006 00:19:34 -0000	1.2
+++ .cvsignore	6 Dec 2007 08:08:32 -0000	1.3
@@ -1 +1 @@
-z88dk-src-1.6.tgz
+z88dk-src-1.7.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/z88dk/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	13 Jan 2006 00:19:34 -0000	1.2
+++ sources	6 Dec 2007 08:08:32 -0000	1.3
@@ -1 +1 @@
-5fd75dea26da3c3d863b9e15f6524af9  z88dk-src-1.6.tgz
+cbb910bcb8beb0b15b101a4420d3fb25  z88dk-src-1.7.tgz


Index: z88dk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/z88dk/devel/z88dk.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- z88dk.spec	6 Dec 2007 06:58:48 -0000	1.9
+++ z88dk.spec	6 Dec 2007 08:08:32 -0000	1.10
@@ -5,7 +5,8 @@
 License: Artistic clarified
 Group: Development/Tools
 Source: http://downloads.sourceforge.net/z88dk/z88dk-src-%{version}.tgz
-Patch: z88make.patch
+Patch0: z88make.patch
+Patch1: z88dk-1.7-makefile-fixes.patch
 URL: http://z88dk.sourceforge.net/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 ExcludeArch: x86_64 ia64 ppc64
@@ -17,7 +18,9 @@
 
 %prep
 %setup -q -n z88dk
-%patch0 -p0 -b Makefile
+%patch0 -p0
+# Lots of buggy makefiles there
+%patch1 -p1
 %{_bindir}/find . -depth -name CVS -type d -exec %{__rm} -rf {} \;
 # Separate manpages from other docs and fix their permissions
 %{__mv} doc/netman .
@@ -38,6 +41,9 @@
 # Note: do not use %{?_smp_mflags} with make because the Makefiles don't support parallel builds
 %{__make} clean
 %{__make} -e
+# libs are target libraries, they won't build with host CFLAGS
+unset CFLAGS
+export CFLAGS
 %{__make} -e libs
 
 %install
@@ -59,7 +65,7 @@
 %doc doc/fileio.txt doc/lib3d.txt doc/options.txt doc/packages.txt
 %doc doc/platforms.txt doc/retarget.txt doc/stdio.txt doc/ti.txt doc/z80asm.txt
 %doc doc/zxscrdrv.txt
-%doc EXTENSIONS LICENSE www
+%doc EXTENSIONS LICENSE
 # Examples might be worth putting in subpackage
 %doc examples
 %{_bindir}/appmake
@@ -75,6 +81,8 @@
 - use preferred SF URL
 - mention TI calculators in description
 - mkdir buildroot in install
+- don't try to build target libs with host CFLAGS
+- fix buggy makefiles leading to silently missing libraries
 
 * Thu Sep 27 2007 Tom "spot" Callaway <tcallawa at redhat.com> 1.6-11.1
 - no ppc64

More information about the fedora-extras-commits mailing list