[routino] - makefiles patch: revert a makefile "fix" which breaks parallel make

Kevin Kofler kkofler at fedoraproject.org
Mon Mar 5 02:46:39 UTC 2012 

commit 9c221549b41a12d480341921d269335ef404a207
Author: Kevin Kofler <Kevin at tigcc.ticalc.org>
Date:   Mon Mar 5 03:46:18 2012 +0100

    - makefiles patch: revert a makefile "fix" which breaks parallel make

 ...-makefiles.patch => routino-2.2-makefiles.patch |   78 +++++++++++++++----
 routino.spec                                       |    3 +-
 2 files changed, 63 insertions(+), 18 deletions(-)
---
diff --git a/routino-2.1.2-makefiles.patch b/routino-2.2-makefiles.patch
similarity index 73%
rename from routino-2.1.2-makefiles.patch
rename to routino-2.2-makefiles.patch
index b1fcc56..eebdba6 100644
--- a/routino-2.1.2-makefiles.patch
+++ b/routino-2.2-makefiles.patch
@@ -1,6 +1,6 @@
-diff -ur routino-2.1.2/doc/Makefile routino-2.1.2-makefiles/doc/Makefile
---- routino-2.1.2/doc/Makefile	2011-10-06 10:05:33.000000000 +0200
-+++ routino-2.1.2-makefiles/doc/Makefile	2011-11-17 21:08:06.000000000 +0100
+diff -ur routino-2.2/doc/Makefile routino-2.2-makefiles/doc/Makefile
+--- routino-2.2/doc/Makefile	2011-10-06 10:05:33.000000000 +0200
++++ routino-2.2-makefiles/doc/Makefile	2012-03-05 03:38:03.000000000 +0100
 @@ -24,9 +24,9 @@
  
  # Files to install
@@ -50,9 +50,9 @@ diff -ur routino-2.1.2/doc/Makefile routino-2.1.2-makefiles/doc/Makefile
  	  done
  
  ########
-diff -ur routino-2.1.2/Makefile routino-2.1.2-makefiles/Makefile
---- routino-2.1.2/Makefile	2011-10-15 16:48:42.000000000 +0200
-+++ routino-2.1.2-makefiles/Makefile	2011-11-17 21:08:06.000000000 +0100
+diff -ur routino-2.2/Makefile routino-2.2-makefiles/Makefile
+--- routino-2.2/Makefile	2011-11-19 20:51:55.000000000 +0100
++++ routino-2.2-makefiles/Makefile	2012-03-05 03:38:03.000000000 +0100
 @@ -20,9 +20,9 @@
  
  # Installation locations
@@ -65,9 +65,9 @@ diff -ur routino-2.1.2/Makefile routino-2.1.2-makefiles/Makefile
  datadir=$(prefix)/share/routino
  
  # Sub-directories and sub-makefiles
-diff -ur routino-2.1.2/src/Makefile routino-2.1.2-makefiles/src/Makefile
---- routino-2.1.2/src/Makefile	2011-10-31 20:13:23.000000000 +0100
-+++ routino-2.1.2-makefiles/src/Makefile	2011-11-17 21:09:29.000000000 +0100
+diff -ur routino-2.2/src/Makefile routino-2.2-makefiles/src/Makefile
+--- routino-2.2/src/Makefile	2012-03-03 15:10:25.000000000 +0100
++++ routino-2.2-makefiles/src/Makefile	2012-03-05 03:40:58.000000000 +0100
 @@ -31,18 +31,8 @@
  
  # Compilation program options
@@ -100,7 +100,16 @@ diff -ur routino-2.1.2/src/Makefile routino-2.1.2-makefiles/src/Makefile
  	     fi ;\
  	  done
  	@cd xml  && $(MAKE) CC="$(CC)" LD="$(LD)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)"
-@@ -150,8 +140,7 @@
+@@ -81,7 +71,7 @@
+ 	           results.o queue.o sorting.o \
+ 	           xmlparse.o tagging.o osmparser.o
+ 
+-planetsplitter : $(PLANETSPLITTER_OBJ)
++planetsplitter : $(PLANETSPLITTER_OBJ) .deps
+ 	$(LD) $(PLANETSPLITTER_OBJ) -o $@ $(LDFLAGS)
+ 
+ ########
+@@ -150,23 +140,20 @@
  ########
  
  xmlparse.c : xmlparse.l
@@ -110,7 +119,25 @@ diff -ur routino-2.1.2/src/Makefile routino-2.1.2-makefiles/src/Makefile
  	@echo Created xmlparse.c
  
  ########
