[oe] [Patch V2 1/2] qwt: fix link error when linking with ld-gold.

[Marc Reilly]

Hi, 

Just pinging this to check if it has been overlooked or is wrong. 

I tried to see if its listed on patchwork site, but its either not there or 
I'm looking in the wrong spot.

Cheers,
Marc

> -----Original Message-----
> From: Marc Reilly [mailto:marc.reilly at gmail.com] On Behalf Of Marc Reilly
> Sent: Tuesday, 21 August 2012 11:54 AM
> To: openembedded-devel at lists.openembedded.org
> Cc: Marc Reilly
> Subject: [Patch V2 1/2] qwt: fix link error when linking with ld-gold.
> 
> ld-gold doesn't implicitly link with librt, this fixes an unresolved
symbol error
> when compiling qwt examples.
> 
> Signed-off-by: Marc Reilly <marc at cpdesign.com.au>
> ---
>  .../qwt/files/qwt6-fix-linking-with-ld-gold.patch  |   34
> ++++++++++++++++++++
>  meta-oe/recipes-qt/qwt/qwt.inc                     |    4 +-
>  2 files changed, 36 insertions(+), 2 deletions(-)  create mode 100644
meta-
> oe/recipes-qt/qwt/files/qwt6-fix-linking-with-ld-gold.patch
> 
> diff --git
a/meta-oe/recipes-qt/qwt/files/qwt6-fix-linking-with-ld-gold.patch
> b/meta-oe/recipes-qt/qwt/files/qwt6-fix-linking-with-ld-gold.patch
> new file mode 100644
> index 0000000..1fdd9cf
> --- /dev/null
> +++ b/meta-oe/recipes-qt/qwt/files/qwt6-fix-linking-with-ld-gold.patch
> @@ -0,0 +1,34 @@
> +Upstream-Status: Pending
> +
> +diff -urpN qwt-6.0.1_orig/qwtbuild.pri qwt-6.0.1/qwtbuild.pri
> +--- qwt-6.0.1_orig/qwtbuild.pri	2011-08-02 00:33:53.000000000 +1000
> ++++ qwt-6.0.1/qwtbuild.pri	2012-08-21 10:27:30.721990849 +1000
> +@@ -67,3 +67,13 @@ unix {
> +         error( "local build will conflict with
$${QMAKE_LIBDIR_QT}/libqwt.*" )
> +     }
> + }
> ++
> ++########################################################
> ##############
> ++# libs for building qwt
> ++########################################################
> ##############
> ++
> ++unix {
> ++    # Some linkers require explicit linking with librt (eg ld.gold)
> ++    LIBS += -lrt
> ++}
> ++
> +diff -urpN qwt-6.0.1_orig/qwt.prf qwt-6.0.1/qwt.prf
> +--- qwt-6.0.1_orig/qwt.prf	2011-08-02 00:33:51.000000000 +1000
> ++++ qwt-6.0.1/qwt.prf	2012-08-21 11:19:49.435240439 +1000
> +@@ -9,6 +9,11 @@
> +
> + include ( ./qwtconfig.pri )
> +
> ++unix {
> ++
> ++	LIBS += -lrt
> ++}
> ++
> + contains(QWT_CONFIG, QwtDll) {
> +
> +     DEFINES *= QWT_DLL
> diff --git a/meta-oe/recipes-qt/qwt/qwt.inc b/meta-oe/recipes-
> qt/qwt/qwt.inc index a299ac8..a9289f7 100644
> --- a/meta-oe/recipes-qt/qwt/qwt.inc
> +++ b/meta-oe/recipes-qt/qwt/qwt.inc
> @@ -6,8 +6,8 @@ LICENSE = "QWTv1.0"
>  LIC_FILES_CHKSUM =
> "file://COPYING;md5=dac2743472b0462ff3cfb4af42051c88"
> 
>  SRC_URI = "${SOURCEFORGE_MIRROR}/qwt/qwt-${PV}.tar.bz2;name=qwt \
> -	file://qwt6.patch \
> -	"
> +           file://qwt6.patch \
> +           file://qwt6-fix-linking-with-ld-gold.patch"
> 
>  S = "${WORKDIR}/qwt-${PV}"
> 
> --
> 1.7.7