Control: tag -1 pending

Dear maintainer,

I've prepared an NMU for pmake (versioned as 1.111-3.3) and uploaded it
to DELAYED/10.  Please feel free to tell me if I should delay it longer.

Regards,

-- 
Colin Watson                                       [cjwat...@debian.org]
diff -Nru pmake-1.111/debian/changelog pmake-1.111/debian/changelog
--- pmake-1.111/debian/changelog	2011-09-21 23:41:05.000000000 +0100
+++ pmake-1.111/debian/changelog	2013-06-04 11:27:38.000000000 +0100
@@ -1,3 +1,13 @@
+pmake (1.111-3.3) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Mark pmake as Multi-Arch: foreign.  The default configuration does
+    differ on different architectures, but it can be overridden by setting
+    MACHINE_ARCH and MACHINE_MULTIARCH (closes: #694907).
+  * Use correct compiler when cross-building (closes: #694909).
+
+ -- Colin Watson <cjwat...@debian.org>  Tue, 04 Jun 2013 11:27:37 +0100
+
 pmake (1.111-3.2) unstable; urgency=low
 
   * Non-maintainer upload.
diff -Nru pmake-1.111/debian/control pmake-1.111/debian/control
--- pmake-1.111/debian/control	2011-05-29 15:08:02.000000000 +0100
+++ pmake-1.111/debian/control	2013-06-04 11:27:00.000000000 +0100
@@ -7,6 +7,7 @@
 
 Package: pmake
 Architecture: any
+Multi-Arch: foreign
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: NetBSD make
  pmake is a program designed to simplify the maintenance of other
diff -Nru pmake-1.111/debian/rules pmake-1.111/debian/rules
--- pmake-1.111/debian/rules	2011-05-29 15:08:02.000000000 +0100
+++ pmake-1.111/debian/rules	2013-06-04 11:27:00.000000000 +0100
@@ -11,10 +11,18 @@
 	-DHAVE_VSNPRINTF \
 	-D_GNU_SOURCE -Wno-unused"
 
+DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+ifeq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE))
+CROSS :=
+else
+CROSS := CC=$(DEB_HOST_GNU_TYPE)-gcc
+endif
+
 build: build-stamp
 build-stamp:
 	dh_testdir
-	$(MAKE) -f Makefile.boot CFLAGS=$(CFLAGS)
+	$(MAKE) -f Makefile.boot CFLAGS=$(CFLAGS) $(CROSS)
 	touch build-stamp
 
 clean:

Reply via email to