mirror of
https://git.FreeBSD.org/ports.git
synced 2024-12-23 04:23:08 +00:00
68 lines
1.6 KiB
Plaintext
68 lines
1.6 KiB
Plaintext
--- configure.orig 2011-10-26 20:42:18.000000000 -0400
|
|
+++ configure 2011-10-27 23:01:20.000000000 -0400
|
|
@@ -3334,7 +3334,7 @@
|
|
# Check whether --enable-linker-hardening was given.
|
|
if test "${enable_linker_hardening+set}" = set; then :
|
|
enableval=$enable_linker_hardening; if test x$enableval = xyes; then
|
|
- LDFLAGS="$LDFLAGS -z relro -z now"
|
|
+ LDFLAGS="$LDFLAGS -Wl,-z,relro -Wl,-z,now"
|
|
fi
|
|
fi
|
|
|
|
@@ -6276,7 +6276,7 @@
|
|
ac_res=$ac_cv_search_clock_gettime
|
|
if test "$ac_res" != no; then :
|
|
test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
|
|
- have_rt=yes
|
|
+# have_rt=yes
|
|
fi
|
|
|
|
if test "$have_rt" = yes; then
|
|
@@ -6285,6 +6285,7 @@
|
|
fi
|
|
|
|
|
|
+if false ; then
|
|
trylibeventdir=""
|
|
|
|
# Check whether --with-libevent-dir was given.
|
|
@@ -6611,6 +6612,7 @@
|
|
LIBS="$tor_saved_LIBS"
|
|
LDFLAGS="$tor_saved_LDFLAGS"
|
|
CPPFLAGS="$tor_saved_CPPFLAGS"
|
|
+fi
|
|
|
|
|
|
|
|
@@ -6673,6 +6675,7 @@
|
|
fi
|
|
|
|
|
|
+if false ; then
|
|
if test "$enable_static_libevent" = "yes"; then
|
|
if test "$tor_cv_library_libevent_dir" = "(system)"; then
|
|
as_fn_error $? "\"You must specify an explicit --with-libevent-dir=x option when using --enable-static-libevent\"" "$LINENO" 5
|
|
@@ -6682,6 +6685,7 @@
|
|
else
|
|
TOR_LIBEVENT_LIBS="-levent"
|
|
fi
|
|
+fi
|
|
|
|
if test "$enable_bufferevents" = "yes" ; then
|
|
if test "$ac_cv_header_event2_bufferevent_ssl_h" != "yes" ; then
|
|
@@ -6760,12 +6764,14 @@
|
|
|
|
$as_echo "#define USE_BUFFEREVENTS 1" >>confdefs.h
|
|
|
|
+if false ; then
|
|
if test "$enable_static_libevent" = "yes"; then
|
|
TOR_LIBEVENT_LIBS="$TOR_LIBDIR_libevent/libevent_openssl.a $TOR_LIBEVENT_LIBS"
|
|
else
|
|
TOR_LIBEVENT_LIBS="-levent_openssl $TOR_LIBEVENT_LIBS"
|
|
fi
|
|
fi
|
|
+fi
|
|
|
|
|
|
|