[yocto] [meta-raspberrypi][PATCH 1/3] userland: Fix build for armv7

[Andrei Gherzan]

[Bug #49]

Change-Id: I340b4134ae4227f315c1c3df1345b04ebd4b874b
Signed-off-by: Andrei Gherzan <andrei at gherzan.ro>
---
 conf/machine/raspberrypi2.conf            | 5 -----
 recipes-graphics/userland/userland_git.bb | 1 +
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/conf/machine/raspberrypi2.conf b/conf/machine/raspberrypi2.conf
index 778f5a6..30edae3 100644
--- a/conf/machine/raspberrypi2.conf
+++ b/conf/machine/raspberrypi2.conf
@@ -2,11 +2,6 @@
 #@NAME: RaspberryPi 2 Development Board
 #@DESCRIPTION: Machine configuration for the RaspberryPi 2
 
-# userland is not compiling on RPI 2
-# https://github.com/raspberrypi/userland/issues/214
-PREFERRED_PROVIDER_virtual/egl ?= "vc-graphics-hardfp"
-PREFERRED_PROVIDER_virtual/libgles2 ?= "vc-graphics-hardfp"
-
 DEFAULTTUNE ?= "cortexa7thf-neon-vfpv4"
 
 require conf/machine/include/tune-cortexa7.inc
diff --git a/recipes-graphics/userland/userland_git.bb b/recipes-graphics/userland/userland_git.bb
index 77c98d7..ddca36e 100644
--- a/recipes-graphics/userland/userland_git.bb
+++ b/recipes-graphics/userland/userland_git.bb
@@ -22,6 +22,7 @@ S = "${WORKDIR}/git"
 inherit cmake
 
 EXTRA_OECMAKE = "-DCMAKE_BUILD_TYPE=Release -DCMAKE_EXE_LINKER_FLAGS='-Wl,--no-as-needed'"
+CFLAGS_append = " -fPIC"
 
 # The compiled binaries don't provide sonames.
 SOLIBS = "${SOLIBSDEV}"
-- 
2.1.0