diff options
| author |   Khem Raj <raj.khem@gmail.com> | 2016-11-15 02:50:51 +0000 |
|---|---|---|
| committer |   Armin Kuster <akuster808@gmail.com> | 2016-11-29 08:22:23 -0800 |
| commit | 7ac8ead611d325d63b8d4555dfb4cb29b1d96580 (patch) | |
| tree | 7e30795a330954dd80eb3dcd2defad92c9124bdc /meta-oe | |
| parent | 6a0899986fb91b98e31ab0af26860a673a4ecff2 (diff) | |
| download | meta-openembedded-7ac8ead611d325d63b8d4555dfb4cb29b1d96580.tar.gz | |
md5deep: Fix build with clang
Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit 856ac210ab223da1adb6e8a30298a10f1d05d61a)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Diffstat (limited to 'meta-oe')
| -rw-r--r-- | meta-oe/recipes-extended/md5deep/files/0001-Fix-errors-found-by-clang.patch | 32 | ||||
| -rw-r--r-- | meta-oe/recipes-extended/md5deep/md5deep_4.4.bb | 1 |
2 files changed, 33 insertions, 0 deletions
diff --git a/meta-oe/recipes-extended/md5deep/files/0001-Fix-errors-found-by-clang.patch b/meta-oe/recipes-extended/md5deep/files/0001-Fix-errors-found-by-clang.patch new file mode 100644 index 0000000000..cc7cdc3364 --- /dev/null +++ b/meta-oe/recipes-extended/md5deep/files/0001-Fix-errors-found-by-clang.patch @@ -0,0 +1,32 @@ +From 6ef69a26126ee4e69a25392fd456b8a66c51dffd Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Tue, 15 Nov 2016 02:46:55 +0000 +Subject: [PATCH] Fix errors found by clang + +Fixes errors like + +../../git/src/hash.cpp:282:19: error: ordered comparison between pointer and zero ('const unsigned char *' and 'int') + if(fdht->base>0){ + ~~~~~~~~~~^~ + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/hash.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/hash.cpp b/src/hash.cpp +index 4216157..52f419b 100644 +--- a/src/hash.cpp ++++ b/src/hash.cpp +@@ -279,7 +279,7 @@ void file_data_hasher_t::hash() + MAP_FILE| + #endif + MAP_SHARED,fd,0); +- if(fdht->base>0){ ++ if(fdht->base != (void *) -1){ + /* mmap is successful, so set the bounds. + * if it is not successful, we default to reading the fd + */ +-- +1.9.1 + diff --git a/meta-oe/recipes-extended/md5deep/md5deep_4.4.bb b/meta-oe/recipes-extended/md5deep/md5deep_4.4.bb index 960e00f61d..bb30abedd9 100644 --- a/meta-oe/recipes-extended/md5deep/md5deep_4.4.bb +++ b/meta-oe/recipes-extended/md5deep/md5deep_4.4.bb @@ -9,6 +9,7 @@ SRCREV = "cd2ed7416685a5e83eb10bb659d6e9bec01244ae" SRC_URI = "git://github.com/jessek/hashdeep.git \ file://wrong-variable-expansion.patch \ + file://0001-Fix-errors-found-by-clang.patch \ " S = "${WORKDIR}/git" |