| 1 |
jer 14/10/02 12:17:00 |
| 2 |
|
| 3 |
Added: wireshark-1.99.0.1975-gcc_option.patch |
| 4 |
wireshark-1.99.0.1975-sse4_2.patch |
| 5 |
Log: |
| 6 |
Version bump. |
| 7 |
|
| 8 |
(Portage version: 2.2.14_rc1/cvs/Linux x86_64, signed Manifest commit with key A792A613) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.1 net-analyzer/wireshark/files/wireshark-1.99.0.1975-gcc_option.patch |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/wireshark/files/wireshark-1.99.0.1975-gcc_option.patch?rev=1.1&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/wireshark/files/wireshark-1.99.0.1975-gcc_option.patch?rev=1.1&content-type=text/plain |
| 15 |
|
| 16 |
Index: wireshark-1.99.0.1975-gcc_option.patch |
| 17 |
=================================================================== |
| 18 |
When testing for and adding options to CFLAGS/CXXFLAGS, add them at the start |
| 19 |
so that local C*FLAGS override them. |
| 20 |
|
| 21 |
|
| 22 |
--- a/acinclude.m4 |
| 23 |
+++ b/acinclude.m4 |
| 24 |
@@ -1728,15 +1728,15 @@ |
| 25 |
CFLAGS_saved="$CFLAGS" |
| 26 |
if expr "x$GCC_OPTION" : "x-W.*" >/dev/null |
| 27 |
then |
| 28 |
- CFLAGS="$CFLAGS $ac_wireshark_unknown_warning_option_error $GCC_OPTION" |
| 29 |
+ CFLAGS="$GCC_OPTION $CFLAGS $ac_wireshark_unknown_warning_option_error" |
| 30 |
elif expr "x$GCC_OPTION" : "x-f.*" >/dev/null |
| 31 |
then |
| 32 |
- CFLAGS="$CFLAGS -Werror $GCC_OPTION" |
| 33 |
+ CFLAGS="$GCC_OPTION $CFLAGS -Werror" |
| 34 |
elif expr "x$GCC_OPTION" : "x-m.*" >/dev/null |
| 35 |
then |
| 36 |
- CFLAGS="$CFLAGS -Werror $GCC_OPTION" |
| 37 |
+ CFLAGS="$GCC_OPTION $CFLAGS -Werror" |
| 38 |
else |
| 39 |
- CFLAGS="$CFLAGS $GCC_OPTION" |
| 40 |
+ CFLAGS="$GCC_OPTION $CFLAGS" |
| 41 |
fi |
| 42 |
AC_COMPILE_IFELSE( |
| 43 |
[ |
| 44 |
@@ -1765,7 +1765,7 @@ |
| 45 |
# added them, by setting CFLAGS to the saved value plus |
| 46 |
# just the new option. |
| 47 |
# |
| 48 |
- CFLAGS="$CFLAGS_saved $GCC_OPTION" |
| 49 |
+ CFLAGS="$GCC_OPTION $CFLAGS_saved" |
| 50 |
# |
| 51 |
# Add it to the flags we use when building build tools. |
| 52 |
# |
| 53 |
@@ -1781,7 +1781,7 @@ |
| 54 |
# added them, by setting CFLAGS to the saved value plus |
| 55 |
# just the new option. |
| 56 |
# |
| 57 |
- CFLAGS="$CFLAGS_saved $GCC_OPTION" |
| 58 |
+ CFLAGS="$GCC_OPTION $CFLAGS_saved" |
| 59 |
# |
| 60 |
# Add it to the flags we use when building build tools. |
| 61 |
# |
| 62 |
@@ -1818,15 +1818,15 @@ |
| 63 |
CXXFLAGS_saved="$CXXFLAGS" |
| 64 |
if expr "x$GCC_OPTION" : "x-W.*" >/dev/null |
| 65 |
then |
| 66 |
- CXXFLAGS="$CXXFLAGS $ac_wireshark_unknown_warning_option_error $ac_wireshark_non_cxx_warning_option_error $GCC_OPTION" |
| 67 |
+ CXXFLAGS="$GCC_OPTION $CXXFLAGS $ac_wireshark_unknown_warning_option_error $ac_wireshark_non_cxx_warning_option_error" |
| 68 |
elif expr "x$GCC_OPTION" : "x-f.*" >/dev/null |
| 69 |
then |
| 70 |
- CXXFLAGS="$CXXFLAGS -Werror $GCC_OPTION" |
| 71 |
+ CXXFLAGS="$GCC_OPTION $CXXFLAGS -Werror" |
| 72 |
elif expr "x$GCC_OPTION" : "x-m.*" >/dev/null |
| 73 |
then |
| 74 |
- CXXFLAGS="$CXXFLAGS -Werror $GCC_OPTION" |
| 75 |
+ CXXFLAGS="$GCC_OPTION $CXXFLAGS -Werror" |
| 76 |
else |
| 77 |
- CXXFLAGS="$CXXFLAGS $GCC_OPTION" |
| 78 |
+ CXXFLAGS="$GCC_OPTION $CXXFLAGS" |
| 79 |
fi |
| 80 |
AC_LANG_PUSH([C++]) |
| 81 |
AC_COMPILE_IFELSE( |
| 82 |
@@ -1856,7 +1856,7 @@ |
| 83 |
# added them, by setting CXXFLAGS to the saved value plus |
| 84 |
# just the new option. |
| 85 |
# |
| 86 |
- CXXFLAGS="$CXXFLAGS_saved $GCC_OPTION" |
| 87 |
+ CXXFLAGS="$GCC_OPTION $CXXFLAGS_saved" |
| 88 |
], |
| 89 |
[ |
| 90 |
AC_MSG_RESULT(yes) |
| 91 |
@@ -1868,7 +1868,7 @@ |
| 92 |
# added them, by setting CXXFLAGS to the saved value plus |
| 93 |
# just the new option. |
| 94 |
# |
| 95 |
- CXXFLAGS="$CXXFLAGS_saved $GCC_OPTION" |
| 96 |
+ CXXFLAGS="$GCC_OPTION $CXXFLAGS_saved" |
| 97 |
fi |
| 98 |
], |
| 99 |
[ |
| 100 |
|
| 101 |
|
| 102 |
|
| 103 |
1.1 net-analyzer/wireshark/files/wireshark-1.99.0.1975-sse4_2.patch |
| 104 |
|
| 105 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/wireshark/files/wireshark-1.99.0.1975-sse4_2.patch?rev=1.1&view=markup |
| 106 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/wireshark/files/wireshark-1.99.0.1975-sse4_2.patch?rev=1.1&content-type=text/plain |
| 107 |
|
| 108 |
Index: wireshark-1.99.0.1975-sse4_2.patch |
| 109 |
=================================================================== |
| 110 |
--- a/configure.ac |
| 111 |
+++ b/configure.ac |
| 112 |
@@ -985,6 +985,7 @@ |
| 113 |
AC_SUBST(PIE_CFLAGS) |
| 114 |
AC_SUBST(PIE_LDFLAGS) |
| 115 |
|
| 116 |
+AC_ARG_ENABLE(sse4_2,[ --enable-sse4_2 Support SSE4.2 (Streaming SIMD Extensions 4.2) instructions],[ |
| 117 |
CFLAGS_before_simd="$CFLAGS" |
| 118 |
AC_WIRESHARK_COMPILER_FLAGS_CHECK(-msse4.2, C) |
| 119 |
if test "x$CFLAGS" != "x$CFLAGS_before_simd" |
| 120 |
@@ -1011,6 +1012,9 @@ |
| 121 |
else |
| 122 |
have_sse42=no |
| 123 |
fi |
| 124 |
+],[ |
| 125 |
+AC_MSG_RESULT(no) |
| 126 |
+]) |
| 127 |
dnl build libwsutil_sse42 only if there is SSE4.2 |
| 128 |
AM_CONDITIONAL(SSE42_SUPPORTED, test "x$have_sse42" = "xyes") |
| 129 |
AC_SUBST(CFLAGS_SSE42) |
Archives