aboutsummaryrefslogtreecommitdiffstats
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, 34 insertions, 0 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