You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
80 lines
2.5 KiB
80 lines
2.5 KiB
Index: configure |
|
--- configure.orig 2017-02-15 07:48:02.000000000 +0100 |
|
+++ configure 2017-02-26 15:18:46.412252000 +0100 |
|
@@ -8645,13 +8645,6 @@ |
|
CXXFLAGS=-O |
|
fi |
|
fi |
|
- # don't strip when profiling |
|
- if test x$DEFAULT_LDFLAGS = xyes -a x$with_profiling != xyes; then |
|
- case "`uname -s`" in |
|
- Darwin) ;; |
|
- *) LDFLAGS="$LDFLAGS -s";; |
|
- esac |
|
- fi |
|
fi |
|
|
|
if test x$with_debug = xyes; then |
|
@@ -8677,11 +8670,10 @@ |
|
CFLAGS="$CFLAGS -Wall" |
|
fi |
|
if test x$GXX = xyes; then |
|
- CXXFLAGS="$CXXFLAGS -Wall -Wwrite-strings -Woverloaded-virtual" |
|
# save some bytes |
|
|
|
|
|
- flags="-fno-exceptions -fno-rtti" |
|
+ flags="" |
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CXX supports $flags" >&5 |
|
$as_echo_n "checking if $CXX supports $flags... " >&6; } |
|
|
|
@@ -15579,7 +15571,7 @@ |
|
lt_cv_prog_compiler_rtti_exceptions=no |
|
ac_outfile=conftest.$ac_objext |
|
echo "$lt_simple_compile_test_code" > conftest.$ac_ext |
|
- lt_compiler_flag="-fno-rtti -fno-exceptions" ## exclude from sc_useless_quotes_in_assignment |
|
+ lt_compiler_flag="" ## exclude from sc_useless_quotes_in_assignment |
|
# Insert the option either (1) after the last *FLAGS variable, or |
|
# (2) before a word containing "conftest.", or (3) at the end. |
|
# Note that $ac_compile itself does not contain backslashes and begins |
|
@@ -15610,7 +15602,7 @@ |
|
$as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; } |
|
|
|
if test yes = "$lt_cv_prog_compiler_rtti_exceptions"; then |
|
- lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions" |
|
+ lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag" |
|
else |
|
: |
|
fi |
|
Index: src/lftp_tinfo.cc |
|
--- src/lftp_tinfo.cc.orig 2016-05-19 10:32:31.000000000 +0200 |
|
+++ src/lftp_tinfo.cc 2017-02-26 15:17:29.865810000 +0100 |
|
@@ -20,20 +20,20 @@ |
|
#include <config.h> |
|
|
|
extern "C" { |
|
-#if defined(HAVE_CURSES_H) |
|
-# include <curses.h> |
|
-# if defined(HAVE_TERM_H) |
|
-# include <term.h> |
|
-# elif defined(HAVE_NCURSES_TERM_H) |
|
-# include <ncurses/term.h> |
|
-# endif |
|
-#elif defined(HAVE_NCURSES_CURSES_H) |
|
+#if defined(HAVE_NCURSES_CURSES_H) |
|
# include <ncurses/curses.h> |
|
# if defined(HAVE_NCURSES_TERM_H) |
|
# include <ncurses/term.h> |
|
# elif defined(HAVE_TERM_H) |
|
# include <term.h> |
|
# endif |
|
+#elif defined(HAVE_CURSES_H) |
|
+# include <curses.h> |
|
+# if defined(HAVE_TERM_H) |
|
+# include <term.h> |
|
+# elif defined(HAVE_NCURSES_TERM_H) |
|
+# include <ncurses/term.h> |
|
+# endif |
|
#elif defined(HAVE_TERMCAP_H) |
|
# include <termcap.h> |
|
#else
|
|
|