diff options
| author |   Anthony G. Basile <blueness@gentoo.org> | 2012-10-27 14:23:38 +0000 |
|---|---|---|
| committer | Anthony G. Basile <blueness@gentoo.org> | 2012-10-27 14:23:38 +0000 |
| commit | 761cc6b9a42ff3546b96bbbbf26ddc02a6182e66 (patch) | |
| tree | a1a0cbe09b0ff344e002ddabf3c0a49654b9be1f /net-misc/tor | |
| parent | Stable on alpha, bug #438146 (diff) | |
| download | gentoo-2-761cc6b9a42ff3546b96bbbbf26ddc02a6182e66.tar.gz gentoo-2-761cc6b9a42ff3546b96bbbbf26ddc02a6182e66.tar.bz2 gentoo-2-761cc6b9a42ff3546b96bbbbf26ddc02a6182e66.zip | |
Improve patch for bug #435040
(Portage version: 2.1.11.30/cvs/Linux x86_64, signed Manifest commit with key 0xD0455535)
Diffstat (limited to 'net-misc/tor')
| -rw-r--r-- | net-misc/tor/ChangeLog | 6 | ||||
| -rw-r--r-- | net-misc/tor/files/tor-0.2.4.5-fix-udef-ref-math.patch | 34 |
2 files changed, 32 insertions, 8 deletions
diff --git a/net-misc/tor/ChangeLog b/net-misc/tor/ChangeLog index 38fd423d8538..07902880a8b9 100644 --- a/net-misc/tor/ChangeLog +++ b/net-misc/tor/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-misc/tor # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/ChangeLog,v 1.361 2012/10/27 02:33:56 blueness Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/ChangeLog,v 1.362 2012/10/27 14:23:38 blueness Exp $ + + 27 Oct 2012; Anthony G. Basile <blueness@gentoo.org> + files/tor-0.2.4.5-fix-udef-ref-math.patch: + Improve patch for bug #435040 27 Oct 2012; Anthony G. Basile <blueness@gentoo.org> +files/tor-0.2.4.5-fix-udef-ref-math.patch, tor-0.2.4.5_alpha.ebuild: diff --git a/net-misc/tor/files/tor-0.2.4.5-fix-udef-ref-math.patch b/net-misc/tor/files/tor-0.2.4.5-fix-udef-ref-math.patch index 0f5c82a9bac9..5706ff7dba6a 100644 --- a/net-misc/tor/files/tor-0.2.4.5-fix-udef-ref-math.patch +++ b/net-misc/tor/files/tor-0.2.4.5-fix-udef-ref-math.patch @@ -1,11 +1,31 @@ +Fix undefined reference to libm functions linking tor-fw-helper + +When configuring tor without upnp support, ie ./configure --disable-upnp, +tor-fw-helper fails to link with undefined references to `ceil' and +`log'. This if fixed by linking to libm. + +X-Gentoo-Bug: 435040 +X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=435040 +Reported-by: Alexandre <alexandre.cortes@outlook.com> +Signed-off-by: Anthony G. Basile <blueness@gentoo.org> +--- + diff -Naur tor-0.2.4.5-alpha.orig/src/tools/tor-fw-helper/include.am tor-0.2.4.5-alpha/src/tools/tor-fw-helper/include.am ---- tor-0.2.4.5-alpha.orig/src/tools/tor-fw-helper/include.am 2012-10-26 22:25:53.000000000 -0400 -+++ tor-0.2.4.5-alpha/src/tools/tor-fw-helper/include.am 2012-10-26 22:26:15.000000000 -0400 -@@ -31,6 +31,6 @@ - miniupnpc_cppflags = +--- tor-0.2.4.5-alpha.orig/src/tools/tor-fw-helper/include.am 2012-10-26 00:39:27.000000000 -0400 ++++ tor-0.2.4.5-alpha/src/tools/tor-fw-helper/include.am 2012-10-27 10:15:53.000000000 -0400 +@@ -23,7 +23,7 @@ + + if MINIUPNPC + miniupnpc_ldflags = @TOR_LDFLAGS_libminiupnpc@ +-miniupnpc_ldadd = -lminiupnpc -lm @TOR_LIB_IPHLPAPI@ ++miniupnpc_ldadd = -lminiupnpc @TOR_LIB_IPHLPAPI@ + miniupnpc_cppflags = @TOR_CPPFLAGS_libminiupnpc@ + else + miniupnpc_ldflags = +@@ -32,5 +32,5 @@ endif --src_tools_tor_fw_helper_tor_fw_helper_LDFLAGS = $(nat_pmp_ldflags) $(miniupnpc_ldflags) -+src_tools_tor_fw_helper_tor_fw_helper_LDFLAGS = $(nat_pmp_ldflags) $(miniupnpc_ldflags) -lm - src_tools_tor_fw_helper_tor_fw_helper_LDADD = src/common/libor.a $(nat_pmp_ldadd) $(miniupnpc_ldadd) @TOR_LIB_WS32@ + src_tools_tor_fw_helper_tor_fw_helper_LDFLAGS = $(nat_pmp_ldflags) $(miniupnpc_ldflags) +-src_tools_tor_fw_helper_tor_fw_helper_LDADD = src/common/libor.a $(nat_pmp_ldadd) $(miniupnpc_ldadd) @TOR_LIB_WS32@ ++src_tools_tor_fw_helper_tor_fw_helper_LDADD = src/common/libor.a $(nat_pmp_ldadd) $(miniupnpc_ldadd) -lm @TOR_LIB_WS32@ src_tools_tor_fw_helper_tor_fw_helper_CPPFLAGS = $(nat_pmp_cppflags) $(miniupnpc_cppflags) |