|
@@ -11,30 +11,28 @@ http://autobuild.buildroot.net/results/2b1/2b1a0654b649618422d65edf370b82476ba84
|
|
|
|
|
|
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
|
|
|
|
|
|
-diff -Nura wireshark-1.10.3.orig/acinclude.m4 wireshark-1.10.3/acinclude.m4
|
|
|
---- wireshark-1.10.3.orig/acinclude.m4 2013-12-04 14:06:44.986074426 -0300
|
|
|
-+++ wireshark-1.10.3/acinclude.m4 2013-12-04 14:25:36.496356791 -0300
|
|
|
-@@ -1664,11 +1664,6 @@
|
|
|
- # the saved value plus just the new option.
|
|
|
- #
|
|
|
- CFLAGS="$CFLAGS_saved $GCC_OPTION"
|
|
|
-- #
|
|
|
-- # Add it to the flags we use when building
|
|
|
-- # build tools.
|
|
|
-- #
|
|
|
-- CFLAGS_FOR_BUILD="$CFLAGS_FOR_BUILD $GCC_OPTION"
|
|
|
- if test "$2" != C ; then
|
|
|
- #
|
|
|
- # Add it to the C++ flags as well.
|
|
|
-@@ -1687,11 +1682,6 @@
|
|
|
- # the saved value plus just the new option.
|
|
|
- #
|
|
|
- CFLAGS="$CFLAGS_saved $GCC_OPTION"
|
|
|
-- #
|
|
|
-- # Add it to the flags we use when building
|
|
|
-- # build tools.
|
|
|
-- #
|
|
|
-- CFLAGS_FOR_BUILD="$CFLAGS_FOR_BUILD $GCC_OPTION"
|
|
|
- if test "$2" != C ; then
|
|
|
- #
|
|
|
- # Add it to the C++ flags as well.
|
|
|
+diff -Nura wireshark-1.12.0.orig/acinclude.m4 wireshark-1.12.0/acinclude.m4
|
|
|
+--- wireshark-1.12.0.orig/acinclude.m4 2014-09-04 15:45:38.365255309 -0300
|
|
|
++++ wireshark-1.12.0/acinclude.m4 2014-09-04 15:46:23.349810353 -0300
|
|
|
+@@ -1755,10 +1755,6 @@
|
|
|
+ # just the new option.
|
|
|
+ #
|
|
|
+ CFLAGS="$CFLAGS_saved $GCC_OPTION"
|
|
|
+- #
|
|
|
+- # Add it to the flags we use when building build tools.
|
|
|
+- #
|
|
|
+- CFLAGS_FOR_BUILD="$CFLAGS_FOR_BUILD $GCC_OPTION"
|
|
|
+ ],
|
|
|
+ [
|
|
|
+ AC_MSG_RESULT(yes)
|
|
|
+@@ -1771,10 +1767,6 @@
|
|
|
+ # just the new option.
|
|
|
+ #
|
|
|
+ CFLAGS="$CFLAGS_saved $GCC_OPTION"
|
|
|
+- #
|
|
|
+- # Add it to the flags we use when building build tools.
|
|
|
+- #
|
|
|
+- CFLAGS_FOR_BUILD="$CFLAGS_FOR_BUILD $GCC_OPTION"
|
|
|
+ fi
|
|
|
+ ],
|
|
|
+ [
|