From 70ddee3ebeacbc53180ee7221533375bf0c9eac4 Mon Sep 17 00:00:00 2001 From: Gary Thomas Date: Mon, 5 Oct 2015 16:09:17 -0600 Subject: qt4: Fix *.la pollution Recent [platform dependent] changes to QT_CONFIG_FLAGS allow some C-preprocessor defines to creep into *.la (libtool) files. This are not allowed (or even handled) and cause linker errors when trying to link against these libraries. This patch removes the incorrect/erroneous preprocessor directives to leave the *.la files useable once again. The change is done in a post-processing step to clean up the *.la files as they are only used externally to this package. Signed-off-by: Gary Thomas Upstream-status: Innapropriate [OE patch causes the problem] Signed-off-by: Otavio Salvador --- recipes-qt/qt4/qt4-imx-support.inc | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/recipes-qt/qt4/qt4-imx-support.inc b/recipes-qt/qt4/qt4-imx-support.inc index 69ad67b..cd76a31 100644 --- a/recipes-qt/qt4/qt4-imx-support.inc +++ b/recipes-qt/qt4/qt4-imx-support.inc @@ -26,3 +26,8 @@ QT_CONFIG_FLAGS_append_mx6 = " -I${STAGING_KERNEL_DIR}/include/uapi \ -DLINUX=1 -DEGL_API_FB=1 \ -DQT_QPA_EXPERIMENTAL_TOUCHEVENT=1" +# The QT_CONFIG_FLAGS can pollute *.la files with -Dxxx +do_compile_append_mx6 () { + find lib -name "*.la" | xargs -n1 sed -i 's/-D.*=1//g' +} + -- cgit v1.2.3-54-g00ecf