[SCM] Packaging for Google Go branch, debian-sid, updated. debian/2011.04.13-2_exp1-22-g8a0ab0d

[Ondřej Surý]

The following commit has been merged in the debian-sid branch:
commit a81d9f15a0fb8314cd575d9dea5955516974bb2e
Author: Ondřej Surý <ondrej at sury.org>
Date:   Thu Apr 28 15:41:18 2011 +0200

    Add better support for armhf

diff --git a/debian/rules b/debian/rules
index 1dc429c..73a3483 100755
--- a/debian/rules
+++ b/debian/rules
@@ -68,6 +68,7 @@ GOROOT_FINAL := $(libexecdir)
 GOBIN := $(CURDIR)$(bindir)
 GOARM :=
 
+DEB_HOST_ARCH := $(shell dpkg-architecture -qDEB_HOST_ARCH 2>/dev/null)
 DEB_HOST_ARCH_OS := $(shell dpkg-architecture -qDEB_HOST_ARCH_OS 2>/dev/null)
 DEB_HOST_ARCH_CPU := $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU 2>/dev/null)
 DEB_BUILD_ARCH_OS := $(shell dpkg-architecture -qDEB_BUILD_ARCH_OS 2>/dev/null)
@@ -109,12 +110,14 @@ else ifeq ($(DEB_HOST_ARCH_CPU), amd64)
     GOPREFIX := 6
 else ifeq ($(DEB_HOST_ARCH_CPU), arm)
     GOARCH := arm
-    GOARM := 5
     GOPREFIX := 5
-else ifeq ($(DEB_HOST_ARCH_CPU), armhf)
-    GOARCH := arm
+ifeq ($(DEB_HOST_ARCH), armel)
+    GOARM := 5
+else if ($(DEB_HOST_ARCH), armhf)
     GOARM := 6
-    GOPREFIX := 5
+else
+    $(error unrecognized arm architecture $(DEB_HOST_ARCH)!)
+endif
 else
     $(error unrecognized instruction set $(DEB_HOST_ARCH_CPU)!)
 endif

-- 
Packaging for Google Go