diff options
| author |   Koen Kooi <koen@openembedded.org> | 2010-03-01 20:23:52 +0100 |
|---|---|---|
| committer | Koen Kooi <koen@openembedded.org> | 2010-03-02 09:58:37 +0100 |
| commit | 35df67a0c18bf45d23aeec68960e108f8c20a656 (patch) | |
| tree | d912f477ca7ba20dac92af84c3d957738cda6fa1 /recipes/qt4 | |
| parent | f2f69d9ae0d32b5adff4987d12a7c4924e24555c (diff) | |
| download | openembedded-35df67a0c18bf45d23aeec68960e108f8c20a656.tar.gz | |
qt4: adjust sed magic to recent QT to sanitize .pc files properly
Diffstat (limited to 'recipes/qt4')
| -rw-r--r-- | recipes/qt4/qt4-embedded.inc | 2 | ||||
| -rw-r--r-- | recipes/qt4/qt4-x11-free.inc | 2 | ||||
| -rw-r--r-- | recipes/qt4/qt4.inc | 6 |
3 files changed, 7 insertions, 3 deletions
diff --git a/recipes/qt4/qt4-embedded.inc b/recipes/qt4/qt4-embedded.inc index 0ffd2fa629..39a5e98ca5 100644 --- a/recipes/qt4/qt4-embedded.inc +++ b/recipes/qt4/qt4-embedded.inc @@ -4,7 +4,7 @@ LICENSE = "GPL QPL" PRIORITY = "optional" HOMEPAGE = "http://www.trolltech.com" DEPENDS += "directfb tslib" -INC_PR = "r16" +INC_PR = "r17" QT_BASE_NAME ?= "qt4-embedded" QT_BASE_LIB ?= "libqt-embedded" diff --git a/recipes/qt4/qt4-x11-free.inc b/recipes/qt4/qt4-x11-free.inc index 8879c90baf..fd33a21787 100644 --- a/recipes/qt4/qt4-x11-free.inc +++ b/recipes/qt4/qt4-x11-free.inc @@ -5,7 +5,7 @@ HOMEPAGE = "http://www.trolltech.com" LICENSE = "GPL QPL" DEPENDS += "virtual/libx11 fontconfig xft libxext libxrender libxrandr libxcursor" -INC_PR = "r15" +INC_PR = "r16" SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-x11-opensource-src-${PV}.tar.gz \ file://0001-cross-compile.patch;patch=1 \ diff --git a/recipes/qt4/qt4.inc b/recipes/qt4/qt4.inc index c98a0557e5..b6d575d67a 100644 --- a/recipes/qt4/qt4.inc +++ b/recipes/qt4/qt4.inc @@ -243,9 +243,13 @@ do_install() { # fix pkgconfig, libtool and prl files sed -i -e s#-L${S}/lib##g \ -e s#-L${STAGING_LIBDIR}##g \ + -e 's#STAGING_LIBDIR}#libdir}'#g \ -e s#-L${libdir}##g \ -e s#'$(OE_QMAKE_LIBS_X11)'#"${OE_QMAKE_LIBS_X11}"#g \ - -e s#"-Wl,-rpath-link,${S}/lib"##g \ + -e s#" -Wl,-rpath-link,${S}/lib"##g \ + -e s#" -Wl,-rpath-link,${libdir}"##g \ + -e 's#I/usr/include#Iincludedir}#g' \ + -e 's#Iin#I${in#g' \ ${D}${libdir}/*.la ${D}${libdir}/*.prl ${D}${libdir}/pkgconfig/*.pc # fix pkgconfig files |