torproject/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-06 19:41:15 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

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


svn:r6129
This commit is contained in:
Peter Palfrader
2006-03-11 19:05:06 +00:00
parent d99ae6c27a
commit 941fa7b7d9
2 changed files with 19 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
debian/changelog
Vendored
+4 -1
View File
@@ -1,8 +1,11 @@
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
Vendored
+15 -10
View File
@@ -6,17 +6,23 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
# 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}')
CFLAGS = -Wall -g
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)
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
LOCALHOST_IP ?= $(shell getent hosts localhost | awk '{print $$1}')
# Do not optimize the build with "noopt"
ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
CFLAGS += -O0
@@ -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 \