| 1 |
jer 15/05/31 18:09:03 |
| 2 |
|
| 3 |
Added: wireshark-1.99.6-gcc_option.patch |
| 4 |
Log: |
| 5 |
Version bump. |
| 6 |
|
| 7 |
(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key A792A613) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 net-analyzer/wireshark/files/wireshark-1.99.6-gcc_option.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/wireshark/files/wireshark-1.99.6-gcc_option.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/wireshark/files/wireshark-1.99.6-gcc_option.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: wireshark-1.99.6-gcc_option.patch |
| 16 |
=================================================================== |
| 17 |
--- a/acinclude.m4 |
| 18 |
+++ b/acinclude.m4 |
| 19 |
@@ -1735,15 +1735,15 @@ |
| 20 |
CXXFLAGS_saved="$CXXFLAGS" |
| 21 |
if expr "x$GCC_OPTION" : "x-W.*" >/dev/null |
| 22 |
then |
| 23 |
- CXXFLAGS="$CXXFLAGS $ac_wireshark_unknown_warning_option_error $ac_wireshark_non_cxx_warning_option_error $GCC_OPTION" |
| 24 |
+ CXXFLAGS="$GCC_OPTION $CXXFLAGS $ac_wireshark_unknown_warning_option_error $ac_wireshark_non_cxx_warning_option_error" |
| 25 |
elif expr "x$GCC_OPTION" : "x-f.*" >/dev/null |
| 26 |
then |
| 27 |
- CXXFLAGS="$CXXFLAGS -Werror $GCC_OPTION" |
| 28 |
+ CXXFLAGS="$GCC_OPTION $CXXFLAGS -Werror" |
| 29 |
elif expr "x$GCC_OPTION" : "x-m.*" >/dev/null |
| 30 |
then |
| 31 |
- CXXFLAGS="$CXXFLAGS -Werror $GCC_OPTION" |
| 32 |
+ CXXFLAGS="$GCC_OPTION $CXXFLAGS -Werror" |
| 33 |
else |
| 34 |
- CXXFLAGS="$CXXFLAGS $GCC_OPTION" |
| 35 |
+ CXXFLAGS="$GCC_OPTION $CXXFLAGS" |
| 36 |
fi |
| 37 |
AC_LANG_PUSH([C++]) |
| 38 |
AC_COMPILE_IFELSE( |
| 39 |
@@ -1773,7 +1773,7 @@ |
| 40 |
# added them, by setting CXXFLAGS to the saved value plus |
| 41 |
# just the new option. |
| 42 |
# |
| 43 |
- CXXFLAGS="$CXXFLAGS_saved $GCC_OPTION" |
| 44 |
+ CXXFLAGS="$GCC_OPTION $CXXFLAGS_saved" |
| 45 |
], |
| 46 |
[ |
| 47 |
AC_MSG_RESULT(yes) |
| 48 |
@@ -1785,7 +1785,7 @@ |
| 49 |
# added them, by setting CXXFLAGS to the saved value plus |
| 50 |
# just the new option. |
| 51 |
# |
| 52 |
- CXXFLAGS="$CXXFLAGS_saved $GCC_OPTION" |
| 53 |
+ CXXFLAGS="$GCC_OPTION $CXXFLAGS_saved" |
| 54 |
fi |
| 55 |
], |
| 56 |
[ |
Archives