summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Asselstine <mark.asselstine@windriver.com>2016-03-18 16:50:09 -0400
committerBruce Ashfield <bruce.ashfield@windriver.com>2016-03-21 10:19:41 -0400
commit2594110cff733c603f97a812238fddf6cdf746df (patch)
tree522340dcdcabeddf5e4761c52b19c78ae4ec6829
parentbad6eb2ea97b93394703fa803083431fed983464 (diff)
downloadmeta-cloud-services-2594110cff733c603f97a812238fddf6cdf746df.tar.gz
tgt: pass required CFLAGS
The tgt Makefile has several CFLAGS (defines) that need to be set. Since we overwrite the CFLAGS by exporting CFLAGS and passing '-e' to make, we need to include these in our defined CFLAGS. Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com> Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
-rw-r--r--meta-openstack/recipes-support/tgt/tgt_git.bb7
1 files changed, 4 insertions, 3 deletions
diff --git a/meta-openstack/recipes-support/tgt/tgt_git.bb b/meta-openstack/recipes-support/tgt/tgt_git.bb
index a5df710..ac240f0 100644
--- a/meta-openstack/recipes-support/tgt/tgt_git.bb
+++ b/meta-openstack/recipes-support/tgt/tgt_git.bb
@@ -4,9 +4,8 @@ LICENSE = "GPLv2"
4LIC_FILES_CHKSUM = "file://scripts/tgtd.spec;beginline=7;endline=7;md5=21c19ea7dad04648b9c2f791b6e29b4c" 4LIC_FILES_CHKSUM = "file://scripts/tgtd.spec;beginline=7;endline=7;md5=21c19ea7dad04648b9c2f791b6e29b4c"
5DEPENDS = "sg3-utils" 5DEPENDS = "sg3-utils"
6 6
7SRCREV = "ab51727a361bf296b1c2036375b5e45479059921" 7SRCREV = "eca74a72d2595f126a020111943928c3ea9e6fe8"
8PV = "1.0.60+git${SRCPV}" 8PV = "1.0.63+git${SRCPV}"
9PR = "r0"
10 9
11SRC_URI = "git://github.com/fujita/tgt.git \ 10SRC_URI = "git://github.com/fujita/tgt.git \
12 file://0001-Correct-the-path-of-header-files-check-in-Yocto-buil.patch \ 11 file://0001-Correct-the-path-of-header-files-check-in-Yocto-buil.patch \
@@ -20,6 +19,8 @@ CONFFILES_${PN} += "${sysconfdir}/tgt/targets.conf"
20 19
21inherit update-rc.d 20inherit update-rc.d
22 21
22CFLAGS += ' -I. -DUSE_SIGNALFD -DUSE_TIMERFD -D_GNU_SOURCE -DTGT_VERSION=\\"1.0.63\\" -DBSDIR=\\"${libdir}/backing-store\\"'
23
23do_compile() { 24do_compile() {
24 oe_runmake SYSROOT="${STAGING_DIR_TARGET}" -e programs conf scripts 25 oe_runmake SYSROOT="${STAGING_DIR_TARGET}" -e programs conf scripts
25} 26}