-@@ -174,8 +163,8 @@
+ 
+-%.o : %.c
+-	@[ -d .deps ] || mkdir .deps
++%.o : %.c .deps
+ 	$(CC) -c $(CFLAGS) -DSLIM=0 -DDATADIR=\"$(datadir)\" $< -o $@ -MMD -MP -MF $(addprefix .deps/,$(addsuffix .d,$(basename $@)))
+ 
+-%-slim.o : %.c
+-	@[ -d .deps ] || mkdir .deps
++%-slim.o : %.c .deps
+ 	$(CC) -c $(CFLAGS) -DSLIM=1 -DDATADIR=\"$(datadir)\" $< -o $@ -MMD -MP -MF $(addprefix .deps/,$(addsuffix .d,$(basename $@)))
+ 
+ ########
+ 
+-test:
++test: .FORCE
+ 	cd xml  && $(MAKE) test
+ 	cd test && $(MAKE) test
+ 
+@@ -176,8 +163,8 @@
  	-[ -d $(DESTDIR)$(bindir) ] || mkdir -p $(DESTDIR)$(bindir)
  	@[ -d $(DESTDIR)$(bindir) ] && \
  	  for file in $(EXE); do \
@@ -121,9 +148,26 @@ diff -ur routino-2.1.2/src/Makefile routino-2.1.2-makefiles/src/Makefile
  	  done
  
  ########
-diff -ur routino-2.1.2/src/xml/Makefile routino-2.1.2-makefiles/src/xml/Makefile
---- routino-2.1.2/src/xml/Makefile	2011-10-31 20:04:31.000000000 +0100
-+++ routino-2.1.2-makefiles/src/xml/Makefile	2011-11-17 21:13:33.000000000 +0100
+@@ -202,9 +189,16 @@
+ 
+ ########
+ 
++.deps: .FORCE
++	@[ -d .deps ] || mkdir $@
++
+ include $(D)
+ 
+ ########
+ 
++.FORCE:
++
++########
++
+ top=-top
+ include ../Makefile
+diff -ur routino-2.2/src/xml/Makefile routino-2.2-makefiles/src/xml/Makefile
+--- routino-2.2/src/xml/Makefile	2011-11-20 20:06:50.000000000 +0100
++++ routino-2.2-makefiles/src/xml/Makefile	2012-03-05 03:38:03.000000000 +0100
 @@ -25,11 +25,8 @@
  
  # Program options
@@ -138,9 +182,9 @@ diff -ur routino-2.1.2/src/xml/Makefile routino-2.1.2-makefiles/src/xml/Makefile
  
  # Required to use stdio with files > 2GiB on 32-bit system.
  CFLAGS+=-D_FILE_OFFSET_BITS=64
-diff -ur routino-2.1.2/xml/Makefile routino-2.1.2-makefiles/xml/Makefile
---- routino-2.1.2/xml/Makefile	2011-11-08 10:32:43.000000000 +0100
-+++ routino-2.1.2-makefiles/xml/Makefile	2011-11-17 21:08:06.000000000 +0100
+diff -ur routino-2.2/xml/Makefile routino-2.2-makefiles/xml/Makefile
+--- routino-2.2/xml/Makefile	2011-11-19 20:51:30.000000000 +0100
++++ routino-2.2-makefiles/xml/Makefile	2012-03-05 03:38:03.000000000 +0100
 @@ -39,19 +39,22 @@
  ########
  
diff --git a/routino.spec b/routino.spec
index df883ab..da00b74 100644
--- a/routino.spec
+++ b/routino.spec
@@ -9,7 +9,7 @@ Source0: http://www.routino.org/download/routino-%{version}.tgz
 # documentation for how to set up Routino for use with Marble
 Source1: README-MARBLE.txt
 # customizations/fixes to the (handwritten) makefiles
-Patch0: routino-2.1.2-makefiles.patch
+Patch0: routino-2.2-makefiles.patch
 # remove references to INSTALL.txt/installation.html which we don't ship
 Patch1: routino-1.5.1-no-install-doc.patch
 BuildRequires: flex
@@ -52,6 +52,7 @@ rm -rf %{buildroot}
 * Mon Mar 05 2012 Kevin Kofler <Kevin at tigcc.ticalc.org> - 2.2-1
 - Update to 2.2
 - README-MARBLE.txt: update: data files from 2.1(.x) versions no longer work
+- makefiles patch: revert a makefile "fix" which breaks parallel make
 
 * Sat Jan 14 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.1.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild

More information about the scm-commits mailing list