From b70dec3fedff9923f443cee2cd70b6f2318e63a2 Mon Sep 17 00:00:00 2001 From: Eric Le Bihan Date: Wed, 2 Apr 2014 16:42:26 +0200 Subject: [PATCH] eudev: only use pragma diagnostics if GCC supports it. eudev uses GCC pragma diagnostics [1] for some of its logging functions, to circumvent -Wformat-nonliteral. This feature is only available in GCC >= 4.6. The external toolchains for some architectures (PowerPC, SuperH) are based on GCC 4.5. So eudev will not compile when using them. systemd also uses the pragma diagnostics, but its dependency on Linux headers >= 3.8 for the toolchain indirectly forces recent versions of GCC. This workaround enables the pragma diagnostics only when using GCC >= 4.6. This means that if the user uses GCC 4.5 and explicitly sets the options -Werror -Wformat-nonliteral, the build will fail... [1] http://gcc.gnu.org/onlinedocs/gcc/Diagnostic-Pragmas.html#Diagnostic-Pragmas Signed-off-by: Eric Le Bihan Signed-off-by: Thomas Petazzoni --- ...-pragma-for-ignoring-diagnostics-if-.patch | 37 +++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 package/eudev/eudev-0003-libudev-Only-use-pragma-for-ignoring-diagnostics-if-.patch diff --git a/package/eudev/eudev-0003-libudev-Only-use-pragma-for-ignoring-diagnostics-if-.patch b/package/eudev/eudev-0003-libudev-Only-use-pragma-for-ignoring-diagnostics-if-.patch new file mode 100644 index 0000000000..8b70fbf8ad --- /dev/null +++ b/package/eudev/eudev-0003-libudev-Only-use-pragma-for-ignoring-diagnostics-if-.patch @@ -0,0 +1,37 @@ +From dc8aa43b7b6d0cead7d8a0c1a151d289a5233a10 Mon Sep 17 00:00:00 2001 +From: Eric Le Bihan +Date: Wed, 2 Apr 2014 12:36:52 +0200 +Subject: [PATCH] libudev: Only use #pragma for ignoring diagnostics if GCC + version supports it. + + +Signed-off-by: Eric Le Bihan +--- + src/libudev/macro.h | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/src/libudev/macro.h b/src/libudev/macro.h +index ac2a23f..fb55983 100644 +--- a/src/libudev/macro.h ++++ b/src/libudev/macro.h +@@ -40,12 +40,17 @@ + #define _cleanup_(x) __attribute__((cleanup(x))) + + ++#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6) + #define DISABLE_WARNING_FORMAT_NONLITERAL \ + _Pragma("GCC diagnostic push"); \ + _Pragma("GCC diagnostic ignored \"-Wformat-nonliteral\"") + + #define REENABLE_WARNING \ + _Pragma("GCC diagnostic pop") ++#else ++#define DISABLE_WARNING_FORMAT_NONLITERAL ++#define REENABLE_WARNING ++#endif + + /* Rounds up */ + +-- +1.7.9.5 +