[Pkg-sysvinit-commits] r1254 - sysvinit/trunk/debian

[pere at alioth.debian.org]

Author: pere
Date: 2008-03-02 10:30:47 +0000 (Sun, 02 Mar 2008)
New Revision: 1254

Modified:
   sysvinit/trunk/debian/changelog
   sysvinit/trunk/debian/rules
Log:
  * Use $(MAKE) instead of make in debian/rules, to make it easier to
    use make -j.
  * Adjust debian/rules to support cross building (Closes: #466148).

Modified: sysvinit/trunk/debian/changelog
===================================================================
--- sysvinit/trunk/debian/changelog	2008-03-01 23:33:46 UTC (rev 1253)
+++ sysvinit/trunk/debian/changelog	2008-03-02 10:30:47 UTC (rev 1254)
@@ -1,3 +1,11 @@
+sysvinit (2.86.ds1-55) UNRELEASED; urgency=low
+
+  * Use $(MAKE) instead of make in debian/rules, to make it easier to
+    use make -j.
+  * Adjust debian/rules to support cross building (Closes: #466148).
+
+ -- Petter Reinholdtsen <pere at localhost>  Sun, 02 Mar 2008 11:27:34 +0100
+
 sysvinit (2.86.ds1-54) unstable; urgency=low
 
   * Fix shell quoting typo in conffile removal code (Closes: #464869).

Modified: sysvinit/trunk/debian/rules
===================================================================
--- sysvinit/trunk/debian/rules	2008-03-01 23:33:46 UTC (rev 1253)
+++ sysvinit/trunk/debian/rules	2008-03-02 10:30:47 UTC (rev 1254)
@@ -14,6 +14,15 @@
 DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
 export DEB_HOST_ARCH_OS := $(shell dpkg-architecture -qDEB_HOST_ARCH_OS 2>/dev/null || true)
 
+# Handle cross builds
+ifneq ($(DEB_HOST_GNU_TYPE),$(DEB_BUILD_GNU_TYPE))
+CROSS=CC=$(DEB_HOST_GNU_TYPE)-gcc
+# CROSS is passed to make, CC is called directly.
+CC=$(DEB_HOST_GNU_TYPE)-gcc
+else
+CC=cc
+endif
+
 # Handle fact that sarge dpkg-architecture doesn't have DEB_HOST_ARCH_OS
 ifeq ($(DEB_HOST_ARCH_OS),)
   DEB_HOST_ARCH_OS := $(subst -gnu,,$(shell dpkg-architecture -qDEB_HOST_GNU_SYSTEM))
@@ -38,12 +47,12 @@
 # Builds the binary package.
 	$(checkdir)
 ifeq ($(DEB_HOST_ARCH_OS),linux)
-	(cd src; make DISTRO=Debian WITH_SELINUX="yes")
+	(cd src; $(MAKE) $(CROSS) DISTRO=Debian WITH_SELINUX="yes")
 else
-	(cd src; make DISTRO=Debian)
+	(cd src; $(MAKE) $(CROSS) DISTRO=Debian)
 endif
-	make -C debian/startpar
-	cc -W -Wall -s -o debian/readlink debian/readlink.c
+	$(MAKE) $(CROSS) -C debian/startpar
+	$(CC) -W -Wall -s -o debian/readlink debian/readlink.c
 	touch build
 
 # Make a binary package (.deb file)
@@ -86,8 +95,8 @@
 	install -d -o root -g root -m 755 $(tmp)/usr/sbin
 	install -d -o root -g root -m 755 $(tmp)/usr/share/man
 	install -d -o root -g root -m 755 $(tmp)/usr/share/man/man{1,5,8}
-	(cd src; make ROOT=$(tmp) DISTRO=Debian install )
-	make -C debian/startpar DESTDIR=$(tmp) install
+	(cd src; $(MAKE) $(CROSS) ROOT=$(tmp) DISTRO=Debian install )
+	$(MAKE) $(CROSS) -C debian/startpar DESTDIR=$(tmp) install
 	strip -s -R comment -R .comment $(tmp)/sbin/startpar
 ifeq ($(DEB_HOST_ARCH), hurd-i386)
 	# The Hurd has its own halt and reboot commands.
@@ -292,8 +301,8 @@
 	rm -rf $(tmp)
 
 clean:	checkroot unpatch
-	(cd src; make clobber )
-	make -C debian/startpar clean
+	(cd src; $(MAKE) clobber )
+	$(MAKE) -C debian/startpar clean
 	rm -f build debian/files debian/substvars debian/readlink
 	rm -rf $(tmp)
 	find . -name '*.bak' -o -name '*~' | xargs -r rm -f --