Code Review
/
AGL
/
meta-agl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Fix compilation of AMB if icecc is installed on the build machine.
[AGL/meta-agl.git]
/
meta-ivi-common
/
recipes-automotive
/
automotive-message-broker
/
automotive-message-broker_git.bb
diff --git
a/meta-ivi-common/recipes-automotive/automotive-message-broker/automotive-message-broker_git.bb
b/meta-ivi-common/recipes-automotive/automotive-message-broker/automotive-message-broker_git.bb
index
b921b99
..
324fa26
100644
(file)
--- a/
meta-ivi-common/recipes-automotive/automotive-message-broker/automotive-message-broker_git.bb
+++ b/
meta-ivi-common/recipes-automotive/automotive-message-broker/automotive-message-broker_git.bb
@@
-11,9
+11,9
@@
inherit cmake systemd
PV = "0.12+git${SRCPV}"
PV = "0.12+git${SRCPV}"
-# The 'gpsd'
cause conflict
bluez4 and bluez5 because
+# The 'gpsd'
leads to a conflict between
bluez4 and bluez5 because
# meta-openembedded/meta-oe/recipes-navigation/gpsd/gpsd_3.10.bb is able to
# meta-openembedded/meta-oe/recipes-navigation/gpsd/gpsd_3.10.bb is able to
-# select bluez4 only instead AGL Distro choose
d bluez5 at Changes
4141.
+# select bluez4 only instead AGL Distro choose
bluez5 at changeset
4141.
# <https://gerrit.automotivelinux.org/gerrit/#/c/4141/>
#
# As temporary treatment, removing 'gpsd' from DEPENDS will let bitbake to build correctly.
# <https://gerrit.automotivelinux.org/gerrit/#/c/4141/>
#
# As temporary treatment, removing 'gpsd' from DEPENDS will let bitbake to build correctly.
@@
-33,6
+33,12
@@
SYSTEMD_SERVICE_${PN} = "ambd.service"
S = "${WORKDIR}/git"
S = "${WORKDIR}/git"
+# amb detects icecc in cmake and would override the
+# compiler selection of yocto. This breaks the build
+# if icecc is installed on the host.
+# -> Disable the detection in cmake.
+EXTRA_OECMAKE += " -Denable_icecc=OFF"
+
do_install_append() {
mv ${D}/usr/include/amb/* ${D}/usr/include
do_install_append() {
mv ${D}/usr/include/amb/* ${D}/usr/include