diff options
| author |   Qi.Chen@windriver.com <Qi.Chen@windriver.com> | 2016-11-07 18:05:02 +0800 |
|---|---|---|
| committer |   Martin Jansa <Martin.Jansa@gmail.com> | 2016-11-23 15:24:42 +0100 |
| commit | 2372fb641257a81547a20483bda4913f90605997 (patch) | |
| tree | 32f85b96ab3e74342ecbabe6269c6cbe8187a992 | |
| parent | b70dd8f2af20bdafcdcec0db4ad4fb5b4e688e35 (diff) | |
| download | meta-openembedded-contrib-2372fb641257a81547a20483bda4913f90605997.tar.gz | |
gnuplot: upgrade to 5.0.5
Add PACKAGECONFIG for 'qt4' and default to not enable it as there's
do_compile failure when qt4 is enabled.
The obsolete '--without-lisp-files' option is removed.
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
| -rw-r--r-- | meta-oe/recipes-extended/gnuplot/gnuplot.inc | 3 | ||||
| -rw-r--r-- | meta-oe/recipes-extended/gnuplot/gnuplot/lua-loadlibs-configure-in-fix.patch (renamed from meta-oe/recipes-extended/gnuplot/gnuplot-4.6.5/lua-loadlibs-configure-in-fix.patch) | 0 | ||||
| -rw-r--r-- | meta-oe/recipes-extended/gnuplot/gnuplot/subdirs.patch (renamed from meta-oe/recipes-extended/gnuplot/gnuplot-4.6.5/subdirs.patch) | 0 | ||||
| -rw-r--r-- | meta-oe/recipes-extended/gnuplot/gnuplot_5.0.5.bb (renamed from meta-oe/recipes-extended/gnuplot/gnuplot_4.6.5.bb) | 4 |
4 files changed, 4 insertions, 3 deletions
diff --git a/meta-oe/recipes-extended/gnuplot/gnuplot.inc b/meta-oe/recipes-extended/gnuplot/gnuplot.inc index 69bc74b047..19ee874e2d 100644 --- a/meta-oe/recipes-extended/gnuplot/gnuplot.inc +++ b/meta-oe/recipes-extended/gnuplot/gnuplot.inc @@ -15,9 +15,10 @@ acpaths = "" PACKAGECONFIG ??= "cairo" PACKAGECONFIG[cairo] = "--with-cairo,--without-cairo,cairo pango" PACKAGECONFIG[lua] = "--with-lua,--without-lua,lua" +# there's compilation failure if qt4 is enabled +PACKAGECONFIG[qt4] = "--with-qt,--without-qt,qt4-x11-free" EXTRA_OECONF = "--with-readline=${STAGING_LIBDIR}/.. \ - --without-lisp-files \ --without-tutorial \ --disable-wxwidgets" diff --git a/meta-oe/recipes-extended/gnuplot/gnuplot-4.6.5/lua-loadlibs-configure-in-fix.patch b/meta-oe/recipes-extended/gnuplot/gnuplot/lua-loadlibs-configure-in-fix.patch index 23f2cd26a5..23f2cd26a5 100644 --- a/meta-oe/recipes-extended/gnuplot/gnuplot-4.6.5/lua-loadlibs-configure-in-fix.patch +++ b/meta-oe/recipes-extended/gnuplot/gnuplot/lua-loadlibs-configure-in-fix.patch diff --git a/meta-oe/recipes-extended/gnuplot/gnuplot-4.6.5/subdirs.patch b/meta-oe/recipes-extended/gnuplot/gnuplot/subdirs.patch index 8c7d1f0d35..8c7d1f0d35 100644 --- a/meta-oe/recipes-extended/gnuplot/gnuplot-4.6.5/subdirs.patch +++ b/meta-oe/recipes-extended/gnuplot/gnuplot/subdirs.patch diff --git a/meta-oe/recipes-extended/gnuplot/gnuplot_4.6.5.bb b/meta-oe/recipes-extended/gnuplot/gnuplot_5.0.5.bb index 3f694a0547..42308ba0be 100644 --- a/meta-oe/recipes-extended/gnuplot/gnuplot_4.6.5.bb +++ b/meta-oe/recipes-extended/gnuplot/gnuplot_5.0.5.bb @@ -8,7 +8,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/gnuplot/${BP}.tar.gz;name=archive \ file://gnuplot.png \ " -SRC_URI[archive.md5sum] = "9a476b21f74bd99c876f1509d731a0f9" -SRC_URI[archive.sha256sum] = "e550f030c7d04570e89c3d4e3f6e82296816508419c86ab46c4dd73156519a2d" +SRC_URI[archive.md5sum] = "c5e96fca73afbee4f57cbc1bfce6b3b8" +SRC_URI[archive.sha256sum] = "25f3e0bf192e01115c580f278c3725d7a569eb848786e12b455a3fda70312053" SRC_URI[qtplot.md5sum] = "0a481885a496092c77eb4017540b5cf6" SRC_URI[qtplot.sha256sum] = "6df317183ff62cc82f3dcf88207a267cd6478cb5147f55d7530c94f1ad5f4132" |