[Glibc-bsd-commits] r6141 - trunk/freebsd-libs/debian

[stevenc-guest at alioth.debian.org]

Author: stevenc-guest
Date: 2017-02-03 15:34:40 +0000 (Fri, 03 Feb 2017)
New Revision: 6141

Modified:
   trunk/freebsd-libs/debian/changelog
   trunk/freebsd-libs/debian/rules
Log:
Pre-define MACHINE_ARCH with the host architecture we are building
for, otherwise freebsd-make naively assumes it is the same as the
build architecture.  Fixes a cross-build issue reported by Helmut
Grohne, thanks!


Modified: trunk/freebsd-libs/debian/changelog
===================================================================
--- trunk/freebsd-libs/debian/changelog	2017-01-20 17:42:01 UTC (rev 6140)
+++ trunk/freebsd-libs/debian/changelog	2017-02-03 15:34:40 UTC (rev 6141)
@@ -1,3 +1,12 @@
+freebsd-libs (10.3~svn296373-10) UNRELEASED; urgency=medium
+
+  * Pre-define MACHINE_ARCH with the host architecture we are building
+    for, otherwise freebsd-make naively assumes it is the same as the
+    build architecture.  Fixes a cross-build issue reported by Helmut
+    Grohne, thanks!
+
+ -- Steven Chamberlain <stevenc at debian.org>  Fri, 03 Feb 2017 15:00:12 +0000
+
 freebsd-libs (10.3~svn296373-9) unstable; urgency=medium
 
   [ Aurelien Jarno ]

Modified: trunk/freebsd-libs/debian/rules
===================================================================
--- trunk/freebsd-libs/debian/rules	2017-01-20 17:42:01 UTC (rev 6140)
+++ trunk/freebsd-libs/debian/rules	2017-02-03 15:34:40 UTC (rev 6141)
@@ -31,6 +31,16 @@
 DPKG_EXPORT_BUILDFLAGS = 1
 include /usr/share/dpkg/buildflags.mk
 
+MACHINE_ARCH		:= $(DEB_HOST_ARCH_CPU)
+
+ifeq ($(DEB_HOST_ARCH_CPU), arm)
+ifneq (,$(findstring armhf,$(DEB_HOST_ARCH)))
+MACHINE_ARCH		:= armv6hf
+else
+MACHINE_ARCH		:= armv6
+endif
+endif
+
 EXTRA_CFLAGS = \
 	-D__FreeBSD_version=__FreeBSD_kernel_version \
 	-D_GNU_SOURCE -pipe -Wall \
@@ -70,6 +80,7 @@
 	SHLIB_MAJOR=0 \
 	bmake \
 	CC=$(CC) \
+        MACHINE_ARCH=$(MACHINE_ARCH) \
 	$(NULL)
 PMAKE = \
 	CFLAGS="$(CFLAGS)" \