diff options
author | Laurent GONZALEZ <br2@gezedo.com> | 2012-06-02 06:14:00 +0000 |
---|---|---|
committer | Peter Korsgaard <jacmet@sunsite.dk> | 2013-01-13 22:41:31 +0100 |
commit | afba84d1fcec911094ba54e1777155fa76913fe1 (patch) | |
tree | 8a4e8fa72d659428c713a3378869a0c7cdf84790 /package/qwt/qwt-remove-installed-check.patch | |
parent | 9e02c32fd6a064bf256c5e76abbf65e432892489 (diff) | |
download | buildroot-novena-afba84d1fcec911094ba54e1777155fa76913fe1.tar.gz buildroot-novena-afba84d1fcec911094ba54e1777155fa76913fe1.zip |
libqwt: new package
Patch initially written by Thomas Petazzoni, then reworked and updated
by Laurent Gonzalez, and finally cleaned up by Thomas again.
[Peter: generic-package, deps, download, rename to qwt, move under Qt]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Diffstat (limited to 'package/qwt/qwt-remove-installed-check.patch')
-rw-r--r-- | package/qwt/qwt-remove-installed-check.patch | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/package/qwt/qwt-remove-installed-check.patch b/package/qwt/qwt-remove-installed-check.patch new file mode 100644 index 000000000..7490a7b77 --- /dev/null +++ b/package/qwt/qwt-remove-installed-check.patch @@ -0,0 +1,32 @@ +Remove useless check at build time + +At build time, Qwt looks whether the Qwt libraries are already +installed in the destination directory, to avoid confusion between +libraries installed system-wide and locally-built shared +libraries. However, this behaviour conflicts with how Buildroot builds +and installs libraries, so get rid of it. + +Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> + +Index: qwt-6.0.0/qwtbuild.pri +=================================================================== +--- qwt-6.0.0.orig/qwtbuild.pri 2011-09-12 19:37:35.663275952 +0200 ++++ qwt-6.0.0/qwtbuild.pri 2011-09-12 19:37:41.913275949 +0200 +@@ -53,17 +53,3 @@ + !debug_and_release { + OBJECTS_DIR = obj + } +- +-unix { +- +- exists( $${QMAKE_LIBDIR_QT}/libqwt.* ) { +- +- # On some Linux distributions the Qwt libraries are installed +- # in the same directory as the Qt libraries. Unfortunately +- # qmake always adds QMAKE_LIBDIR_QT at the beginning of the +- # linker path, so that the installed libraries will be +- # used instead of the local ones. +- +- error( "local build will conflict with $${QMAKE_LIBDIR_QT}/libqwt.*" ) +- } +-} |