summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog1
-rwxr-xr-xdebian/rules9
2 files changed, 5 insertions, 5 deletions
diff --git a/debian/changelog b/debian/changelog
index a5ed9430f..287bc7963 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ openssh (1:6.6p1-9) UNRELEASED; urgency=medium
2 2
3 * Build-depend on a new enough dpkg-dev for dpkg-buildflags, rather than 3 * Build-depend on a new enough dpkg-dev for dpkg-buildflags, rather than
4 simply a new enough dpkg. 4 simply a new enough dpkg.
5 * Simplify debian/rules using /usr/share/dpkg/buildflags.mk.
5 6
6 -- Colin Watson <cjwatson@debian.org> Mon, 06 Oct 2014 13:42:36 +0100 7 -- Colin Watson <cjwatson@debian.org> Mon, 06 Oct 2014 13:42:36 +0100
7 8
diff --git a/debian/rules b/debian/rules
index d35c7d48e..bf4115fc4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -106,8 +106,8 @@ confflags_udeb += --with-default-path=/usr/local/bin:/usr/bin:/bin --with-superu
106 106
107# Compiler flags. 107# Compiler flags.
108export DEB_BUILD_MAINT_OPTIONS := hardening=+all 108export DEB_BUILD_MAINT_OPTIONS := hardening=+all
109default_cflags := $(shell dpkg-buildflags --get CPPFLAGS) $(shell dpkg-buildflags --get CFLAGS) 109include /usr/share/dpkg/buildflags.mk
110cflags := $(default_cflags) 110cflags := $(CPPFLAGS) $(CFLAGS)
111cflags += -DLOGIN_PROGRAM=\"/bin/login\" -DLOGIN_NO_ENDOPT 111cflags += -DLOGIN_PROGRAM=\"/bin/login\" -DLOGIN_NO_ENDOPT
112cflags += -DSSH_EXTRAVERSION=\"$(SSH_EXTRAVERSION)\" 112cflags += -DSSH_EXTRAVERSION=\"$(SSH_EXTRAVERSION)\"
113cflags_udeb := -Os 113cflags_udeb := -Os
@@ -116,8 +116,7 @@ confflags += --with-cflags='$(cflags)'
116confflags_udeb += --with-cflags='$(cflags_udeb)' 116confflags_udeb += --with-cflags='$(cflags_udeb)'
117 117
118# Linker flags. 118# Linker flags.
119default_ldflags := $(shell dpkg-buildflags --get LDFLAGS) 119confflags += --with-ldflags='$(strip -Wl,--as-needed $(LDFLAGS))'
120confflags += --with-ldflags='$(strip -Wl,--as-needed $(default_ldflags))'
121confflags_udeb += --with-ldflags='-Wl,--as-needed' 120confflags_udeb += --with-ldflags='-Wl,--as-needed'
122 121
123%: 122%:
@@ -142,7 +141,7 @@ override_dh_auto_build:
142 $(MAKE) -C build-deb $(PARALLEL) ASKPASS_PROGRAM='/usr/bin/ssh-askpass' 141 $(MAKE) -C build-deb $(PARALLEL) ASKPASS_PROGRAM='/usr/bin/ssh-askpass'
143 $(MAKE) -C build-udeb $(PARALLEL) ASKPASS_PROGRAM='/usr/bin/ssh-askpass' ssh scp sftp sshd ssh-keygen 142 $(MAKE) -C build-udeb $(PARALLEL) ASKPASS_PROGRAM='/usr/bin/ssh-askpass' ssh scp sftp sshd ssh-keygen
144 143
145 $(MAKE) -C contrib gnome-ssh-askpass2 CC='$(CC) $(default_cflags) -Wall -Wl,--as-needed $(default_ldflags)' PKG_CONFIG=$(PKG_CONFIG) 144 $(MAKE) -C contrib gnome-ssh-askpass2 CC='$(CC) $(CPPFLAGS) $(CFLAGS) -Wall -Wl,--as-needed $(LDFLAGS)' PKG_CONFIG=$(PKG_CONFIG)
146 145
147override_dh_auto_test: 146override_dh_auto_test:
148ifeq ($(RUN_TESTS),yes) 147ifeq ($(RUN_TESTS),yes)