aboutsummaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-qt
diff options
context:
space:
mode:
authorMarc Reilly <marc@cpdesign.com.au>2012-08-21 01:54:26 +0000
committerKoen Kooi <koen@dominion.thruhere.net>2012-08-27 14:42:00 +0200
commit380f8fe34d9d7b50424ec979b94b5a0056e85912 (patch)
tree2ce144bb2b2fc6a2ce09700653330d1a28a6028f /meta-oe/recipes-qt
parentb4d98cfc53994d71ce404a4534549ff4a9d4e672 (diff)
downloadmeta-openembedded-contrib-380f8fe34d9d7b50424ec979b94b5a0056e85912.tar.gz
meta-openembedded-contrib-380f8fe34d9d7b50424ec979b94b5a0056e85912.tar.bz2
meta-openembedded-contrib-380f8fe34d9d7b50424ec979b94b5a0056e85912.zip
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@cpdesign.com.au> Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Diffstat (limited to 'meta-oe/recipes-qt')
-rw-r--r--meta-oe/recipes-qt/qwt/files/qwt6-fix-linking-with-ld-gold.patch34
-rw-r--r--meta-oe/recipes-qt/qwt/qwt.inc4
2 files changed, 36 insertions, 2 deletions
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 0000000000..1fdd9cf4b3
--- /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 a299ac8385..a9289f7c3b 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}"