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

[Robert Millan]

Author: rmh
Date: 2011-07-02 11:16:12 +0000 (Sat, 02 Jul 2011)
New Revision: 3511

Modified:
   trunk/freebsd-buildutils/debian/changelog
   trunk/freebsd-buildutils/debian/rules
Log:
MACHINE_ARCH is now set to "mips" on mipsel.  (Closes: #631890)

Modified: trunk/freebsd-buildutils/debian/changelog
===================================================================
--- trunk/freebsd-buildutils/debian/changelog	2011-06-30 18:01:43 UTC (rev 3510)
+++ trunk/freebsd-buildutils/debian/changelog	2011-07-02 11:16:12 UTC (rev 3511)
@@ -1,3 +1,9 @@
+freebsd-buildutils (8.2-4) unstable; urgency=low
+
+  * MACHINE_ARCH is now set to "mips" on mipsel.  (Closes: #631890)
+
+ -- Robert Millan <rmh at debian.org>  Sat, 02 Jul 2011 13:13:57 +0200
+
 freebsd-buildutils (8.2-3) unstable; urgency=low
 
   * 18_fix_sysdir.diff: Bring back search in relative paths (removing it

Modified: trunk/freebsd-buildutils/debian/rules
===================================================================
--- trunk/freebsd-buildutils/debian/rules	2011-06-30 18:01:43 UTC (rev 3510)
+++ trunk/freebsd-buildutils/debian/rules	2011-07-02 11:16:12 UTC (rev 3511)
@@ -12,6 +12,18 @@
 DEB_HOST_ARCH_CPU	:= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)
 DEB_HOST_MULTIARCH	:= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
+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
+
 ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
     export STRIPFLAG=
 endif
@@ -28,8 +40,8 @@
 TARNAME = $(SOURCE)_$(VERSION).orig.tar.gz
 
 CFLAGS = -O2 -g -Wall -D_GNU_SOURCE \
-         -DMACHINE_ARCH='"$(DEB_HOST_ARCH_CPU)"' \
-         -DMACHINE_MULTIARCH='"$(DEB_HOST_MULTIARCH)"' \
+         -DMACHINE_ARCH='"$(MACHINE_ARCH)"' \
+         -DMACHINE_MULTIARCH='"$(MACHINE_MULTIARCH)"' \
          -I$(CURDIR)/build-tree/src/sys \
 	 $(shell pkg-config --cflags libbsd-overlay) -lbsd
 MAKE_BUILD_FLAGS = CC=gcc NO_WERROR=1 NOGCCERROR=1 NOSHARED=NO NO_SHARED=NO