diff options
Diffstat (limited to 'package/nmap/patches/patch-configure')
| -rw-r--r-- | package/nmap/patches/patch-configure | 54 |
1 files changed, 24 insertions, 30 deletions
diff --git a/package/nmap/patches/patch-configure b/package/nmap/patches/patch-configure index 378c086e2..2ddd025f1 100644 --- a/package/nmap/patches/patch-configure +++ b/package/nmap/patches/patch-configure @@ -1,16 +1,6 @@ -$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- nmap-4.76.orig/configure 2008-09-09 01:37:03.000000000 +0200 -+++ nmap-4.76/configure 2008-12-14 18:54:23.000000000 +0100 -@@ -4035,7 +4035,7 @@ test -z "$INSTALL_DATA" && INSTALL_DATA= - - - if test -n "$GXX"; then -- CXXFLAGS="$CXXFLAGS -Wall " -+ CXXFLAGS="$CXXFLAGS " - fi - - { echo "$as_me:$LINENO: checking whether the compiler is gcc 4 or greater" >&5 -@@ -6656,86 +6656,6 @@ if test $needs_cpp_precomp = yes; then +--- nmap-5.00.orig/configure 2009-06-24 23:35:54.000000000 +0200 ++++ nmap-5.00/configure 2009-07-20 20:36:51.023261444 +0200 +@@ -7074,90 +7074,6 @@ if test $needs_cpp_precomp = yes; then CXXFLAGS="-no-cpp-precomp $CXXFLAGS" fi @@ -26,14 +16,16 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $ - # link with -lpcap for the purposes of this test - LIBS_OLD="$LIBS" - LIBS="$LIBS -lpcap" -- { echo "$as_me:$LINENO: checking if libpcap version is recent enough" >&5 --echo $ECHO_N "checking if libpcap version is recent enough... $ECHO_C" >&6; } +- { $as_echo "$as_me:$LINENO: checking if libpcap version is recent enough" >&5 +-$as_echo_n "checking if libpcap version is recent enough... " >&6; } - if test "$cross_compiling" = yes; then -- { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling +- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-{ { $as_echo "$as_me:$LINENO: error: cannot run test program while cross compiling -See \`config.log' for more details." >&5 --echo "$as_me: error: cannot run test program while cross compiling +-$as_echo "$as_me: error: cannot run test program while cross compiling -See \`config.log' for more details." >&2;} -- { (exit 1); exit 1; }; } +- { (exit 1); exit 1; }; }; } -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ @@ -62,38 +54,40 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $ - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>&5 - ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then -- { echo "$as_me:$LINENO: result: yes" >&5 --echo "${ECHO_T}yes" >&6; }; have_libpcap=yes +- { $as_echo "$as_me:$LINENO: result: yes" >&5 +-$as_echo "yes" >&6; }; have_libpcap=yes -else -- echo "$as_me: program exited with status $ac_status" >&5 --echo "$as_me: failed program was:" >&5 +- $as_echo "$as_me: program exited with status $ac_status" >&5 +-$as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -( exit $ac_status ) --{ echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6; }; have_libpcap=no +-{ $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; }; have_libpcap=no -fi +-rm -rf conftest.dSYM -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -fi - - -LIBS="$LIBS_OLD" -fi -- + LIBPCAP_LIBS="-lpcap" if test $have_libpcap = yes; then - PCAP_DEPENDS="" |