diff options
| author |   Qi.Chen@windriver.com <Qi.Chen@windriver.com> | 2017-02-24 14:40:42 +0800 |
|---|---|---|
| committer |   Martin Jansa <Martin.Jansa@gmail.com> | 2017-02-28 12:34:15 +0100 |
| commit | 45e1eeb4ba3f75b90de6a44d362ad1fd4a5b5877 (patch) | |
| tree | 4933c2069cb6901690e897e87ed25853d424e5a6 /meta-oe/recipes-extended | |
| parent | 545b16a983d11fa264a86b5d8e5a8a1251bdee56 (diff) | |
| download | meta-openembedded-contrib-45e1eeb4ba3f75b90de6a44d362ad1fd4a5b5877.tar.gz | |
collect: fix to build with glibc 2.25
Fix to build with glibc 2.25 and remove from blacklist.
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-oe/recipes-extended')
| -rw-r--r-- | meta-oe/recipes-extended/collectd/collectd/0001-fix-to-build-with-glibc-2.25.patch | 24 | ||||
| -rw-r--r-- | meta-oe/recipes-extended/collectd/collectd_5.5.0.bb | 3 |
2 files changed, 25 insertions, 2 deletions
diff --git a/meta-oe/recipes-extended/collectd/collectd/0001-fix-to-build-with-glibc-2.25.patch b/meta-oe/recipes-extended/collectd/collectd/0001-fix-to-build-with-glibc-2.25.patch new file mode 100644 index 0000000000..be942e5ef8 --- /dev/null +++ b/meta-oe/recipes-extended/collectd/collectd/0001-fix-to-build-with-glibc-2.25.patch @@ -0,0 +1,24 @@ +Subject: fix to build with glibc 2.25 + +Upstream-Status: Pending + +Signed-off-by: Chen Qi <Qi.Chen@windriver.com> +--- + src/md.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/md.c b/src/md.c +index 3725f9a..202225b 100644 +--- a/src/md.c ++++ b/src/md.c +@@ -25,6 +25,7 @@ + #include "utils_ignorelist.h" + + #include <sys/ioctl.h> ++#include <sys/sysmacros.h> + + #include <linux/major.h> + #include <linux/raid/md_u.h> +-- +2.8.3 + diff --git a/meta-oe/recipes-extended/collectd/collectd_5.5.0.bb b/meta-oe/recipes-extended/collectd/collectd_5.5.0.bb index b544b92c5a..59732db819 100644 --- a/meta-oe/recipes-extended/collectd/collectd_5.5.0.bb +++ b/meta-oe/recipes-extended/collectd/collectd_5.5.0.bb @@ -14,6 +14,7 @@ SRC_URI = "http://collectd.org/files/collectd-${PV}.tar.bz2 \ file://0001-conditionally-check-libvirt.patch \ file://0001-collectd-replace-deprecated-readdir_r-with-readdir.patch \ file://CVE-2016-6254.patch \ + file://0001-fix-to-build-with-glibc-2.25.patch \ " SRC_URI[md5sum] = "c39305ef5514b44238b0d31f77e29e6a" SRC_URI[sha256sum] = "847684cf5c10de1dc34145078af3fcf6e0d168ba98c14f1343b1062a4b569e88" @@ -86,5 +87,3 @@ INITSCRIPT_PARAMS = "defaults" # threshold.so load.so are also provided by gegl # disk.so is also provided by libgphoto2-camlibs PRIVATE_LIBS = "threshold.so load.so disk.so" - -PNBLACKLIST[collectd] ?= "Fails to build with RSS http://errors.yoctoproject.org/Errors/Details/130654/" |