mirror of
https://gitlab.torproject.org/tpo/core/tor.git
synced 2024-11-11 05:33:47 +01:00
Merge branch 'haiku_port_rebase'
This commit is contained in:
commit
ec18c8a06e
14
changes/portability_01_haiku
Normal file
14
changes/portability_01_haiku
Normal file
@ -0,0 +1,14 @@
|
||||
o Minor buxfixes:
|
||||
- During configure, search for library containing cos function as
|
||||
libm lives in libcore on some platforms (BeOS/Haiku).
|
||||
Linking against libm was hard-coded before. Bugfix on
|
||||
0.2.2.2-alpha, fixes the first part of bug 4727. Patch and
|
||||
analysis by Martin Hebnes Pedersen.
|
||||
- Preprocessor directives should not be put inside the arguments
|
||||
of a macro. This would break compilation with GCC releases prior
|
||||
to version 3.3. We would never recommend such an old GCC
|
||||
version, but it is apparently required for binary compatibility
|
||||
on some platforms (namely, certain builds of Haiku). Bugfix on
|
||||
0.2.3.3-alpha, fixes the other part of bug 4727. Patch and
|
||||
analysis by Martin Hebnes Pedersen.
|
||||
|
16
configure.in
16
configure.in
@ -279,7 +279,7 @@ fi
|
||||
|
||||
AC_C_BIGENDIAN
|
||||
|
||||
AC_SEARCH_LIBS(socket, [socket])
|
||||
AC_SEARCH_LIBS(socket, [socket network])
|
||||
AC_SEARCH_LIBS(gethostbyname, [nsl])
|
||||
AC_SEARCH_LIBS(dlopen, [dl])
|
||||
AC_SEARCH_LIBS(inet_aton, [resolv])
|
||||
@ -482,6 +482,20 @@ if test "$enable_bufferevents" = "yes"; then
|
||||
fi
|
||||
AC_SUBST(TOR_LIBEVENT_LIBS)
|
||||
|
||||
dnl ------------------------------------------------------
|
||||
dnl Where do you live, libm?
|
||||
|
||||
dnl On some platforms (Haiku/BeOS) the math library is
|
||||
dnl part of libroot. In which case don't link against lm
|
||||
TOR_LIB_MATH=""
|
||||
save_LIBS="$LIBS"
|
||||
AC_SEARCH_LIBS(pow, [m], , AC_MSG_ERROR([Could not find pow in libm or libc.]))
|
||||
if test "$ac_cv_search_pow" != "none required"; then
|
||||
TOR_LIB_MATH="$ac_cv_search_pow"
|
||||
fi
|
||||
LIBS="$save_LIBS"
|
||||
AC_SUBST(TOR_LIB_MATH)
|
||||
|
||||
dnl ------------------------------------------------------
|
||||
dnl Where do you live, openssl? And how do we call you?
|
||||
|
||||
|
@ -74,7 +74,7 @@ AM_CPPFLAGS = -DSHARE_DATADIR="\"$(datadir)\"" \
|
||||
tor_LDFLAGS = @TOR_LDFLAGS_zlib@ @TOR_LDFLAGS_openssl@ @TOR_LDFLAGS_libevent@
|
||||
tor_LDADD = ./libtor.a ../common/libor.a ../common/libor-crypto.a \
|
||||
../common/libor-event.a \
|
||||
@TOR_ZLIB_LIBS@ -lm @TOR_LIBEVENT_LIBS@ @TOR_OPENSSL_LIBS@ \
|
||||
@TOR_ZLIB_LIBS@ @TOR_LIB_MATH@ @TOR_LIBEVENT_LIBS@ @TOR_OPENSSL_LIBS@ \
|
||||
@TOR_LIB_WS32@ @TOR_LIB_GDI@
|
||||
|
||||
noinst_HEADERS = \
|
||||
|
@ -2268,13 +2268,12 @@ tor_init(int argc, char *argv[])
|
||||
|
||||
{
|
||||
const char *version = get_version();
|
||||
log_notice(LD_GENERAL, "Tor v%s%s running on %s.", version,
|
||||
#ifdef USE_BUFFEREVENTS
|
||||
" (with bufferevents)",
|
||||
log_notice(LD_GENERAL, "Tor v%s (with bufferevents) running on %s.",
|
||||
version, get_uname());
|
||||
#else
|
||||
"",
|
||||
log_notice(LD_GENERAL, "Tor v%s running on %s.", version, get_uname());
|
||||
#endif
|
||||
get_uname());
|
||||
|
||||
log_notice(LD_GENERAL, "Tor can't help you if you use it wrong! "
|
||||
"Learn how to be safe at "
|
||||
|
@ -31,15 +31,15 @@ test_LDFLAGS = @TOR_LDFLAGS_zlib@ @TOR_LDFLAGS_openssl@ \
|
||||
@TOR_LDFLAGS_libevent@
|
||||
test_LDADD = ../or/libtor.a ../common/libor.a ../common/libor-crypto.a \
|
||||
../common/libor-event.a \
|
||||
@TOR_ZLIB_LIBS@ -lm @TOR_LIBEVENT_LIBS@ @TOR_OPENSSL_LIBS@ \
|
||||
@TOR_LIB_WS32@ @TOR_LIB_GDI@
|
||||
@TOR_ZLIB_LIBS@ @TOR_LIB_MATH@ @TOR_LIBEVENT_LIBS@ \
|
||||
@TOR_OPENSSL_LIBS@ @TOR_LIB_WS32@ @TOR_LIB_GDI@
|
||||
|
||||
bench_LDFLAGS = @TOR_LDFLAGS_zlib@ @TOR_LDFLAGS_openssl@ \
|
||||
@TOR_LDFLAGS_libevent@
|
||||
bench_LDADD = ../or/libtor.a ../common/libor.a ../common/libor-crypto.a \
|
||||
../common/libor-event.a \
|
||||
@TOR_ZLIB_LIBS@ -lm @TOR_LIBEVENT_LIBS@ @TOR_OPENSSL_LIBS@ \
|
||||
@TOR_LIB_WS32@ @TOR_LIB_GDI@
|
||||
@TOR_ZLIB_LIBS@ @TOR_LIB_MATH@ @TOR_LIBEVENT_LIBS@ \
|
||||
@TOR_OPENSSL_LIBS@ @TOR_LIB_WS32@ @TOR_LIB_GDI@
|
||||
|
||||
noinst_HEADERS = \
|
||||
tinytest.h \
|
||||
|
@ -3,17 +3,19 @@ noinst_PROGRAMS = tor-checkkey
|
||||
|
||||
tor_resolve_SOURCES = tor-resolve.c
|
||||
tor_resolve_LDFLAGS =
|
||||
tor_resolve_LDADD = ../common/libor.a -lm @TOR_LIB_WS32@
|
||||
tor_resolve_LDADD = ../common/libor.a @TOR_LIB_MATH@ @TOR_LIB_WS32@
|
||||
|
||||
tor_gencert_SOURCES = tor-gencert.c
|
||||
tor_gencert_LDFLAGS = @TOR_LDFLAGS_zlib@ @TOR_LDFLAGS_openssl@
|
||||
tor_gencert_LDADD = ../common/libor.a ../common/libor-crypto.a \
|
||||
-lm @TOR_ZLIB_LIBS@ @TOR_OPENSSL_LIBS@ @TOR_LIB_WS32@ @TOR_LIB_GDI@
|
||||
@TOR_LIB_MATH@ @TOR_ZLIB_LIBS@ @TOR_OPENSSL_LIBS@ \
|
||||
@TOR_LIB_WS32@ @TOR_LIB_GDI@
|
||||
|
||||
tor_checkkey_SOURCES = tor-checkkey.c
|
||||
tor_checkkey_LDFLAGS = @TOR_LDFLAGS_zlib@ @TOR_LDFLAGS_openssl@
|
||||
tor_checkkey_LDADD = ../common/libor.a ../common/libor-crypto.a \
|
||||
-lm @TOR_ZLIB_LIBS@ @TOR_OPENSSL_LIBS@ @TOR_LIB_WS32@ @TOR_LIB_GDI@
|
||||
@TOR_LIB_MATH@ @TOR_ZLIB_LIBS@ @TOR_OPENSSL_LIBS@ \
|
||||
@TOR_LIB_WS32@ @TOR_LIB_GDI@
|
||||
|
||||
SUBDIRS = tor-fw-helper
|
||||
DIST_SUBDIRS = tor-fw-helper
|
||||
|
Loading…
Reference in New Issue
Block a user