aboutsummaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-connectivity
diff options
context:
space:
mode:
authorWang Mingyu <wangmy@cn.fujitsu.com>2021-03-12 15:16:59 +0800
committerKhem Raj <raj.khem@gmail.com>2021-03-12 15:55:07 -0800
commitf40beb15db6a3357b5357e0076026c7fb2471427 (patch)
tree01d546c4e7e5edae8f861f8c25fd7e71a034188b /meta-oe/recipes-connectivity
parent2266a8a19440d66dd59823df2e0bb8249e6c4eb4 (diff)
downloadmeta-openembedded-contrib-f40beb15db6a3357b5357e0076026c7fb2471427.tar.gz
czmq: Conflict resolution for sha1.h
libmd(oe-core) also uses the doc 'sha1.h', so package it in own subdirs of czmq. Signed-off-by: Wang Mingyu <wangmy@cn.fujitsu.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-oe/recipes-connectivity')
-rw-r--r--meta-oe/recipes-connectivity/zeromq/czmq_4.2.1.bb4
1 files changed, 4 insertions, 0 deletions
diff --git a/meta-oe/recipes-connectivity/zeromq/czmq_4.2.1.bb b/meta-oe/recipes-connectivity/zeromq/czmq_4.2.1.bb
index e742d2a1c4..e6a4bc4c42 100644
--- a/meta-oe/recipes-connectivity/zeromq/czmq_4.2.1.bb
+++ b/meta-oe/recipes-connectivity/zeromq/czmq_4.2.1.bb
@@ -30,3 +30,7 @@ PACKAGECONFIG[systemd] = ",-DCMAKE_DISABLE_FIND_PACKAGE_systemd=TRUE,systemd"
BBCLASSEXTEND = "nativesdk"
+do_install_append() {
+ mkdir -p ${D}/${includedir}/${BPN}
+ mv ${D}/${includedir}/sha1.h ${D}/${includedir}/${BPN}/.
+}