summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGary Thomas <gary@mlbassoc.com>2015-10-05 16:09:17 -0600
committerOtavio Salvador <otavio@ossystems.com.br>2015-10-06 08:41:26 -0300
commit70ddee3ebeacbc53180ee7221533375bf0c9eac4 (patch)
treeb189d62bd873cffc171504f6fe0f44952ece5fab
parentf44bd2cc9fd55caaba9563184dafc60987b9cb68 (diff)
downloadmeta-fsl-arm-70ddee3ebeacbc53180ee7221533375bf0c9eac4.tar.gz
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 <gary@mlbassoc.com> Upstream-status: Innapropriate [OE patch causes the problem] Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
-rw-r--r--recipes-qt/qt4/qt4-imx-support.inc5
1 files changed, 5 insertions, 0 deletions
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 \
26 -DLINUX=1 -DEGL_API_FB=1 \ 26 -DLINUX=1 -DEGL_API_FB=1 \
27 -DQT_QPA_EXPERIMENTAL_TOUCHEVENT=1" 27 -DQT_QPA_EXPERIMENTAL_TOUCHEVENT=1"
28 28
29# The QT_CONFIG_FLAGS can pollute *.la files with -Dxxx
30do_compile_append_mx6 () {
31 find lib -name "*.la" | xargs -n1 sed -i 's/-D.*=1//g'
32}
33