diff options
Diffstat (limited to 'meta/recipes-qt/qt4/qt4.inc')
-rw-r--r-- | meta/recipes-qt/qt4/qt4.inc | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/meta/recipes-qt/qt4/qt4.inc b/meta/recipes-qt/qt4/qt4.inc index 5545be700a..7f3e1a4785 100644 --- a/meta/recipes-qt/qt4/qt4.inc +++ b/meta/recipes-qt/qt4/qt4.inc | |||
@@ -293,7 +293,6 @@ do_install() { | |||
293 | -e s#'$(OE_QMAKE_LIBS_X11)'#"${OE_QMAKE_LIBS_X11}"#g \ | 293 | -e s#'$(OE_QMAKE_LIBS_X11)'#"${OE_QMAKE_LIBS_X11}"#g \ |
294 | -e s#" -Wl,-rpath-link,${S}/lib"##g \ | 294 | -e s#" -Wl,-rpath-link,${S}/lib"##g \ |
295 | -e s#" -Wl,-rpath-link,${libdir}"##g \ | 295 | -e s#" -Wl,-rpath-link,${libdir}"##g \ |
296 | -e 's#I/usr/include#Iincludedir}#g' \ | ||
297 | -e 's#Iin#I${in#g' \ | 296 | -e 's#Iin#I${in#g' \ |
298 | ${D}${libdir}/*.la ${D}${libdir}/*.prl ${D}${libdir}/pkgconfig/*.pc | 297 | ${D}${libdir}/*.la ${D}${libdir}/*.prl ${D}${libdir}/pkgconfig/*.pc |
299 | 298 | ||
@@ -310,8 +309,7 @@ do_install() { | |||
310 | 309 | ||
311 | # QT abuses $includedir to point to its headers, which breaks pkgconfig sysroot, so manually fix it up here: | 310 | # QT abuses $includedir to point to its headers, which breaks pkgconfig sysroot, so manually fix it up here: |
312 | for pc in ${D}${libdir}/pkgconfig/*.pc ; do | 311 | for pc in ${D}${libdir}/pkgconfig/*.pc ; do |
313 | sed -i -e "s:prefix}include/${QT_BASE_NAME}/$(basename $pc .pc):prefix}/include:" \ | 312 | sed -i -e "s:prefix}include/${QT_DIR_NAME}/$(basename $pc .pc):prefix}/include:" \ |
314 | -e "s,Cflags: ,Cflags: -IP{includedir}/${QT_BASE_NAME}/$(basename $pc .pc) ," \ | ||
315 | -e 's:IP{:I${:g' $pc | 313 | -e 's:IP{:I${:g' $pc |
316 | done | 314 | done |
317 | 315 | ||