Hi guys, I'm going to go ahead and upload a delayed NMU for this bug to delayed/14-days. Please let me know if you think there's a reason this upload should be cancelled.
The final NMU debdiff is attached. Thanks, -- Steve Langasek Give me a lever long enough and a Free OS Debian Developer to set it on, and I can move the world. Ubuntu Developer http://www.debian.org/ slanga...@ubuntu.com vor...@debian.org
diff -Nru acpica-unix-20131115/debian/changelog acpica-unix-20131115/debian/changelog --- acpica-unix-20131115/debian/changelog 2013-11-25 17:22:26.000000000 -0800 +++ acpica-unix-20131115/debian/changelog 2013-12-09 22:39:54.000000000 -0800 @@ -1,3 +1,12 @@ +acpica-unix (20131115-1.1) unstable; urgency=medium + + * Non-maintainer upload. Closes: #696211. + * Add cross-compilation support. + * Use dpkg-buildflags for hardening support. + * Disable the test suite when DEB_BUILD_OPTIONS=nocheck is set. + + -- Steve Langasek <vor...@debian.org> Tue, 10 Dec 2013 06:39:51 +0000 + acpica-unix (20131115-1) unstable; urgency=low * Update to latest upstream. diff -Nru acpica-unix-20131115/debian/rules acpica-unix-20131115/debian/rules --- acpica-unix-20131115/debian/rules 2013-11-25 17:22:26.000000000 -0800 +++ acpica-unix-20131115/debian/rules 2013-12-09 15:10:48.000000000 -0800 @@ -9,15 +9,19 @@ # Uncomment this to turn on verbose mode. export DH_VERBOSE=1 -CFLAGS = -Wall -g +CFLAGS = $(shell dpkg-buildflags --get CFLAGS) $(shell dpkg-buildflags --get CPPFLAGS) -Wall -fno-strict-aliasing + DESTDIR ?= debian/acpica-tools VERSION = 20131115 -ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) - CFLAGS += -O0 +DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) +DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) + +ifneq ($(DEB_HOST_GNU_TYPE),$(DEB_BUILD_GNU_TYPE)) + CC = $(DEB_HOST_GNU_TYPE)-gcc else - CFLAGS += -O2 -fno-strict-aliasing + CC = gcc endif @@ -64,4 +68,9 @@ $(DESTDIR)/usr/share/man/man1/acpixtract-acpica.1 override_dh_auto_test: - $(MAKE) -C $(CURDIR) check +ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS))) + $(MAKE) -C $(CURDIR) check CC=$(CC) OPT_CFLAGS="$(CFLAGS)" +endif + +override_dh_auto_build: + dh_auto_build -- OPT_CFLAGS="$(CFLAGS)" CC=$(CC)
signature.asc
Description: Digital signature
