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

[stevenc-guest at alioth.debian.org]

Author: stevenc-guest
Date: 2016-03-05 00:42:43 +0000 (Sat, 05 Mar 2016)
New Revision: 5883

Modified:
   trunk/freebsd-buildutils/debian/changelog
   trunk/freebsd-buildutils/debian/rules
Log:
Map Debian's kfreebsd-armhf to FreeBSD's armv6 MACHINE_ARCH


Modified: trunk/freebsd-buildutils/debian/changelog
===================================================================
--- trunk/freebsd-buildutils/debian/changelog	2016-03-05 00:32:29 UTC (rev 5882)
+++ trunk/freebsd-buildutils/debian/changelog	2016-03-05 00:42:43 UTC (rev 5883)
@@ -2,6 +2,7 @@
 
   * New upstream snapshot of 10.3-RC1
   * Mark freebsd-mk as Multi-Arch: foreign (thanks, Helmut Grohne!)
+  * Map Debian's kfreebsd-armhf to FreeBSD's armv6 MACHINE_ARCH
 
  -- Steven Chamberlain <steven at pyro.eu.org>  Sat, 05 Mar 2016 00:27:01 +0000
 

Modified: trunk/freebsd-buildutils/debian/rules
===================================================================
--- trunk/freebsd-buildutils/debian/rules	2016-03-05 00:32:29 UTC (rev 5882)
+++ trunk/freebsd-buildutils/debian/rules	2016-03-05 00:42:43 UTC (rev 5883)
@@ -25,6 +25,18 @@
 MACHINE_MULTIARCH	:= $(DEB_HOST_MULTIARCH)
 endif
 
+ifeq ($(DEB_HOST_ARCH_CPU), armhf)
+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