diff options
author | Colin Watson <cjwatson@debian.org> | 2007-11-17 20:00:10 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2007-11-17 20:00:10 +0000 |
commit | 2a87bee9f8e6bf325cd6525e6ac5cca58ac39586 (patch) | |
tree | 6973ebb7878a5875b5dfe36e7b614b30e76148ed | |
parent | a660ece98c5a924a6dc29379419fdcb113451319 (diff) |
* Use autotools-dev's recommended configure --build and --host options.
-rw-r--r-- | debian/changelog | 1 | ||||
-rwxr-xr-x | debian/rules | 13 |
2 files changed, 12 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog index bc53e052c..5f2a6613e 100644 --- a/debian/changelog +++ b/debian/changelog | |||
@@ -1,6 +1,7 @@ | |||
1 | openssh (1:4.6p1-7) UNRELEASED; urgency=low | 1 | openssh (1:4.6p1-7) UNRELEASED; urgency=low |
2 | 2 | ||
3 | * Don't build PIE executables on m68k (closes: #451192). | 3 | * Don't build PIE executables on m68k (closes: #451192). |
4 | * Use autotools-dev's recommended configure --build and --host options. | ||
4 | 5 | ||
5 | -- Colin Watson <cjwatson@debian.org> Wed, 14 Nov 2007 09:30:36 +0000 | 6 | -- Colin Watson <cjwatson@debian.org> Wed, 14 Nov 2007 09:30:36 +0000 |
6 | 7 | ||
diff --git a/debian/rules b/debian/rules index 13363341e..14c10e7d1 100755 --- a/debian/rules +++ b/debian/rules | |||
@@ -12,6 +12,15 @@ else | |||
12 | OPTFLAGS := -O0 | 12 | OPTFLAGS := -O0 |
13 | endif | 13 | endif |
14 | 14 | ||
15 | DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) | ||
16 | DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) | ||
17 | |||
18 | ifeq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE)) | ||
19 | confflags += --build=$(DEB_HOST_GNU_TYPE) | ||
20 | else | ||
21 | confflags += --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE) | ||
22 | endif | ||
23 | |||
15 | DEB_HOST_ARCH_OS := $(shell dpkg-architecture -qDEB_HOST_ARCH_OS 2>/dev/null) | 24 | DEB_HOST_ARCH_OS := $(shell dpkg-architecture -qDEB_HOST_ARCH_OS 2>/dev/null) |
16 | DEB_HOST_ARCH_CPU := $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU 2>/dev/null) | 25 | DEB_HOST_ARCH_CPU := $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU 2>/dev/null) |
17 | 26 | ||
@@ -87,7 +96,7 @@ build-deb: build-deb-stamp | |||
87 | build-deb-stamp: | 96 | build-deb-stamp: |
88 | dh_testdir | 97 | dh_testdir |
89 | mkdir -p build-deb | 98 | mkdir -p build-deb |
90 | cd build-deb && $(FORCE_LIBS) LDFLAGS='$(PIE_LDFLAGS)' ../configure --prefix=/usr --sysconfdir=/etc/ssh --libexecdir=/usr/lib/openssh --mandir=/usr/share/man --with-tcp-wrappers --with-xauth=/usr/bin/X11/xauth --with-default-path=$(DEFAULT_PATH) --with-superuser-path=$(SUPERUSER_PATH) --with-pam --with-4in6 --with-privsep-path=/var/run/sshd --without-rand-helper --with-libedit --with-kerberos5=/usr --with-ssl-engine $(SELINUX) | 99 | cd build-deb && $(FORCE_LIBS) LDFLAGS='$(PIE_LDFLAGS)' ../configure $(confflags) --prefix=/usr --sysconfdir=/etc/ssh --libexecdir=/usr/lib/openssh --mandir=/usr/share/man --with-tcp-wrappers --with-xauth=/usr/bin/X11/xauth --with-default-path=$(DEFAULT_PATH) --with-superuser-path=$(SUPERUSER_PATH) --with-pam --with-4in6 --with-privsep-path=/var/run/sshd --without-rand-helper --with-libedit --with-kerberos5=/usr --with-ssl-engine $(SELINUX) |
91 | 100 | ||
92 | ifeq ($(DEB_HOST_ARCH_OS),linux) | 101 | ifeq ($(DEB_HOST_ARCH_OS),linux) |
93 | # Some 2.2 kernels have trouble with setres[ug]id() (bug #239999). | 102 | # Some 2.2 kernels have trouble with setres[ug]id() (bug #239999). |
@@ -110,7 +119,7 @@ build-udeb: build-udeb-stamp | |||
110 | build-udeb-stamp: | 119 | build-udeb-stamp: |
111 | dh_testdir | 120 | dh_testdir |
112 | mkdir -p build-udeb | 121 | mkdir -p build-udeb |
113 | cd build-udeb && $(FORCE_LIBS) ../configure --prefix=/usr --sysconfdir=/etc/ssh --libexecdir=/usr/lib/openssh --without-xauth --with-default-path=/usr/local/bin:/usr/bin:/bin --with-superuser-path=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin --with-4in6 --with-privsep-path=/var/run/sshd --without-rand-helper | 122 | cd build-udeb && $(FORCE_LIBS) ../configure $(confflags) --prefix=/usr --sysconfdir=/etc/ssh --libexecdir=/usr/lib/openssh --without-xauth --with-default-path=/usr/local/bin:/usr/bin:/bin --with-superuser-path=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin --with-4in6 --with-privsep-path=/var/run/sshd --without-rand-helper |
114 | # Debian's /var/log/btmp has inappropriate permissions. | 123 | # Debian's /var/log/btmp has inappropriate permissions. |
115 | perl -pi -e 's,.*#define USE_BTMP .*,/* #undef USE_BTMP */,' build-udeb/config.h | 124 | perl -pi -e 's,.*#define USE_BTMP .*,/* #undef USE_BTMP */,' build-udeb/config.h |
116 | # Avoid libnsl linkage. Ugh. | 125 | # Avoid libnsl linkage. Ugh. |