From b03ac8c059f5aa96d2505ba72f22354fc9a70032 Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@debian.org>
Date: Thu, 5 Jul 2007 08:15:40 +0000
Subject: * Don't build PIE executables on hppa, as they crash.

---
 debian/changelog |  6 ++++++
 debian/rules     | 17 +++++++++++++----
 2 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5ce21eb02..84766a1f4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+openssh (1:4.6p1-4) UNRELEASED; urgency=low
+
+  * Don't build PIE executables on hppa, as they crash.
+
+ -- Colin Watson <cjwatson@debian.org>  Thu, 05 Jul 2007 09:14:19 +0100
+
 openssh (1:4.6p1-3) unstable; urgency=low
 
   * Only build PIE executables on Linux and NetBSD (closes: #430455).
diff --git a/debian/rules b/debian/rules
index c9cde8ce1..926e8674e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,6 +13,7 @@ OPTFLAGS := -O0
 endif
 
 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)
 
 # Take account of old dpkg-architecture output.
 ifeq ($(DEB_HOST_ARCH_OS),)
@@ -21,12 +22,20 @@ ifeq ($(DEB_HOST_ARCH_OS),)
     DEB_HOST_ARCH_OS := hurd
   endif
 endif
+ifeq ($(DEB_HOST_ARCH_CPU),)
+  DEB_HOST_ARCH_CPU := $(shell dpkg-architecture -qDEB_HOST_GNU_CPU)
+  ifeq ($(DEB_HOST_ARCH_CPU),x86_64)
+    DEB_HOST_ARCH_CPU := amd64
+  endif
+endif
 
 ifneq (,$(findstring :$(DEB_HOST_ARCH_OS):,:linux:knetbsd:))
-# Use position-independent executables to take advantage of address space
-# layout randomisation. TODO: This should be done in configure.
-PIE_CFLAGS := -fPIE
-PIE_LDFLAGS := -fPIE -pie
+  ifneq ($(DEB_HOST_ARCH_CPU),hppa)
+    # Use position-independent executables to take advantage of address space
+    # layout randomisation. TODO: This should be done in configure.
+    PIE_CFLAGS := -fPIE
+    PIE_LDFLAGS := -fPIE -pie
+  endif
 endif
 
 ifeq (,$(wildcard /usr/bin/po2debconf))
-- 
cgit v1.2.3