[oe,meta-oe,7/8] upm: Disable -Wno-misleading-indentation with clang10+

Message ID 20191231010652.3206534-6-raj.khem@gmail.com
State Accepted
Commit 729af58460cf9d29e27e73655f38f15c7465713e
Headers show
Series
  • [oe,meta-oe,1/8] glfw: Update to latest
Related show

Commit Message

Khem Raj Dec. 31, 2019, 1:06 a.m.
Signed-off-by: Khem Raj <raj.khem@gmail.com>

---
 ...o-misleading-indentation-with-clang-.patch | 33 +++++++++++++++++++
 meta-oe/recipes-extended/upm/upm_git.bb       |  1 +
 2 files changed, 34 insertions(+)
 create mode 100644 meta-oe/recipes-extended/upm/upm/0001-cmake-Disable-Wno-misleading-indentation-with-clang-.patch

-- 
2.24.1

-- 
_______________________________________________
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

Comments

Adrian Bunk Dec. 31, 2019, 7:40 a.m. | #1
On Mon, Dec 30, 2019 at 05:06:51PM -0800, Khem Raj wrote:
>...

> ++# clang-10 added  -Wmisleading-indentation as well, skipp it too

> ++if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang" AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER "9")

> ++  list (APPEND C_CXX_WARNING_FLAGS -Wno-misleading-indentation)

> ++endif ()

> ++

> + # Warnings as errors?

> + if (WERROR)

> +   list (APPEND C_CXX_WARNING_FLAGS -Werror)

>...


Would disabling WERROR solve this and future similar problems?

cu
Adrian
-- 
_______________________________________________
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Khem Raj Dec. 31, 2019, 7:52 a.m. | #2
On Mon, Dec 30, 2019 at 11:40 PM Adrian Bunk <bunk@stusta.de> wrote:
>

> On Mon, Dec 30, 2019 at 05:06:51PM -0800, Khem Raj wrote:

> >...

> > ++# clang-10 added  -Wmisleading-indentation as well, skipp it too

> > ++if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang" AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER "9")

> > ++  list (APPEND C_CXX_WARNING_FLAGS -Wno-misleading-indentation)

> > ++endif ()

> > ++

> > + # Warnings as errors?

> > + if (WERROR)

> > +   list (APPEND C_CXX_WARNING_FLAGS -Werror)

> >...

>

> Would disabling WERROR solve this and future similar problems?

>


Upstream has a similar patch to disable this warning on gcc, so its
better to follow what
they are doing.

> cu

> Adrian

-- 
_______________________________________________
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

Patch

diff --git a/meta-oe/recipes-extended/upm/upm/0001-cmake-Disable-Wno-misleading-indentation-with-clang-.patch b/meta-oe/recipes-extended/upm/upm/0001-cmake-Disable-Wno-misleading-indentation-with-clang-.patch
new file mode 100644
index 0000000000..68b73bc2cc
--- /dev/null
+++ b/meta-oe/recipes-extended/upm/upm/0001-cmake-Disable-Wno-misleading-indentation-with-clang-.patch
@@ -0,0 +1,33 @@ 
+From d41e2bef1c39dcbc4896b1dd7ab168da530672b5 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Mon, 30 Dec 2019 13:33:39 -0800
+Subject: [PATCH] cmake: Disable -Wno-misleading-indentation with clang-10 onwards
+
+clang also introduced this warning now
+
+Upstream-Status: Submitted [https://github.com/eclipse/upm/pull/693]
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ CMakeLists.txt | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 069e4902..47c7f4c3 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -99,6 +99,11 @@ if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU" AND CMAKE_CXX_COMPILER_VERSION VERSION_
+   list (APPEND C_CXX_WARNING_FLAGS -Wno-misleading-indentation)
+ endif ()
+ 
++# clang-10 added  -Wmisleading-indentation as well, skipp it too
++if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang" AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER "9")
++  list (APPEND C_CXX_WARNING_FLAGS -Wno-misleading-indentation)
++endif ()
++
+ # Warnings as errors?
+ if (WERROR)
+   list (APPEND C_CXX_WARNING_FLAGS -Werror)
+-- 
+2.24.1
+
diff --git a/meta-oe/recipes-extended/upm/upm_git.bb b/meta-oe/recipes-extended/upm/upm_git.bb
index 7564738dda..6db8f88252 100644
--- a/meta-oe/recipes-extended/upm/upm_git.bb
+++ b/meta-oe/recipes-extended/upm/upm_git.bb
@@ -14,6 +14,7 @@  SRC_URI = "git://github.com/intel-iot-devkit/${BPN}.git;protocol=http \
            file://0001-CMakeLists.txt-Use-SWIG_SUPPORT_FILES-to-find-the-li.patch \
            file://0001-Use-stdint-types.patch \
            file://0001-initialize-local-variables-before-use.patch \
+           file://0001-cmake-Disable-Wno-misleading-indentation-with-clang-.patch \
            "
 
 SRC_URI_append_toolchain-clang_x86 = " file://0001-nmea_gps-Link-with-latomic.patch "