diff options
author | Colin Watson <cjwatson@debian.org> | 2010-01-31 00:24:16 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2010-01-31 00:24:16 +0000 |
commit | e7bebcfcdeb500c02860999e3ac52ac665e825c1 (patch) | |
tree | fdfe7749afdcdcdd431e85a185ca8d182687ef3e /debian | |
parent | 73331782646cf9c8ad9a869870ed2321da1722f3 (diff) |
Link with -Wl,--as-needed (closes: #560155).
Diffstat (limited to 'debian')
-rw-r--r-- | debian/changelog | 6 | ||||
-rwxr-xr-x | debian/rules | 7 |
2 files changed, 9 insertions, 4 deletions
diff --git a/debian/changelog b/debian/changelog index e835977d9..ba4919d0f 100644 --- a/debian/changelog +++ b/debian/changelog | |||
@@ -1,3 +1,9 @@ | |||
1 | openssh (1:5.3p1-2) UNRELEASED; urgency=low | ||
2 | |||
3 | * Link with -Wl,--as-needed (closes: #560155). | ||
4 | |||
5 | -- Colin Watson <cjwatson@debian.org> Sun, 31 Jan 2010 00:11:43 +0000 | ||
6 | |||
1 | openssh (1:5.3p1-1) unstable; urgency=low | 7 | openssh (1:5.3p1-1) unstable; urgency=low |
2 | 8 | ||
3 | * New upstream release. | 9 | * New upstream release. |
diff --git a/debian/rules b/debian/rules index 09b8771b1..bd0ca85d7 100755 --- a/debian/rules +++ b/debian/rules | |||
@@ -107,9 +107,8 @@ confflags += --with-cflags='$(cflags)' | |||
107 | confflags_udeb += --with-cflags='$(cflags_udeb)' | 107 | confflags_udeb += --with-cflags='$(cflags_udeb)' |
108 | 108 | ||
109 | # Linker flags. | 109 | # Linker flags. |
110 | ifneq ($(PIC_LDFLAGS)$(HARDENING_LDFLAGS),) | 110 | confflags += --with-ldflags='$(strip -Wl,--as-needed $(PIC_LDFLAGS) $(HARDENING_LDFLAGS))' |
111 | confflags += --with-ldflags='$(strip $(PIC_LDFLAGS) $(HARDENING_LDFLAGS))' | 111 | confflags_udeb += --with-ldflags='-Wl,--as-needed' |
112 | endif | ||
113 | 112 | ||
114 | build: build-deb build-udeb | 113 | build: build-deb build-udeb |
115 | 114 | ||
@@ -123,7 +122,7 @@ build-deb-stamp: | |||
123 | perl -pi -e 's,.*#define USE_BTMP .*,/* #undef USE_BTMP */,' build-deb/config.h | 122 | perl -pi -e 's,.*#define USE_BTMP .*,/* #undef USE_BTMP */,' build-deb/config.h |
124 | 123 | ||
125 | $(MAKE) -C build-deb -j 2 ASKPASS_PROGRAM='/usr/bin/ssh-askpass' | 124 | $(MAKE) -C build-deb -j 2 ASKPASS_PROGRAM='/usr/bin/ssh-askpass' |
126 | $(MAKE) -C contrib gnome-ssh-askpass2 CC='$(CC) $(OPTFLAGS) -g -Wall' | 125 | $(MAKE) -C contrib gnome-ssh-askpass2 CC='$(CC) $(OPTFLAGS) -g -Wall -Wl,--as-needed' |
127 | ifeq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE)) | 126 | ifeq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE)) |
128 | $(MAKE) -C debian/tests | 127 | $(MAKE) -C debian/tests |
129 | endif | 128 | endif |