shithub: puzzles

Download patch

ref: 36cee4e2796c23da15d3276e88416ad1ce035c4a
parent: 178f87a79ef2b1fe3b80a2eca2040ef4eb7f8a5f
author: Simon Tatham <anakin@pobox.com>
date: Sun Apr 25 10:57:21 EDT 2010 

Modification of a patch from Debian: eliminate the endless rebuilds
of basically unchanged binaries due to the compulsory rebuild of
version.o. version.o now depends normally on version2.def, which is
constructed using much the same if statements that version.o used to
use, except that it's not overwritten at all if its contents don't
need to change.

[originally from svn r8931]


--- a/Recipe
+++ b/Recipe
@@ -110,27 +110,41 @@
 # For Unix, we also need the gross MD5 hack that causes automatic
 # version number selection in release source archives.
 !begin gtk
-version.o: FORCE;
-FORCE:
+version.o: version.c version2.def
+	$(CC) $(COMPAT) $(XFLAGS) $(CFLAGS) `cat version2.def` -c version.c
+version2.def: FORCE
 	if test -z "$(VER)" && test -f manifest && md5sum -c manifest; then \
-		$(CC) $(COMPAT) $(XFLAGS) $(CFLAGS) `cat version.def` -c version.c; \
+		cat version.def > version2.def.new; \
 	elif test -z "$(VER)" && test -d .svn && svnversion . >/dev/null 2>&1; then \
-		$(CC) $(COMPAT) $(XFLAGS) $(CFLAGS) "-DREVISION=`svnversion .`" -c version.c; \
+		echo "-DREVISION=`svnversion .`" >version2.def.new; \
 	else \
-		$(CC) $(COMPAT) $(XFLAGS) $(CFLAGS) $(VER) -c version.c; \
+		echo "$(VER)" >version2.def.new; \
+	fi && \
+	if diff -q version2.def.new version2.def; then \
+		rm version2.def.new; \
+	else \
+		mv version2.def.new version2.def; \
 	fi
+.PHONY: FORCE
 !end
 !specialobj gtk version
 !begin nestedvm
-version.o: FORCE;
-FORCE:
+version.o: version.c version2.def
+	$(CC) $(COMPAT) $(XFLAGS) $(CFLAGS) `cat version2.def` -c version.c
+version2.def: FORCE
 	if test -z "$(VER)" && test -f manifest && md5sum -c manifest; then \
-		$(CC) $(COMPAT) $(XFLAGS) $(CFLAGS) `cat version.def` -c version.c; \
+		cat version.def > version2.def.new; \
 	elif test -z "$(VER)" && test -d .svn && svnversion . >/dev/null 2>&1; then \
-		$(CC) $(COMPAT) $(XFLAGS) $(CFLAGS) "-DREVISION=`svnversion .`" -c version.c; \
+		echo "-DREVISION=`svnversion .`" >version2.def.new; \
 	else \
-		$(CC) $(COMPAT) $(XFLAGS) $(CFLAGS) $(VER) -c version.c; \
+		echo "$(VER)" >version2.def.new; \
+	fi && \
+	if diff -q version2.def.new version2.def; then \
+		rm version2.def.new; \
+	else \
+		mv version2.def.new version2.def; \
 	fi
+.PHONY: FORCE
 !end
 !specialobj nestedvm version
 # For OS X, this is made more fiddly by the fact that we don't have
@@ -137,25 +151,24 @@
 # md5sum readily available. We do, however, have `md5 -r' which
 # generates _nearly_ the same output, but it has no check function.
 !begin osx
-version.ppc.o: FORCE;
-FORCE:
+version.ppc.o: version.c version2.def
+	$(CC) -arch ppc $(COMPAT) $(XFLAGS) $(CFLAGS) `cat version2.def` -c version.c
+version.i386.o: version.c version2.def
+	$(CC) -arch i386 $(COMPAT) $(XFLAGS) $(CFLAGS) `cat version2.def` -c version.c
+version2.def: FORCE
 	if test -z "$(VER)" && test -f manifest && (md5 -r `awk '{print $$2}' manifest` | diff -w manifest -); then \
-		$(CC) -arch ppc $(COMPAT) $(XFLAGS) $(CFLAGS) `cat version.def` -c version.c -o version.ppc.o; \
+		cat version.def > version2.def.new; \
 	elif test -z "$(VER)" && test -d .svn && svnversion . >/dev/null 2>&1; then \
-		$(CC) -arch ppc $(COMPAT) $(XFLAGS) $(CFLAGS) "-DREVISION=`svnversion .`" -c version.c -o version.ppc.o; \
+		echo "-DREVISION=`svnversion .`" >version2.def.new; \
 	else \
-		$(CC) -arch ppc $(COMPAT) $(XFLAGS) $(CFLAGS) $(VER) -c version.c -o version.ppc.o; \
-	fi
-version.i386.o: FORCE2;
-FORCE2:
-	if test -z "$(VER)" && test -f manifest && (md5 -r `awk '{print $$2}' manifest` | diff -w manifest -); then \
-		$(CC) -arch i386 $(COMPAT) $(XFLAGS) $(CFLAGS) `cat version.def` -c version.c -o version.i386.o; \
-	elif test -z "$(VER)" && test -d .svn && svnversion . >/dev/null 2>&1; then \
-		$(CC) -arch i386 $(COMPAT) $(XFLAGS) $(CFLAGS) "-DREVISION=`svnversion .`" -c version.c -o version.i386.o; \
+		echo "$(VER)" >version2.def.new; \
+	fi && \
+	if diff -q version2.def.new version2.def; then \
+		rm version2.def.new; \
 	else \
-		$(CC) -arch i386 $(COMPAT) $(XFLAGS) $(CFLAGS) $(VER) -c version.c -o version.i386.o; \
+		mv version2.def.new version2.def; \
 	fi
-!end
+.PHONY: FORCE
 !specialobj osx version
 
 # make install for Unix.