diff options
author | Khem Raj <raj.khem@gmail.com> | 2018-06-21 18:50:38 -0700 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2018-06-22 10:52:33 -0700 |
commit | 1477cf5460fa1e99abbd1117aa7007c89e173680 (patch) | |
tree | 6f4bcf7b55a2bb8868845623eaf5753939abdef0 /meta-oe/recipes-extended/upm | |
parent | 01b0afc65d31d563dd0bf7b767f8c0714bc11905 (diff) | |
download | meta-openembedded-contrib-1477cf5460fa1e99abbd1117aa7007c89e173680.tar.gz |
upm: Upgrade to latest and fix build with musl
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-oe/recipes-extended/upm')
-rw-r--r-- | meta-oe/recipes-extended/upm/upm/0001-include-sys-types.h-for-uint-definition.patch | 33 | ||||
-rw-r--r-- | meta-oe/recipes-extended/upm/upm_git.bb | 11 |
2 files changed, 38 insertions, 6 deletions
diff --git a/meta-oe/recipes-extended/upm/upm/0001-include-sys-types.h-for-uint-definition.patch b/meta-oe/recipes-extended/upm/upm/0001-include-sys-types.h-for-uint-definition.patch new file mode 100644 index 00000000000..a0a47411d70 --- /dev/null +++ b/meta-oe/recipes-extended/upm/upm/0001-include-sys-types.h-for-uint-definition.patch @@ -0,0 +1,33 @@ +From 48a580bd402cf6a3ee9e42013653219bfeb3caf6 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Thu, 21 Jun 2018 18:39:16 -0700 +Subject: [PATCH] include sys/types.h for uint definition + +uint is defined in sys/types.h, therefore this +header needs to be included, it gets exposed with +musl where this header is not getting included indirectly +as it is happening when building on glibc + +Fixes build errors on musl e.g. +upm/src/kx122/kx122.hpp:456:31: error: 'uint' has not been declared +| void setBufferThreshold(uint samples); +| ^~~~ + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- +Upstream-Status: Submitted [https://github.com/intel-iot-devkit/upm/pull/656] + src/kx122/kx122.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/kx122/kx122.h b/src/kx122/kx122.h +index 1622ed50..56e5215e 100644 +--- a/src/kx122/kx122.h ++++ b/src/kx122/kx122.h +@@ -31,6 +31,7 @@ extern "C"{ + #include <assert.h> + #include <unistd.h> + #include <math.h> ++#include <sys/types.h> + + #include <mraa/i2c.h> + #include <mraa/spi.h> diff --git a/meta-oe/recipes-extended/upm/upm_git.bb b/meta-oe/recipes-extended/upm/upm_git.bb index 478aa0db1d5..babe5f48939 100644 --- a/meta-oe/recipes-extended/upm/upm_git.bb +++ b/meta-oe/recipes-extended/upm/upm_git.bb @@ -7,13 +7,13 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=66493d54e65bfc12c7983ff2e884f37f" DEPENDS = "libjpeg-turbo mraa" -SRCREV = "37642f3b0194f6ddd63f1e6b5d49b8cb689d5c81" +SRCREV = "dc45cd78595c7c24c8a8574c63bb48b5bb99c5aa" PV = "1.6.0-git${SRCPV}" -SRC_URI = " \ - git://github.com/intel-iot-devkit/${BPN}.git;protocol=http \ - file://0001-Replace-strncpy-with-memcpy.patch \ -" +SRC_URI = "git://github.com/intel-iot-devkit/${BPN}.git;protocol=http \ + file://0001-Replace-strncpy-with-memcpy.patch \ + file://0001-include-sys-types.h-for-uint-definition.patch \ + " S = "${WORKDIR}/git" @@ -22,7 +22,6 @@ COMPATIBLE_HOST = "(x86_64.*|i.86.*|aarch64.*|arm.*)-linux" inherit distutils3-base cmake - # override this in local.conf to get needed bindings. # BINDINGS_pn-upm="python" # will result in only the python bindings being built/packaged. |