[meta-fsl-arm PATCH v2 1/2] xf86-video-imxfb-vivante: obey LDFLAGS settings

[meta-fsl-arm PATCH v2 1/2] xf86-video-imxfb-vivante: obey LDFLAGS settings

[Otavio Salvador]

The gcc-cross default linker hash has been changed in OE-Core:fa436aeb,
due that the broken recipes (which were not respecting the set LDFLAGS
settings) are now exposed.

This fixes the error setting the need Make flags so the build system
obey the LDFLAGS setting.

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---

Changes in v2:
- Drop imx-test PR change

 recipes-graphics/xorg-driver/xf86-video-imxfb-vivante.inc            | 3 ++-
 recipes-graphics/xorg-driver/xf86-video-imxfb-vivante_5.0.11.p8.4.bb | 2 ++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/recipes-graphics/xorg-driver/xf86-video-imxfb-vivante.inc b/recipes-graphics/xorg-driver/xf86-video-imxfb-vivante.inc
index aa37555..8bac151 100644
--- a/recipes-graphics/xorg-driver/xf86-video-imxfb-vivante.inc
+++ b/recipes-graphics/xorg-driver/xf86-video-imxfb-vivante.inc
@@ -1,5 +1,5 @@
 # Copyright (C) 2012-2015 Freescale Semiconductor
-# Copyright (C) 2012-2014 O.S. Systems Software LTDA.
+# Copyright (C) 2012-2016 O.S. Systems Software LTDA.
 # Released under the MIT license (see COPYING.MIT for the terms)
 
 require recipes-graphics/xorg-driver/xorg-driver-video.inc
@@ -21,6 +21,7 @@ INITSCRIPT_PARAMS = "start 99 2 3 4 5 ."
 
 EXTRA_OEMAKE += "-C ${S} -f Makefile prefix=${D}/usr \
                  sysroot=${STAGING_DIR_TARGET} \
+                 LFLAGS="${LDFLAGS}" \
                  BUSID_HAS_NUMBER=1 \
                  BUILD_IN_YOCTO=1 \
                  XSERVER_GREATER_THAN_13=1"
diff --git a/recipes-graphics/xorg-driver/xf86-video-imxfb-vivante_5.0.11.p8.4.bb b/recipes-graphics/xorg-driver/xf86-video-imxfb-vivante_5.0.11.p8.4.bb
index 497d37a..8276fb5 100644
--- a/recipes-graphics/xorg-driver/xf86-video-imxfb-vivante_5.0.11.p8.4.bb
+++ b/recipes-graphics/xorg-driver/xf86-video-imxfb-vivante_5.0.11.p8.4.bb
@@ -8,3 +8,5 @@ SRC_URI += "file://Stop-using-Git-to-write-local-version.patch"
 
 SRC_URI[md5sum] = "7a2c8d4e56c33b9692d252193f00ef44"
 SRC_URI[sha256sum] = "ddb6de9e00ce0b22f6c905eaf6694424413eade53ef6cd3b36e20ac99dcc0e0f"
+
+PR = "r1"
-- 
2.9.3

[meta-fsl-arm PATCH v2 2/2] imx-test: obey LDFLAGS settings

[Otavio Salvador]

The gcc-cross default linker hash has been changed in OE-Core:fa436aeb,
due that the broken recipes (which were not respecting the set LDFLAGS
settings) are now exposed.

This fixes the error setting the need Make flags so the build system
obey the LDFLAGS setting.

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---

Changes in v2:
- add PR change to imx-test patch

 recipes-bsp/imx-test/imx-test.inc      | 2 +-
 recipes-bsp/imx-test/imx-test_5.4.1.bb | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/recipes-bsp/imx-test/imx-test.inc b/recipes-bsp/imx-test/imx-test.inc
index 10dbb4d..f0b26a1 100644
--- a/recipes-bsp/imx-test/imx-test.inc
+++ b/recipes-bsp/imx-test/imx-test.inc
@@ -40,7 +40,6 @@ do_make_scripts[depends] += "virtual/kernel:do_install"
 
 do_compile() {
     CFLAGS="${TOOLCHAIN_OPTIONS}"
-    LDFLAGS="${TOOLCHAIN_OPTIONS} -L${STAGING_LIBDIR}"
     oe_runmake V=1 VERBOSE='' \
                CROSS_COMPILE=${TARGET_PREFIX} \
                INC="-I${STAGING_INCDIR} \
@@ -52,6 +51,7 @@ do_compile() {
                     -I${STAGING_KERNEL_DIR}/arch/arm/include \
                     -I${STAGING_KERNEL_DIR}/drivers/mxc/security/rng/include \
                     -I${STAGING_KERNEL_DIR}/drivers/mxc/security/sahara2/include" \
+               CC="${CC} -L${STAGING_LIBDIR} ${LDFLAGS}" \
                LINUXPATH=${STAGING_KERNEL_DIR} \
                KBUILD_OUTPUT=${STAGING_KERNEL_BUILDDIR} \
                PLATFORM=${PLATFORM}
diff --git a/recipes-bsp/imx-test/imx-test_5.4.1.bb b/recipes-bsp/imx-test/imx-test_5.4.1.bb
index 04aad14..e33cc8d 100644
--- a/recipes-bsp/imx-test/imx-test_5.4.1.bb
+++ b/recipes-bsp/imx-test/imx-test_5.4.1.bb
@@ -5,4 +5,6 @@ include imx-test.inc
 SRC_URI[md5sum] = "fa1a5cdcfbdd6a3fed0ab4a5fd1f97bc"
 SRC_URI[sha256sum] = "997ec10bdc6991e9687a2c2fa5816bb50b08d73bcfe4093f988a7cac4bf0b06a"
 
+PR = "r1"
+
 COMPATIBLE_MACHINE = "(mx6|mx6ul|mx7)"
-- 
2.9.3