From: Saul Wold <sgw@linux.intel.com>
To: Patches and discussions about the oe-core layer
<openembedded-core@lists.openembedded.org>
Subject: Re: [PATCH] qt4: fix deps in libQtWebkit.la and QtWebKit.pc
Date: Tue, 13 Mar 2012 09:23:04 -0700 [thread overview]
Message-ID: <4F5F7468.902@linux.intel.com> (raw)
In-Reply-To: <1331152588-27456-1-git-send-email-obi@opendreambox.org>
On 03/07/2012 12:36 PM, Andreas Oberritter wrote:
> * Both files contain -L../../WebCore/release -L../../JavaScriptCore/release -lwebcore -ljscore
> * These paths and libs don't get installed.
> * When building a shared lib with libtool, that links
> with libQtWebKit, libtool adds these unneeded parameters
> to the linker command-line, thus linking fails.
>
> Signed-off-by: Andreas Oberritter<obi@opendreambox.org>
> ---
> meta/recipes-qt/qt4/qt4-embedded.inc | 2 +-
> meta/recipes-qt/qt4/qt4-x11-free.inc | 2 +-
> meta/recipes-qt/qt4/qt4.inc | 1 +
> 3 files changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/meta/recipes-qt/qt4/qt4-embedded.inc b/meta/recipes-qt/qt4/qt4-embedded.inc
> index 80948f3..0e57e5a 100644
> --- a/meta/recipes-qt/qt4/qt4-embedded.inc
> +++ b/meta/recipes-qt/qt4/qt4-embedded.inc
> @@ -2,7 +2,7 @@ DESCRIPTION = "Qt is a versatile cross-platform application framework -- this is
> SECTION = "libs"
> HOMEPAGE = "http://qt.nokia.com"
> DEPENDS += "directfb tslib"
> -INC_PR = "r41"
> +INC_PR = "r42"
>
> QT_BASE_LIB ?= "libqt-embedded"
>
> diff --git a/meta/recipes-qt/qt4/qt4-x11-free.inc b/meta/recipes-qt/qt4/qt4-x11-free.inc
> index 75487f7..56f349a 100644
> --- a/meta/recipes-qt/qt4/qt4-x11-free.inc
> +++ b/meta/recipes-qt/qt4/qt4-x11-free.inc
> @@ -5,7 +5,7 @@ HOMEPAGE = "http://qt.nokia.com"
> SECTION = "x11/libs"
> DEPENDS += "virtual/libgl virtual/libx11 fontconfig libxft libxext libxrender libxrandr libxcursor"
>
> -INC_PR = "r38"
> +INC_PR = "r39"
>
> QT_GLFLAGS ?= "${@base_contains('DISTRO_FEATURES', 'opengl', '-opengl', '-no-opengl', d)} "
> QT_GLFLAGS_qemux86 = "-opengl"
> diff --git a/meta/recipes-qt/qt4/qt4.inc b/meta/recipes-qt/qt4/qt4.inc
> index 2e70bd9..77fb06f 100644
> --- a/meta/recipes-qt/qt4/qt4.inc
> +++ b/meta/recipes-qt/qt4/qt4.inc
> @@ -328,6 +328,7 @@ do_install() {
> -e 's#" -Wl,-rpath-link,${S}/lib/\?"##g' \
> -e 's#" -Wl,-rpath-link,${libdir}/\?"##g' \
> -e 's#Iin#I${in#g' \
> + -e 's#-L\.\./\.\./WebCore/release\s\+-L\.\./\.\./JavaScriptCore/release\s\+-lwebcore\s\+-ljscore##g' \
> ${D}${libdir}/*.la ${D}${libdir}/*.prl ${D}${libdir}/pkgconfig/*.pc
>
> sed -i -e s#" -Wl,-rpath-link,${S}/lib"##g \
Merged into OE-Core
Thanks
Sau!
prev parent reply other threads:[~2012-03-13 16:33 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-03-07 20:36 [PATCH] qt4: fix deps in libQtWebkit.la and QtWebKit.pc Andreas Oberritter
2012-03-13 16:23 ` Saul Wold [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4F5F7468.902@linux.intel.com \
--to=sgw@linux.intel.com \
--cc=openembedded-core@lists.openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox