From: "Wang Mingyu" <wangmy@cn.fujitsu.com>
To: <openembedded-devel@lists.openembedded.org>
Cc: Wang Mingyu <wangmy@cn.fujitsu.com>
Subject: [PATCH] czmq: Conflict resolution for sha1.h
Date: Fri, 12 Mar 2021 12:24:58 +0800 [thread overview]
Message-ID: <1615523098-8089-1-git-send-email-wangmy@cn.fujitsu.com> (raw)
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>
---
meta-oe/recipes-connectivity/zeromq/czmq_4.2.1.bb | 4 ++++
1 file changed, 4 insertions(+)
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..56b688cad1 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}/${PV}
+ mv ${D}/${includedir}/sha1.h ${D}/${includedir}/${PV}/.
+}
--
2.25.1
next reply other threads:[~2021-03-12 4:25 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-12 4:24 Wang Mingyu [this message]
2021-03-12 6:36 ` [oe] [PATCH] czmq: Conflict resolution for sha1.h Khem Raj
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1615523098-8089-1-git-send-email-wangmy@cn.fujitsu.com \
--to=wangmy@cn.fujitsu.com \
--cc=openembedded-devel@lists.openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.