diff options
| author | Chris Larson <clarson@kergoth.com> | 2004-11-09 00:36:47 +0000 |
|---|---|---|
| committer | Chris Larson <clarson@kergoth.com> | 2004-11-09 00:36:47 +0000 |
| commit | f96441b9faf769c9ecdd4d338b605ea3d0cc4010 (patch) | |
| tree | edb17ec2c4ea13c5acb1c7350957a249a820e28d /tcpdump | |
| parent | b6588aa6851fb220cedc387d21c51513ef8d67f4 (diff) | |
Disable bk EOLN_NATIVE conversions on all files in packages FILESPATHs, to prevent it screwing up patches.
BKrev: 4190111fA4MuVozAqwE7xOSL9fr-TA
Diffstat (limited to 'tcpdump')
| -rw-r--r-- | tcpdump/files/fix-paths.patch | 34 | ||||
| -rw-r--r-- | tcpdump/files/tcpdump_configure_no_-O2.patch | 36 |
2 files changed, 70 insertions, 0 deletions
diff --git a/tcpdump/files/fix-paths.patch b/tcpdump/files/fix-paths.patch index e69de29bb2..0cd321007a 100644 --- a/tcpdump/files/fix-paths.patch +++ b/tcpdump/files/fix-paths.patch @@ -0,0 +1,34 @@ + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +--- tcpdump-3.8.3/configure~fix-paths.patch ++++ tcpdump-3.8.3/configure +@@ -8904,7 +8904,7 @@ + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +- ac_lbl_cv_pcap_debug_defined=yes ++ ac_lbl_cv_pcap_debug_defined=no + else + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 +@@ -8963,7 +8963,7 @@ + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +- ac_lbl_cv_yydebug_defined=yes ++ ac_lbl_cv_yydebug_defined=no + else + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 +@@ -9700,7 +9700,7 @@ + echo $ECHO_N "checking for SSLeay... $ECHO_C" >&6 + ac_cv_ssleay_path=no + incdir=no +-for dir in /usr/${host_alias} /usr /usr/local /usr/local/ssl /usr/pkg; do ++for dir in /bla; do + # + # XXX - is there a better way to check if a given library is + # in a given directory than checking each of the possible diff --git a/tcpdump/files/tcpdump_configure_no_-O2.patch b/tcpdump/files/tcpdump_configure_no_-O2.patch index e69de29bb2..773fc52e54 100644 --- a/tcpdump/files/tcpdump_configure_no_-O2.patch +++ b/tcpdump/files/tcpdump_configure_no_-O2.patch @@ -0,0 +1,36 @@ +--- tcpdump-3.8.3/configure 2004-03-28 23:06:09.000000000 +0200 ++++ tcpdump-3.8.3.mod/configure 2004-07-29 13:04:18.450769088 +0200 +@@ -2059,13 +2059,13 @@ + CFLAGS=$ac_save_CFLAGS + elif test $ac_cv_prog_cc_g = yes; then + if test "$GCC" = yes; then +- CFLAGS="-g -O2" ++ CFLAGS="-g" + else + CFLAGS="-g" + fi + else + if test "$GCC" = yes; then +- CFLAGS="-O2" ++ CFLAGS="" + else + CFLAGS= + fi +@@ -2291,7 +2291,7 @@ + if test "$GCC" = yes ; then + if test "$SHLICC2" = yes ; then + ac_cv_lbl_gcc_vers=2 +- V_CCOPT="-O2" ++ V_CCOPT="" + else + echo "$as_me:$LINENO: checking gcc version" >&5 + echo $ECHO_N "checking gcc version... $ECHO_C" >&6 +@@ -2308,7 +2308,7 @@ + echo "$as_me:$LINENO: result: $ac_cv_lbl_gcc_vers" >&5 + echo "${ECHO_T}$ac_cv_lbl_gcc_vers" >&6 + if test $ac_cv_lbl_gcc_vers -gt 1 ; then +- V_CCOPT="-O2" ++ V_CCOPT="" + fi + fi + else |