diff options
| author |   Adrian Bunk <bunk@stusta.de> | 2019-08-06 18:39:09 +0300 |
|---|---|---|
| committer |   Khem Raj <raj.khem@gmail.com> | 2019-08-08 10:01:45 -0700 |
| commit | 13299ccca097ffc76b0c9fbb26afc199101326fe (patch) | |
| tree | f1c6009f75d166d99510558834898ff4914cb101 /meta-oe/recipes-connectivity | |
| parent | 2f36fb71c9091dc0f07a53335ec663e02745d278 (diff) | |
| download | meta-openembedded-contrib-13299ccca097ffc76b0c9fbb26afc199101326fe.tar.gz | |
modemmanager: Use a simpler workaround for the clang build
The check whether the compiler understands an option is broken
in m4/compiler_warnings.m4, but if we are just workarounding it
then do a minimal workaround without patching.
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-oe/recipes-connectivity')
| -rw-r--r-- | meta-oe/recipes-connectivity/modemmanager/modemmanager/0001-Do-not-set-Wno-unused-but-set-variable.patch | 30 | ||||
| -rw-r--r-- | meta-oe/recipes-connectivity/modemmanager/modemmanager_1.10.0.bb | 3 |
2 files changed, 1 insertions, 32 deletions
diff --git a/meta-oe/recipes-connectivity/modemmanager/modemmanager/0001-Do-not-set-Wno-unused-but-set-variable.patch b/meta-oe/recipes-connectivity/modemmanager/modemmanager/0001-Do-not-set-Wno-unused-but-set-variable.patch deleted file mode 100644 index dcbe01d5ed..0000000000 --- a/meta-oe/recipes-connectivity/modemmanager/modemmanager/0001-Do-not-set-Wno-unused-but-set-variable.patch +++ /dev/null @@ -1,30 +0,0 @@ -From d4f73b037d11d20f080e74c05df28853fb833075 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Fri, 7 Dec 2018 22:59:47 -0800 -Subject: [PATCH] Do not set Wno-unused-but-set-variable - -This is gcc specific warning, not implemented by pretending to be gcc -like compilers e.g. clang. - -We will pass this option from recipe - -Upstream-Status: Inappropriate [OE-Specific] - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - m4/compiler_warnings.m4 | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/m4/compiler_warnings.m4 b/m4/compiler_warnings.m4 -index f498a28..e65e97f 100644 ---- a/m4/compiler_warnings.m4 -+++ b/m4/compiler_warnings.m4 -@@ -11,7 +11,7 @@ if test "$GCC" = "yes" -a "$set_more_warnings" != "no"; then - -Wdeclaration-after-statement -Wstrict-prototypes \ - -Wno-unused-parameter -Wno-sign-compare \ - -Wno-deprecated-declarations \ -- -Wno-unused-but-set-variable -Wformat-security; do -+ -Wno-unused -Wformat-security; do - SAVE_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS $option" - AC_MSG_CHECKING([whether gcc understands $option]) diff --git a/meta-oe/recipes-connectivity/modemmanager/modemmanager_1.10.0.bb b/meta-oe/recipes-connectivity/modemmanager/modemmanager_1.10.0.bb index 1ad19e8f7e..ef5af3a57d 100644 --- a/meta-oe/recipes-connectivity/modemmanager/modemmanager_1.10.0.bb +++ b/meta-oe/recipes-connectivity/modemmanager/modemmanager_1.10.0.bb @@ -12,7 +12,6 @@ inherit gnomebase gettext systemd vala gobject-introspection bash-completion DEPENDS = "glib-2.0 libgudev intltool-native libxslt-native" SRC_URI = "http://www.freedesktop.org/software/ModemManager/ModemManager-${PV}.tar.xz \ - file://0001-Do-not-set-Wno-unused-but-set-variable.patch \ " SRC_URI[md5sum] = "92d25176d0cc9d588ca29700b33c7d98" SRC_URI[sha256sum] = "fd0f39996025dac96995daea8a58ec7dd571582f7563a8ae0d5f65b571b76ee2" @@ -33,7 +32,7 @@ PACKAGECONFIG[qmi] = "--with-qmi,--without-qmi,libqmi" EXTRA_OECONF = " \ --with-udev-base-dir=${nonarch_base_libdir}/udev \ " -CFLAGS_append_toolchain-gcc = " -Wno-unused-but-set-variable" +EXTRA_OECONF_append_toolchain-clang = " --enable-more-warnings=no" FILES_${PN} += " \ ${datadir}/icons \ |