diff options
| author |   Khem Raj <raj.khem@gmail.com> | 2018-09-19 11:55:41 -0700 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-09-20 05:41:25 -0700 |
| commit | fcede6dd3e44d9f7761d058db76dfaf103b75c6a (patch) | |
| tree | edb573d3dc4654cc6fdc10afadb86e9666dd6cd9 | |
| parent | 4340928b8878b91b5a2750eb6bc87918740511ca (diff) | |
| download | openembedded-core-contrib-fcede6dd3e44d9f7761d058db76dfaf103b75c6a.tar.gz | |
mtools: Fix build with clang
Identify with __clang__ to undefine UNUSED
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-devtools/mtools/mtools/clang_UNUSED.patch | 17 | ||||
| -rw-r--r-- | meta/recipes-devtools/mtools/mtools_4.0.18.bb | 1 |
2 files changed, 18 insertions, 0 deletions
diff --git a/meta/recipes-devtools/mtools/mtools/clang_UNUSED.patch b/meta/recipes-devtools/mtools/mtools/clang_UNUSED.patch new file mode 100644 index 0000000000..6bb9d6a3da --- /dev/null +++ b/meta/recipes-devtools/mtools/mtools/clang_UNUSED.patch @@ -0,0 +1,17 @@ +Undefine UNUSED macros with clang + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +Index: mtools-4.0.18/sysincludes.h +=================================================================== +--- mtools-4.0.18.orig/sysincludes.h ++++ mtools-4.0.18/sysincludes.h +@@ -101,7 +101,7 @@ typedef void *caddr_t; + #if defined __GNUC__ && defined __STDC__ + /* gcc -traditional doesn't have PACKED, UNUSED and NORETURN */ + # define PACKED __attribute__ ((packed)) +-# if __GNUC__ == 2 && __GNUC_MINOR__ > 6 || __GNUC__ >= 3 ++# if (__GNUC__ == 2 && __GNUC_MINOR__ > 6 || __GNUC__ >= 3) && !defined(__clang__) + /* gcc 2.6.3 doesn't have "unused" */ /* mool */ + # define UNUSED(x) x __attribute__ ((unused));x + # define UNUSEDP __attribute__ ((unused)) diff --git a/meta/recipes-devtools/mtools/mtools_4.0.18.bb b/meta/recipes-devtools/mtools/mtools_4.0.18.bb index 91f7b7c610..3c31aca3ad 100644 --- a/meta/recipes-devtools/mtools/mtools_4.0.18.bb +++ b/meta/recipes-devtools/mtools/mtools_4.0.18.bb @@ -32,6 +32,7 @@ SRC_URI = "${GNU_MIRROR}/mtools/mtools-${PV}.tar.bz2 \ file://no-x11.gplv3.patch \ file://0001-Continue-even-if-fs-size-is-not-divisible-by-sectors.patch \ file://0001-remove-LOCK_NB-to-use-blocking-request.patch \ + file://clang_UNUSED.patch \ " SRC_URI_append_class-native = " file://disable-hardcoded-configs.patch" |