[Glibc-bsd-commits] r5895 - trunk/freebsd-buildutils/debian

[stevenc-guest at alioth.debian.org]

Author: stevenc-guest
Date: 2016-03-05 02:06:36 +0000 (Sat, 05 Mar 2016)
New Revision: 5895

Modified:
   trunk/freebsd-buildutils/debian/rules
Log:
Fix and clean up architecture detections


Modified: trunk/freebsd-buildutils/debian/rules
===================================================================
--- trunk/freebsd-buildutils/debian/rules	2016-03-05 01:58:05 UTC (rev 5894)
+++ trunk/freebsd-buildutils/debian/rules	2016-03-05 02:06:36 UTC (rev 5895)
@@ -13,36 +13,17 @@
 
 # These are used for cross-compiling and for saving the configure script
 # from having to guess our platform (since we know it already)
-DEB_BUILD_GNU_TYPE	:= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-DEB_BUILD_GNU_CPU	:= $(shell dpkg-architecture -qDEB_BUILD_GNU_CPU)
-DEB_HOST_ARCH_CPU	:= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)
-DEB_HOST_MULTIARCH	:= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+DEB_HOST_ARCH_CPU	?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)
+DEB_HOST_MULTIARCH	?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 DEB_HOST_ARCH_OS	?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
 
-ifeq ($(DEB_HOST_ARCH_CPU), mipsel)
-MACHINE_ARCH		:= mips
-else
 MACHINE_ARCH		:= $(DEB_HOST_ARCH_CPU)
-endif
-
-ifeq ($(DEB_HOST_MULTIARCH), mipsel)
-MACHINE_MULTIARCH	:= mips
-else
 MACHINE_MULTIARCH	:= $(DEB_HOST_MULTIARCH)
-endif
 
-ifeq ($(DEB_HOST_ARCH_CPU), armhf)
+ifeq ($(DEB_HOST_ARCH_CPU), arm)
 MACHINE_ARCH		:= armv6
-else
-MACHINE_ARCH		:= $(DEB_HOST_ARCH_CPU)
 endif
 
-ifeq ($(DEB_HOST_MULTIARCH), armhf)
-MACHINE_MULTIARCH	:= armv6
-else
-MACHINE_MULTIARCH	:= $(DEB_HOST_MULTIARCH)
-endif
-
 ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
     export STRIPFLAG=
 endif