Fix config.guess guessing wrong triplets for dietlibc:

configure: error: /bin/bash ../config.sub armv7l-unknown-linux-dietlibceabi failed

Fix is to always add Debian’s known-good triplets

diff --git a/debian/changelog b/debian/changelog
index 3335fa9..02e4a28 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+jupp (3.1.29-2) UNRELEASED; urgency=medium
+
+  * Fix native dietlibc compilation: always force Debian’s GNU triplet
+
+ -- Thorsten Glaser <tg@mirbsd.de>  Sun, 27 Nov 2016 15:42:55 +0100
+
 jupp (3.1.29-1) unstable; urgency=low
 
   [ Dominik George ]

diff --git a/debian/rules b/debian/rules
index 34ec227..edfd520 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -31,6 +31,7 @@ USE_LIBC:=dietlibc
 endif
 
 DEB_BUILD_ARCH=$(shell dpkg-architecture -qDEB_BUILD_ARCH)
+DEB_BUILD_GNU_TYPE=$(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 DEB_HOST_ARCH=$(shell dpkg-architecture -qDEB_HOST_ARCH)
 DEB_HOST_GNU_TYPE=$(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 
@@ -109,7 +110,9 @@ NUMJOBS=            $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
 MAKEFLAGS+=            -j${NUMJOBS}
 endif
 
-CONFIGURE_ARGS=                --prefix=/usr \
+CONFIGURE_ARGS=                --build=${DEB_BUILD_GNU_TYPE} \
+                       --host=${DEB_HOST_GNU_TYPE} \
+                       --prefix=/usr \
                        --sysconfdir=/etc \
                        --mandir=/usr/share/man \
                        --disable-dependency-tracking