always use --build=/--host=; config.guess can be too smart otherwise
authormirabilos <m@mirbsd.org>
Sun, 27 Nov 2016 14:47:44 +0000 (15:47 +0100)
committermirabilos <m@mirbsd.org>
Sun, 27 Nov 2016 14:47:44 +0000 (15:47 +0100)
(see trying to build jupp against dietlibc, where the detected triplet
differs and does not work)

debian/changelog
debian/rules

index a253bbe..acad4f7 100644 (file)
@@ -1,3 +1,9 @@
+cvs (2:1.12.13+real-21) UNRELEASED; urgency=medium
+
+  * Always add --build=/--host= to avoid config.guess being too smart
+
+ -- Thorsten Glaser <tg@mirbsd.de>  Sun, 27 Nov 2016 15:47:17 +0100
+
 cvs (2:1.12.13+real-20) unstable; urgency=low
 
   * Do not spew into syslog when 'cvs pserver' is called from a tty
index aec9bf1..db96fb0 100755 (executable)
@@ -2,10 +2,8 @@
 
 DEB_BUILD_ARCH=$(shell dpkg-architecture -qDEB_BUILD_ARCH)
 DEB_HOST_ARCH=$(shell dpkg-architecture -qDEB_HOST_ARCH)
-ifneq (${DEB_BUILD_ARCH},${DEB_HOST_ARCH})
 DEB_BUILD_GNU_TYPE=$(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 DEB_HOST_GNU_TYPE=$(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-endif
 
 # is ${CC} defined anywhere (other than implicit rules?)
 ifneq (,$(findstring $(origin CC),default undefined))
@@ -52,7 +50,9 @@ LIBS+=                        -lbsd
 CONFIGURE_ENV+=                LIBS='${LIBS}'
 CONFIGURE_ENV+=                CSH=/bin/csh
 
-CONFIGURE_ARGS:=       --prefix=/usr \
+CONFIGURE_ARGS:=       --build=${DEB_BUILD_GNU_TYPE} \
+                       --host=${DEB_HOST_GNU_TYPE} \
+                       --prefix=/usr \
                        --infodir=/usr/share/info \
                        --mandir=/usr/share/man \
                        --sysconfdir=/etc \
@@ -79,11 +79,6 @@ CONFIGURE_ARGS:=     --prefix=/usr \
                        --with-umask=002 \
                        --with-cvs-admin-group=_cvsadmin
 
-ifneq (${DEB_BUILD_ARCH},${DEB_HOST_ARCH})
-CONFIGURE_ARGS+=       --build=${DEB_BUILD_GNU_TYPE} \
-                       --host=${DEB_HOST_GNU_TYPE}
-endif
-
 MAKE_ARGS:=            MAKEINFO=makeinfo
 MAKE_ARGS+=            MAKEINFOFLAGS=--no-split