diff options
| author |   Roy.Li <rongqing.li@windriver.com> | 2014-09-24 08:18:57 +0800 |
|---|---|---|
| committer |   Joe MacDonald <joe_macdonald@mentor.com> | 2014-09-23 22:00:07 -0400 |
| commit | bb62e5fd88b0721d61cc7da491a6a6dea21d3dd7 (patch) | |
| tree | fda09294bb4ecca0412a3a9b6a5d79a372c0fda4 | |
| parent | 1fbaf1ca73b18d723991b337086859d7b367a78c (diff) | |
| download | meta-openembedded-contrib-bb62e5fd88b0721d61cc7da491a6a6dea21d3dd7.tar.gz | |
wireshark: not put the CC options into CFLAGS_FOR_BUILD
Signed-off-by: Roy Li <rongqing.li@windriver.com>
Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
| -rw-r--r-- | meta-networking/recipes-support/wireshark/files/Do-not-set-CC_FOR_BUILD-flags.patch | 46 | ||||
| -rw-r--r-- | meta-networking/recipes-support/wireshark/wireshark_1.12.1.bb | 1 |
2 files changed, 47 insertions, 0 deletions
diff --git a/meta-networking/recipes-support/wireshark/files/Do-not-set-CC_FOR_BUILD-flags.patch b/meta-networking/recipes-support/wireshark/files/Do-not-set-CC_FOR_BUILD-flags.patch new file mode 100644 index 0000000000..64a08add79 --- /dev/null +++ b/meta-networking/recipes-support/wireshark/files/Do-not-set-CC_FOR_BUILD-flags.patch @@ -0,0 +1,46 @@ +[PATCH] Do not set CC_FOR_BUILD flags + +Upstream-status: Pending + +AC_WIRESHARK_COMPILER_FLAGS_CHECK() is checking which options CC is supported, +and put the supported options into CFLAGS, but it should not put them into +CFLAGS_FOR_BUILD. since CC and BUILD_CC can be different, CFLAGS_FOR_BUILD is +used by BUILD_CC + +BUILD_CC is used to generated host tools, do not use the gcc's optimised options, +do not effect the running of host tools. so do not set CC_FOR_BUILD flags. + +Signed-off-by: Roy.Li <rongqing.li@windriver.com> +--- + acinclude.m4 | 8 -------- + 1 file changed, 8 deletions(-) + +diff --git a/acinclude.m4 b/acinclude.m4 +index 136fc27..8d3d360 100644 +--- a/acinclude.m4 ++++ b/acinclude.m4 +@@ -1755,10 +1755,6 @@ if test "x$ac_supports_gcc_flags" = "xyes" ; then + # 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 @@ if test "x$ac_supports_gcc_flags" = "xyes" ; then + # 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 + ], + [ +-- +1.9.1 + diff --git a/meta-networking/recipes-support/wireshark/wireshark_1.12.1.bb b/meta-networking/recipes-support/wireshark/wireshark_1.12.1.bb index 71cc0823a0..147c513955 100644 --- a/meta-networking/recipes-support/wireshark/wireshark_1.12.1.bb +++ b/meta-networking/recipes-support/wireshark/wireshark_1.12.1.bb @@ -8,6 +8,7 @@ DEPENDS = "perl-native libcap libpcap pcre expat glib-2.0 libnl sbc" SRC_URI = " \ http://wiresharkdownloads.riverbed.com/wireshark/src/wireshark-${PV}.tar.bz2 \ + file://Do-not-set-CC_FOR_BUILD-flags.patch \ " PE = "1" |