summaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-qt/qwt/files/qwt6-fix-linking-with-ld-gold.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta-oe/recipes-qt/qwt/files/qwt6-fix-linking-with-ld-gold.patch')
-rw-r--r--meta-oe/recipes-qt/qwt/files/qwt6-fix-linking-with-ld-gold.patch34
1 files changed, 0 insertions, 34 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
deleted file mode 100644
index 1fdd9cf4b..000000000
--- a/meta-oe/recipes-qt/qwt/files/qwt6-fix-linking-with-ld-gold.patch
+++ /dev/null
@@ -1,34 +0,0 @@
1Upstream-Status: Pending
2
3diff -urpN qwt-6.0.1_orig/qwtbuild.pri qwt-6.0.1/qwtbuild.pri
4--- qwt-6.0.1_orig/qwtbuild.pri 2011-08-02 00:33:53.000000000 +1000
5+++ qwt-6.0.1/qwtbuild.pri 2012-08-21 10:27:30.721990849 +1000
6@@ -67,3 +67,13 @@ unix {
7 error( "local build will conflict with $${QMAKE_LIBDIR_QT}/libqwt.*" )
8 }
9 }
10+
11+######################################################################
12+# libs for building qwt
13+######################################################################
14+
15+unix {
16+ # Some linkers require explicit linking with librt (eg ld.gold)
17+ LIBS += -lrt
18+}
19+
20diff -urpN qwt-6.0.1_orig/qwt.prf qwt-6.0.1/qwt.prf
21--- qwt-6.0.1_orig/qwt.prf 2011-08-02 00:33:51.000000000 +1000
22+++ qwt-6.0.1/qwt.prf 2012-08-21 11:19:49.435240439 +1000
23@@ -9,6 +9,11 @@
24
25 include ( ./qwtconfig.pri )
26
27+unix {
28+
29+ LIBS += -lrt
30+}
31+
32 contains(QWT_CONFIG, QwtDll) {
33
34 DEFINES *= QWT_DLL