helium-3rd-party/meta-openembedded
1
0
Fork 0
mirror of git://git.openembedded.org/meta-openembedded synced 2026-10-02 16:11:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

qwt: fix link error when linking with ld-gold.

Browse Source 
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>
This commit is contained in:
Marc Reilly 2012-08-21 01:54:26 +00:00 committed by Koen Kooi
parent b4d98cfc53
commit 380f8fe34d
2 changed files with 36 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
meta-oe/recipes-qt/qwt/files/qwt6-fix-linking-with-ld-gold.patch Normal file
View File

@ -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

4
meta-oe/recipes-qt/qwt/qwt.inc
View File

@ -6,8 +6,8 @@ LICENSE = "QWTv1.0"
LIC_FILES_CHKSUM = "file://COPYING;md5=dac2743472b0462ff3cfb4af42051c88" LIC_FILES_CHKSUM = "file://COPYING;md5=dac2743472b0462ff3cfb4af42051c88"
SRC_URI = "${SOURCEFORGE_MIRROR}/qwt/qwt-${PV}.tar.bz2;name=qwt \ 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}" S = "${WORKDIR}/qwt-${PV}"