Commit 941fa7b7 authored by Peter Palfrader's avatar Peter Palfrader
Browse files

Apparently passing --host to configure when not cross-compiling is evil now and 

greatly confuses configure.  So don't do it unless it actually differs from
the --build host.


svn:r6129
parent d99ae6c2

debian/changelog

+4 −1
Original line number Diff line number Diff line 
tor (0.1.1.15-rc-1) experimental; urgency=low



  * New upstream version.

  * Apparently passing --host to configure when not cross-compiling

    is evil now and greatly confuses configure.  So don't do it unless it

    actually differs from --build host.



 -- Peter Palfrader <weasel@debian.org>  Tue, 21 Feb 2006 05:19:01 +0100

 -- Peter Palfrader <weasel@debian.org>  Sat, 11 Mar 2006 20:04:36 +0100



tor (0.1.1.14-alpha-1) experimental; urgency=low

debian/rules

+13 −8
Original line number Diff line number Diff line
@@ -6,16 +6,22 @@ 
# Uncomment this to turn on verbose mode.

#export DH_VERBOSE=1



export PACKAGE=tor

include /usr/share/dpatch/dpatch.make



# These are used for cross-compiling and for saving the configure script

# from having to guess our platform (since we know it already)

DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)

DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)

LOCALHOST_IP  ?= $(shell getent hosts localhost | awk '{print $$1}')

export DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)

export DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)

CFLAGS ?= -Wall -g

ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))

  confflags += --build $(DEB_HOST_GNU_TYPE)

else

  confflags += --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)

endif



CFLAGS = -Wall -g



export PACKAGE=tor

include /usr/share/dpatch/dpatch.make

LOCALHOST_IP  ?= $(shell getent hosts localhost | awk '{print $$1}')



# Do not optimize the build with "noopt"

ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
@@ -53,8 +59,7 @@ config.status: configure 
	@if [ "$(LOCALHOST_IP)" != "127.0.0.1" ]; then echo; echo; echo; echo; echo; echo "######################################################################"; echo "WARNING: This system does not think localhost is 127.0.0.1.  Will ignore result of testsuite.  Please fix your system/chroot."; echo "######################################################################"; echo; echo; echo; echo; echo "Note: 'getent hosts localhost' should return '127.0.0.1 localhost'"; echo; fi

	dh_testdir

	CFLAGS="$(CFLAGS)" ./configure \

		--host=$(DEB_HOST_GNU_TYPE) \

		--build=$(DEB_BUILD_GNU_TYPE) \

		$(confflags) \

		--prefix=/usr \

		--mandir=\$${prefix}/share/man \

		--infodir=\$${prefix}/share/info \