From: Martin Kelly <mkelly@xevo.com>
Date: Mon, 27 Mar 2017 22:06:28 +0000 (-0700)
Subject: dlt-daemon: build with -fPIC
X-Git-Tag: 3.99.1~108
X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=commitdiff_plain;h=7480d16c667a773f6762a15934c4e617b0731f72;p=AGL%2Fmeta-agl.git

dlt-daemon: build with -fPIC

I tried turning on the Yocto security flags and hit a compilation
error due to dlt-daemon's copy of gtest not compiling. Adding -fPIC
fixes the issue.

Change-Id: I21f81949436e553426f7d1b7e17dd39717f0cf9d
Signed-off-by: Martin Kelly <mkelly@xevo.com>
---

diff --git a/meta-ivi-common/recipes-extended/dlt-daemon/dlt-daemon_2.11.1.bb b/meta-ivi-common/recipes-extended/dlt-daemon/dlt-daemon_2.11.1.bb
index 183e2e923..dc7cc9493 100644
--- a/meta-ivi-common/recipes-extended/dlt-daemon/dlt-daemon_2.11.1.bb
+++ b/meta-ivi-common/recipes-extended/dlt-daemon/dlt-daemon_2.11.1.bb
@@ -29,6 +29,15 @@ S = "${WORKDIR}/git"
 
 inherit gzipnative autotools gettext cmake systemd
 
+# -fPIC is needed to prevent relocation errors when we compile gtest with
+# Yocto security flags. See this issue for more details:
+#
+# https://github.com/google/googletest/issues/854
+#
+# If that issue is fixed, we can probably remove the manual -fPIC flags here.
+OECMAKE_C_FLAGS += " -fPIC"
+OECMAKE_CXX_FLAGS += " -fPIC"
+
 PACKAGES += "${PN}-systemd"
 SYSTEMD_PACKAGES = "${PN} ${PN}-systemd"
 SYSTEMD_SERVICE_${PN} = "dlt-system.service dlt.service"
diff --git a/meta-ivi-common/recipes-extended/dlt-daemon/dlt-daemon_2.15.0.bb b/meta-ivi-common/recipes-extended/dlt-daemon/dlt-daemon_2.15.0.bb
index 8ab95d1ec..d068f250f 100644
--- a/meta-ivi-common/recipes-extended/dlt-daemon/dlt-daemon_2.15.0.bb
+++ b/meta-ivi-common/recipes-extended/dlt-daemon/dlt-daemon_2.15.0.bb
@@ -23,6 +23,15 @@ S = "${WORKDIR}/git"
 
 inherit gzipnative autotools gettext cmake systemd
 
+# -fPIC is needed to prevent relocation errors when we compile gtest with
+# Yocto security flags. See this issue for more details:
+#
+# https://github.com/google/googletest/issues/854
+#
+# If that issue is fixed, we can probably remove the manual -fPIC flags here.
+OECMAKE_C_FLAGS += " -fPIC"
+OECMAKE_CXX_FLAGS += " -fPIC"
+
 PACKAGES += "${PN}-systemd"
 SYSTEMD_PACKAGES = "${PN} ${PN}-systemd"
 SYSTEMD_SERVICE_${PN} = "dlt-system.service dlt.service"