jer 14/10/02 12:17:00
Added: wireshark-1.99.0.1975-gcc_option.patch
wireshark-1.99.0.1975-sse4_2.patch
Log:
Version bump.
(Portage version: 2.2.14_rc1/cvs/Linux x86_64, signed Manifest commit with
key A792A613)
Revision Changes Path
1.1
net-analyzer/wireshark/files/wireshark-1.99.0.1975-gcc_option.patch
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
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
Index: wireshark-1.99.0.1975-gcc_option.patch
===================================================================
When testing for and adding options to CFLAGS/CXXFLAGS, add them at the start
so that local C*FLAGS override them.
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -1728,15 +1728,15 @@
CFLAGS_saved="$CFLAGS"
if expr "x$GCC_OPTION" : "x-W.*" >/dev/null
then
- CFLAGS="$CFLAGS $ac_wireshark_unknown_warning_option_error $GCC_OPTION"
+ CFLAGS="$GCC_OPTION $CFLAGS $ac_wireshark_unknown_warning_option_error"
elif expr "x$GCC_OPTION" : "x-f.*" >/dev/null
then
- CFLAGS="$CFLAGS -Werror $GCC_OPTION"
+ CFLAGS="$GCC_OPTION $CFLAGS -Werror"
elif expr "x$GCC_OPTION" : "x-m.*" >/dev/null
then
- CFLAGS="$CFLAGS -Werror $GCC_OPTION"
+ CFLAGS="$GCC_OPTION $CFLAGS -Werror"
else
- CFLAGS="$CFLAGS $GCC_OPTION"
+ CFLAGS="$GCC_OPTION $CFLAGS"
fi
AC_COMPILE_IFELSE(
[
@@ -1765,7 +1765,7 @@
# added them, by setting CFLAGS to the saved value plus
# just the new option.
#
- CFLAGS="$CFLAGS_saved $GCC_OPTION"
+ CFLAGS="$GCC_OPTION $CFLAGS_saved"
#
# Add it to the flags we use when building build tools.
#
@@ -1781,7 +1781,7 @@
# added them, by setting CFLAGS to the saved value plus
# just the new option.
#
- CFLAGS="$CFLAGS_saved $GCC_OPTION"
+ CFLAGS="$GCC_OPTION $CFLAGS_saved"
#
# Add it to the flags we use when building build tools.
#
@@ -1818,15 +1818,15 @@
CXXFLAGS_saved="$CXXFLAGS"
if expr "x$GCC_OPTION" : "x-W.*" >/dev/null
then
- CXXFLAGS="$CXXFLAGS $ac_wireshark_unknown_warning_option_error
$ac_wireshark_non_cxx_warning_option_error $GCC_OPTION"
+ CXXFLAGS="$GCC_OPTION $CXXFLAGS
$ac_wireshark_unknown_warning_option_error
$ac_wireshark_non_cxx_warning_option_error"
elif expr "x$GCC_OPTION" : "x-f.*" >/dev/null
then
- CXXFLAGS="$CXXFLAGS -Werror $GCC_OPTION"
+ CXXFLAGS="$GCC_OPTION $CXXFLAGS -Werror"
elif expr "x$GCC_OPTION" : "x-m.*" >/dev/null
then
- CXXFLAGS="$CXXFLAGS -Werror $GCC_OPTION"
+ CXXFLAGS="$GCC_OPTION $CXXFLAGS -Werror"
else
- CXXFLAGS="$CXXFLAGS $GCC_OPTION"
+ CXXFLAGS="$GCC_OPTION $CXXFLAGS"
fi
AC_LANG_PUSH([C++])
AC_COMPILE_IFELSE(
@@ -1856,7 +1856,7 @@
# added them, by setting CXXFLAGS to the saved value plus
# just the new option.
#
- CXXFLAGS="$CXXFLAGS_saved $GCC_OPTION"
+ CXXFLAGS="$GCC_OPTION $CXXFLAGS_saved"
],
[
AC_MSG_RESULT(yes)
@@ -1868,7 +1868,7 @@
# added them, by setting CXXFLAGS to the saved value plus
# just the new option.
#
- CXXFLAGS="$CXXFLAGS_saved $GCC_OPTION"
+ CXXFLAGS="$GCC_OPTION $CXXFLAGS_saved"
fi
],
[
1.1
net-analyzer/wireshark/files/wireshark-1.99.0.1975-sse4_2.patch
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
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
Index: wireshark-1.99.0.1975-sse4_2.patch
===================================================================
--- a/configure.ac
+++ b/configure.ac
@@ -985,6 +985,7 @@
AC_SUBST(PIE_CFLAGS)
AC_SUBST(PIE_LDFLAGS)
+AC_ARG_ENABLE(sse4_2,[ --enable-sse4_2 Support SSE4.2 (Streaming SIMD
Extensions 4.2) instructions],[
CFLAGS_before_simd="$CFLAGS"
AC_WIRESHARK_COMPILER_FLAGS_CHECK(-msse4.2, C)
if test "x$CFLAGS" != "x$CFLAGS_before_simd"
@@ -1011,6 +1012,9 @@
else
have_sse42=no
fi
+],[
+AC_MSG_RESULT(no)
+])
dnl build libwsutil_sse42 only if there is SSE4.2
AM_CONDITIONAL(SSE42_SUPPORTED, test "x$have_sse42" = "xyes")
AC_SUBST(CFLAGS_SSE42)
