@@ -1,3 +1,12 @@
+xfsprogs (3.2.3+nmu1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Fix FTCBFS. (Closes: #-1)
+ + Pass --build and --host to configure.
+ + Compile gen_crc32table and crc32selftest using CC_FOR_BUILD.
+
+ -- Helmut Grohne <helmut@subdivi.de> Thu, 30 Jul 2015 23:00:34 +0200
+
xfsprogs (3.2.3) unstable; urgency=low
* New upstream release
@@ -6,6 +6,10 @@
develop = xfslibs-dev
bootpkg = xfsprogs-udeb
+DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+export CC_FOR_BUILD ?= cc
+
version = $(shell dpkg-parsechangelog | grep ^Version: | cut -d ' ' -f 2)
target ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
udebpkg = $(bootpkg)_$(version)_$(target).udeb
@@ -18,11 +22,13 @@
pkgdi = DIST_ROOT=`pwd`/$(dirdi); export DIST_ROOT;
stdenv = @GZIP=-q; export GZIP;
+configure_options = --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE)
+
options = export DEBUG=-DNDEBUG DISTRIBUTION=debian \
INSTALL_USER=root INSTALL_GROUP=root \
- LOCAL_CONFIGURE_OPTIONS="--enable-readline=yes --enable-blkid=yes" ;
+ LOCAL_CONFIGURE_OPTIONS="$(configure_options) --enable-readline=yes --enable-blkid=yes" ;
diopts = $(options) \
- export OPTIMIZER=-Os LOCAL_CONFIGURE_OPTIONS="--enable-gettext=no" ;
+ export OPTIMIZER=-Os LOCAL_CONFIGURE_OPTIONS="$(configure_options) --enable-gettext=no" ;
checkdir = test -f debian/rules
build: built
@@ -67,7 +67,7 @@
crc32table.h: gen_crc32table.c
@echo " [CC] gen_crc32table"
- $(Q) $(CC) $(CFLAGS) -o gen_crc32table $<
+ $(Q) $(CC_FOR_BUILD) $(CFLAGS) -o gen_crc32table $<
@echo " [GENERATE] $@"
$(Q) ./gen_crc32table > crc32table.h
@@ -78,7 +78,7 @@
# disk.
crc32selftest: gen_crc32table.c crc32table.h crc32.c
@echo " [TEST] CRC32"
- $(Q) $(CC) $(CFLAGS) -D CRC32_SELFTEST=1 crc32.c -o $@
+ $(Q) $(CC_FOR_BUILD) $(CFLAGS) -D CRC32_SELFTEST=1 crc32.c -o $@
$(Q) ./$@
include $(BUILDRULES)