summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2009-08-28 08:10:26 +0000
committerColin Watson <cjwatson@debian.org>2009-08-28 08:10:26 +0000
commit667f6f9f622f4e2eaaac815f88495dac75db4b0f (patch)
tree4800bdbeef4ace48e16de3f34f643efb4408bcb9
parent3c074e3837ae7f0f253871b6bf4f34338d360acb (diff)
Build with just -fPIC on mips/mipsel, not -fPIE as well (thanks, LIU Qi;
closes: #538313).
-rw-r--r--debian/changelog7
-rwxr-xr-xdebian/rules2
2 files changed, 8 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index bf5d76395..9ac69e177 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
1openssh (1:5.1p1-8) UNRELEASED; urgency=low
2
3 * Build with just -fPIC on mips/mipsel, not -fPIE as well (thanks, LIU Qi;
4 closes: #538313).
5
6 -- Colin Watson <cjwatson@debian.org> Fri, 28 Aug 2009 09:06:32 +0100
7
1openssh (1:5.1p1-7) unstable; urgency=low 8openssh (1:5.1p1-7) unstable; urgency=low
2 9
3 * Update config.guess and config.sub from autotools-dev 20090611.1 10 * Update config.guess and config.sub from autotools-dev 20090611.1
diff --git a/debian/rules b/debian/rules
index 1a0388a5d..ff83b852b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -44,7 +44,7 @@ ifneq (,$(findstring :$(DEB_HOST_ARCH_OS):,:linux:knetbsd:))
44 PIC_CFLAGS := -fPIC 44 PIC_CFLAGS := -fPIC
45 PIC_LDFLAGS := -fPIC 45 PIC_LDFLAGS := -fPIC
46 endif 46 endif
47 ifeq (,$(findstring :$(DEB_HOST_ARCH_CPU):,:hppa:m68k:)) 47 ifeq (,$(findstring :$(DEB_HOST_ARCH_CPU):,:hppa:m68k:mips:mipsel:))
48 # Use position-independent executables to take advantage of address space 48 # Use position-independent executables to take advantage of address space
49 # layout randomisation. TODO: This should be done in configure. 49 # layout randomisation. TODO: This should be done in configure.
50 PIE_CFLAGS := -fPIE 50 PIE_CFLAGS := -fPIE