gnuplot: upgrade to 5.0.5
PATCH v2 1/1 gnuplot: upgrade to 5.0.5
Add '--disable-qt' to EXTRA_OECONF to fix do_compile failure.
--- .../gnuplot-4.6.5/lua-loadlibs-configure-in-fix.patch | 16 ---------------- .../recipes-extended/gnuplot/gnuplot-4.6.5/subdirs.patch | 11 ----------- meta-oe/recipes-extended/gnuplot/gnuplot.inc | 2 +- .../gnuplot/gnuplot/lua-loadlibs-configure-in-fix.patch | 16 ++++++++++++++++ meta-oe/recipes-extended/gnuplot/gnuplot/subdirs.patch | 11 +++++++++++ meta-oe/recipes-extended/gnuplot/gnuplot_4.6.5.bb | 14 -------------- meta-oe/recipes-extended/gnuplot/gnuplot_5.0.5.bb | 14 ++++++++++++++ 7 files changed, 42 insertions(+), 42 deletions(-) delete mode 100644 meta-oe/recipes-extended/gnuplot/gnuplot-4.6.5/lua-loadlibs-configure-in-fix.patch delete mode 100644 meta-oe/recipes-extended/gnuplot/gnuplot-4.6.5/subdirs.patch create mode 100644 meta-oe/recipes-extended/gnuplot/gnuplot/lua-loadlibs-configure-in-fix.patch create mode 100644 meta-oe/recipes-extended/gnuplot/gnuplot/subdirs.patch delete mode 100644 meta-oe/recipes-extended/gnuplot/gnuplot_4.6.5.bb create mode 100644 meta-oe/recipes-extended/gnuplot/gnuplot_5.0.5.bb
meta-oe/recipes-extended/gnuplot/gnuplot-4.6.5/lua-loadlibs-configure-in-fix.patch deleted +0 -16
@@ -1,16 +0,0 @@ -Index: gnuplot-4.6.5/configure.in -=================================================================== ---- gnuplot-4.6.5.orig/configure.in -+++ gnuplot-4.6.5/configure.in -@@ -690,6 +690,11 @@ if test "${with_lua}" = yes ; then - fi - - if test "$with_lua" != no; then -+ dnl check for dlopen/dl to fix loadlibs link failure -+ AC_CHECK_FUNC([dlopen], [], -+ AC_CHECK_LIB([dl], [dlopen], DLOPEN_LIBS="-ldl")) -+ AC_SUBST(DLOPEN_LIBS) -+ LUA_LIBS="$LUA_LIBS $DLOPEN_LIBS" - TERMLIBS="$TERMLIBS $LUA_LIBS" - CPPFLAGS="$CPPFLAGS $LUA_CFLAGS" - else
meta-oe/recipes-extended/gnuplot/gnuplot-4.6.5/subdirs.patch deleted +0 -11
@@ -1,11 +0,0 @@ ---- /tmp/Makefile.am 2007-08-23 13:10:15.560659023 +0200 -+++ gnuplot-4.2.0/Makefile.am 2007-08-23 13:10:34.961764629 +0200 -@@ -1,7 +1,7 @@ - ## Process this file with automake to produce Makefile.in -*-Makefile-*- - AUTOMAKE_OPTIONS = foreign 1.2h - --SUBDIRS = config m4 term src docs $(LISPDIR) man demo tutorial share -+SUBDIRS = config m4 term src $(LISPDIR) man share - - EXTRA_DIST = BUGS CodeStyle Copyright FAQ GNUmakefile INSTALL INSTALL.gnu \ - Makefile.maint PATCHLEVEL PGPKEYS PORTING README README.1ST README.exp \
meta-oe/recipes-extended/gnuplot/gnuplot.inc +1 -1
@@ -17,7 +17,7 @@ PACKAGECONFIG[cairo] = "--with-cairo,--without-cairo,cairo pango" PACKAGECONFIG[lua] = "--with-lua,--without-lua,lua" EXTRA_OECONF = "--with-readline=${STAGING_LIBDIR}/.. \ - --without-lisp-files \ + --without-qt \ --without-tutorial \ --disable-wxwidgets"
meta-oe/recipes-extended/gnuplot/gnuplot/lua-loadlibs-configure-in-fix.patch new file +16 -0
@@ -0,0 +1,16 @@ +Index: gnuplot-4.6.5/configure.in +=================================================================== +--- gnuplot-4.6.5.orig/configure.in ++++ gnuplot-4.6.5/configure.in +@@ -690,6 +690,11 @@ if test "${with_lua}" = yes ; then + fi + + if test "$with_lua" != no; then ++ dnl check for dlopen/dl to fix loadlibs link failure ++ AC_CHECK_FUNC([dlopen], [], ++ AC_CHECK_LIB([dl], [dlopen], DLOPEN_LIBS="-ldl")) ++ AC_SUBST(DLOPEN_LIBS) ++ LUA_LIBS="$LUA_LIBS $DLOPEN_LIBS" + TERMLIBS="$TERMLIBS $LUA_LIBS" + CPPFLAGS="$CPPFLAGS $LUA_CFLAGS" + else
meta-oe/recipes-extended/gnuplot/gnuplot/subdirs.patch new file +11 -0
@@ -0,0 +1,11 @@ +--- /tmp/Makefile.am 2007-08-23 13:10:15.560659023 +0200 ++++ gnuplot-4.2.0/Makefile.am 2007-08-23 13:10:34.961764629 +0200 +@@ -1,7 +1,7 @@ + ## Process this file with automake to produce Makefile.in -*-Makefile-*- + AUTOMAKE_OPTIONS = foreign 1.2h + +-SUBDIRS = config m4 term src docs $(LISPDIR) man demo tutorial share ++SUBDIRS = config m4 term src $(LISPDIR) man share + + EXTRA_DIST = BUGS CodeStyle Copyright FAQ GNUmakefile INSTALL INSTALL.gnu \ + Makefile.maint PATCHLEVEL PGPKEYS PORTING README README.1ST README.exp \
meta-oe/recipes-extended/gnuplot/gnuplot_4.6.5.bb deleted +0 -14
@@ -1,14 +0,0 @@ -require gnuplot.inc - -SRC_URI = "${SOURCEFORGE_MIRROR}/gnuplot/${BP}.tar.gz;name=archive \ - http://www.mneuroth.de/privat/zaurus/qtplot-0.2.tar.gz;name=qtplot \ - file://subdirs.patch \ - file://lua-loadlibs-configure-in-fix.patch \ - file://gnuplot.desktop \ - file://gnuplot.png \ -" - -SRC_URI[archive.md5sum] = "9a476b21f74bd99c876f1509d731a0f9" -SRC_URI[archive.sha256sum] = "e550f030c7d04570e89c3d4e3f6e82296816508419c86ab46c4dd73156519a2d" -SRC_URI[qtplot.md5sum] = "0a481885a496092c77eb4017540b5cf6" -SRC_URI[qtplot.sha256sum] = "6df317183ff62cc82f3dcf88207a267cd6478cb5147f55d7530c94f1ad5f4132"
meta-oe/recipes-extended/gnuplot/gnuplot_5.0.5.bb new file +14 -0
@@ -0,0 +1,14 @@ +require gnuplot.inc + +SRC_URI = "${SOURCEFORGE_MIRROR}/gnuplot/${BP}.tar.gz;name=archive \ + http://www.mneuroth.de/privat/zaurus/qtplot-0.2.tar.gz;name=qtplot \ + file://subdirs.patch \ + file://lua-loadlibs-configure-in-fix.patch \ + file://gnuplot.desktop \ + file://gnuplot.png \ +" + +SRC_URI[archive.md5sum] = "c5e96fca73afbee4f57cbc1bfce6b3b8" +SRC_URI[archive.sha256sum] = "25f3e0bf192e01115c580f278c3725d7a569eb848786e12b455a3fda70312053" +SRC_URI[qtplot.md5sum] = "0a481885a496092c77eb4017540b5cf6" +SRC_URI[qtplot.sha256sum] = "6df317183ff62cc82f3dcf88207a267cd6478cb5147f55d7530c94f1ad5f4132"
Signature · 1 line
2.8.3
I would rather see a PACKAGECONFIG for qt5
Quoted 81 lines · Chen Qi
Add '--disable-qt' to
EXTRA_OECONFto fixdo_compilefailure.Signed-off-by Chen Qi <[email protected]>--- .../gnuplot-4.6.5/lua-loadlibs-configure-in-fix.patch | 16 ---------------- .../recipes-extended/gnuplot/gnuplot-4.6.5/subdirs.patch | 11 ----------- meta-oe/recipes-extended/gnuplot/gnuplot.inc | 2 +- .../gnuplot/gnuplot/lua-loadlibs-configure-in-fix.patch | 16 ++++++++++++++++ meta-oe/recipes-extended/gnuplot/gnuplot/subdirs.patch | 11 +++++++++++ meta-oe/recipes-extended/gnuplot/gnuplot_4.6.5.bb | 14 -------------- meta-oe/recipes-extended/gnuplot/gnuplot_5.0.5.bb | 14 ++++++++++++++ 7 files changed, 42 insertions(+), 42 deletions(-) delete mode 100644 meta-oe/recipes-extended/gnuplot/gnuplot-4.6.5/lua- loadlibs-configure-in-fix.patch delete mode 100644 meta-oe/recipes-extended/ gnuplot/gnuplot-4.6.5/subdirs.patch create mode 100644 meta-oe/recipes-extended/gnuplot/gnuplot/lua-loadlibs- configure-in-fix.patch create mode 100644 meta-oe/recipes-extended/gnuplot/gnuplot/subdirs.patch delete mode 100644 meta-oe/recipes-extended/gnuplot/gnuplot_4.6.5.bb create mode 100644 meta-oe/recipes-extended/gnuplot/gnuplot_5.0.5.bb(quoted diff) +0
-0loadlibs-configure-in-fix.patch b/meta-oe/recipes-extended/
gnuplot/gnuplot-4.6.5/lua-loadlibs-configure-in-fix.patchdeleted file mode 100644
index 23f2cd2..0000000
--- a/meta-oe/recipes-extended/gnuplot/gnuplot-4.6.5/lua- loadlibs-configure-in-fix.patch
+++/dev/nullmeta-oe/recipes-extended/gnuplot/gnuplot-4.6.5/lua-loadlibs-configure-in-fix.patch deleted +0
-16@@ -1,16 +0,0 @@ -Index: gnuplot-4.6.5/configure.in -=================================================================== ---- gnuplot-4.6.5.orig/configure.in -+++ gnuplot-4.6.5/configure.in -@@ -690,6 +690,11 @@ if test "${with_lua}" = yes ; then - fi - - if test "$with_lua" != no; then -+ dnl check for dlopen/dl to fix loadlibs link failure -+ AC_CHECK_FUNC([dlopen], [], -+ AC_CHECK_LIB([dl], [dlopen], DLOPEN_LIBS="-ldl")) -+ AC_SUBST(DLOPEN_LIBS) -+ LUA_LIBS="$LUA_LIBS $DLOPEN_LIBS" - TERMLIBS="$TERMLIBS $LUA_LIBS" - CPPFLAGS="$CPPFLAGS $LUA_CFLAGS" - elsemeta-oe/recipes-extended/gnuplot/gnuplot-4.6.5/subdirs.patch deleted +0
-10@@ -1,11 +0,0 @@ ---- /tmp/Makefile.am 2007-08-23 13:10:15.560659023 +0200 -+++ gnuplot-4.2.0/Makefile.am 2007-08-23 13:10:34.961764629 +0200 -@@ -1,7 +1,7 @@ - ## Process this file with automake to produce Makefile.in -*-Makefile-*- - AUTOMAKE_OPTIONS = foreign 1.2h - --SUBDIRS = config m4 term src docs $(LISPDIR) man demo tutorial share -+SUBDIRS = config m4 term src $(LISPDIR) man share - - EXTRA_DIST = BUGS CodeStyle Copyright FAQ GNUmakefile INSTALLINSTALL.gnu \
- Makefile.maint PATCHLEVEL PGPKEYS PORTING README README.1ST README.exp \meta-oe/recipes-extended/gnuplot/gnuplot.inc +0
-0@@ -17,7 +17,7 @@ PACKAGECONFIG[cairo] = "--with-cairo,--without-cairo,cairopango"
PACKAGECONFIG[lua] = "--with-lua,--without-lua,lua"
EXTRA_OECONF= "--with-readline=${STAGING_LIBDIR}/.. \
meta-oe/recipes-extended/gnuplot/gnuplot.inc PACKAGECONFIG[cairo] = "--with-cairo,--without-cairo,cairo pango" · line 20
Quoted 2 lines
meta-oe/recipes-extended/gnuplot/gnuplot.inc +1
-1- --without-lisp-files \ + --without-qt \
This would be more universal in a PACKAGECONFIG
e.g. PACKAGECONFIG[qt4] = "--with-qt,--without-qt,qt4-x11-free"
Quoted 102 lines
--without-tutorial \ --disable-wxwidgets"meta-oe/recipes-extended/gnuplot/gnuplot/lua-loadlibs- renamed from meta-oe/recipes-extended/gnuplot/gnuplot/lua-loadlibs-configure-in-fix.patch +0
-0configure-in-fix.patch
new file mode 100644
index 0000000..23f2cd2meta-oe/recipes-extended/gnuplot/gnuplot/lua-loadlibs- new file +0
-0configure-in-fix.patch
meta-oe/recipes-extended/gnuplot/gnuplot/lua-loadlibs- new file +16
-0@@ -0,0 +1,16 @@ +Index: gnuplot-4.6.5/configure.in +=================================================================== +--- gnuplot-4.6.5.orig/configure.in ++++ gnuplot-4.6.5/configure.in +@@ -690,6 +690,11 @@ if test "${with_lua}" = yes ; then + fi + + if test "$with_lua" != no; then ++ dnl check for dlopen/dl to fix loadlibs link failure ++ AC_CHECK_FUNC([dlopen], [], ++ AC_CHECK_LIB([dl], [dlopen], DLOPEN_LIBS="-ldl")) ++ AC_SUBST(DLOPEN_LIBS) ++ LUA_LIBS="$LUA_LIBS $DLOPEN_LIBS" + TERMLIBS="$TERMLIBS $LUA_LIBS" + CPPFLAGS="$CPPFLAGS $LUA_CFLAGS" + elsemeta-oe/recipes-extended/gnuplot/gnuplot/subdirs.patch new file +10
-0@@ -0,0 +1,11 @@ +--- /tmp/Makefile.am 2007-08-23 13:10:15.560659023 +0200 ++++ gnuplot-4.2.0/Makefile.am 2007-08-23 13:10:34.961764629 +0200 +@@ -1,7 +1,7 @@ + ## Process this file with automake to produce Makefile.in -*-Makefile-*- + AUTOMAKE_OPTIONS = foreign 1.2h + +-SUBDIRS = config m4 term src docs $(LISPDIR) man demo tutorial share ++SUBDIRS = config m4 term src $(LISPDIR) man share + + EXTRA_DIST = BUGS CodeStyle Copyright FAQ GNUmakefile INSTALLINSTALL.gnu \
+ Makefile.maint PATCHLEVEL PGPKEYS PORTING README README.1ST README.exp \meta-oe/recipes-extended/gnuplot/gnuplot_4.6.5.bb deleted +0
-12@@ -1,14 +0,0 @@ -require gnuplot.inc - -SRC_URI = "${SOURCEFORGE_MIRROR}/gnuplot/${BP}.tar.gz;name=archive \ - http://www.mneuroth.de/privat/zaurus/qtplot-0.2.tar.gz;name=qtplot \ - file://subdirs.patch \ - file://lua-loadlibs-configure-in-fix.patch \ - file://gnuplot.desktop \ - file://gnuplot.png \ -" - -SRC_URI[archive.md5sum] = "9a476b21f74bd99c876f1509d731a0f9" -SRC_URI[archive.sha256sum] = "e550f030c7d04570e89c3d4e3f6e82
296816508419c86ab46c4dd73156519a2d"meta-oe/recipes-extended/gnuplot/gnuplot_4.6.5.bb deleted +0
-2-SRC_URI[qtplot.md5sum] = "0a481885a496092c77eb4017540b5cf6" -SRC_URI[qtplot.sha256sum] = "6df317183ff62cc82f3dcf88207a26
7cd6478cb5147f55d7530c94f1ad5f4132"meta-oe/recipes-extended/gnuplot/gnuplot_5.0.5.bb new file +12
-0@@ -0,0 +1,14 @@ +require gnuplot.inc + +SRC_URI = "${SOURCEFORGE_MIRROR}/gnuplot/${BP}.tar.gz;name=archive \ + http://www.mneuroth.de/privat/zaurus/qtplot-0.2.tar.gz;name=qtplot \ + file://subdirs.patch \ + file://lua-loadlibs-configure-in-fix.patch \ + file://gnuplot.desktop \ + file://gnuplot.png \ +" + +SRC_URI[archive.md5sum] = "c5e96fca73afbee4f57cbc1bfce6b3b8" +SRC_URI[archive.sha256sum] = "25f3e0bf192e01115c580f278c3725
d7a569eb848786e12b455a3fda70312053"meta-oe/recipes-extended/gnuplot/gnuplot_5.0.5.bb new file +2
-0+SRC_URI[qtplot.md5sum] = "0a481885a496092c77eb4017540b5cf6" +SRC_URI[qtplot.sha256sum] = "6df317183ff62cc82f3dcf88207a26
7cd6478cb5147f55d7530c94f1ad5f4132"
--
2.8.3--
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
and use -M option to let git detect moves vs copies to make it easier to review recipes
add
[diff]
renames = copies
to ~/.gitconfig
Quoted 199 lines · Tim Orling
I would rather see a PACKAGECONFIG for qt5
Quoted 81 lines · Chen Qi
Add '--disable-qt' to
EXTRA_OECONFto fixdo_compilefailure.Signed-off-by Chen Qi <[email protected]>--- .../gnuplot-4.6.5/lua-loadlibs-configure-in-fix.patch | 16 ---------------- .../recipes-extended/gnuplot/gnuplot-4.6.5/subdirs.patch | 11 ----------- meta-oe/recipes-extended/gnuplot/gnuplot.inc | 2 +- .../gnuplot/gnuplot/lua-loadlibs-configure-in-fix.patch | 16 ++++++++++++++++ meta-oe/recipes-extended/gnuplot/gnuplot/subdirs.patch | 11 +++++++++++ meta-oe/recipes-extended/gnuplot/gnuplot_4.6.5.bb | 14 -------------- meta-oe/recipes-extended/gnuplot/gnuplot_5.0.5.bb | 14 ++++++++++++++ 7 files changed, 42 insertions(+), 42 deletions(-) delete mode 100644 meta-oe/recipes-extended/gnuplot/gnuplot-4.6.5/lua- loadlibs-configure-in-fix.patch delete mode 100644 meta-oe/recipes-extended/ gnuplot/gnuplot-4.6.5/subdirs.patch create mode 100644 meta-oe/recipes-extended/gnuplot/gnuplot/lua-loadlibs- configure-in-fix.patch create mode 100644 meta-oe/recipes-extended/gnuplot/gnuplot/subdirs.patch delete mode 100644 meta-oe/recipes-extended/gnuplot/gnuplot_4.6.5.bb create mode 100644 meta-oe/recipes-extended/gnuplot/gnuplot_5.0.5.bb(quoted diff) +0
-0loadlibs-configure-in-fix.patch b/meta-oe/recipes-extended/
gnuplot/gnuplot-4.6.5/lua-loadlibs-configure-in-fix.patchdeleted file mode 100644
index 23f2cd2..0000000
--- a/meta-oe/recipes-extended/gnuplot/gnuplot-4.6.5/lua- loadlibs-configure-in-fix.patch
+++/dev/nullmeta-oe/recipes-extended/gnuplot/gnuplot-4.6.5/lua-loadlibs-configure-in-fix.patch deleted +0
-16@@ -1,16 +0,0 @@ -Index: gnuplot-4.6.5/configure.in -=================================================================== ---- gnuplot-4.6.5.orig/configure.in -+++ gnuplot-4.6.5/configure.in -@@ -690,6 +690,11 @@ if test "${with_lua}" = yes ; then - fi - - if test "$with_lua" != no; then -+ dnl check for dlopen/dl to fix loadlibs link failure -+ AC_CHECK_FUNC([dlopen], [], -+ AC_CHECK_LIB([dl], [dlopen], DLOPEN_LIBS="-ldl")) -+ AC_SUBST(DLOPEN_LIBS) -+ LUA_LIBS="$LUA_LIBS $DLOPEN_LIBS" - TERMLIBS="$TERMLIBS $LUA_LIBS" - CPPFLAGS="$CPPFLAGS $LUA_CFLAGS" - elsemeta-oe/recipes-extended/gnuplot/gnuplot-4.6.5/subdirs.patch deleted +0
-10@@ -1,11 +0,0 @@ ---- /tmp/Makefile.am 2007-08-23 13:10:15.560659023 +0200 -+++ gnuplot-4.2.0/Makefile.am 2007-08-23 13:10:34.961764629 +0200 -@@ -1,7 +1,7 @@ - ## Process this file with automake to produce Makefile.in -*-Makefile-*- - AUTOMAKE_OPTIONS = foreign 1.2h - --SUBDIRS = config m4 term src docs $(LISPDIR) man demo tutorial share -+SUBDIRS = config m4 term src $(LISPDIR) man share - - EXTRA_DIST = BUGS CodeStyle Copyright FAQ GNUmakefile INSTALLINSTALL.gnu \
- Makefile.maint PATCHLEVEL PGPKEYS PORTING README README.1ST README.exp \meta-oe/recipes-extended/gnuplot/gnuplot.inc +0
-0@@ -17,7 +17,7 @@ PACKAGECONFIG[cairo] = "--with-cairo,--without-cairo,cairopango"
PACKAGECONFIG[lua] = "--with-lua,--without-lua,lua"
EXTRA_OECONF= "--with-readline=${STAGING_LIBDIR}/.. \meta-oe/recipes-extended/gnuplot/gnuplot.inc PACKAGECONFIG[cairo] = "--with-cairo,--without-cairo,cairo pango" · line 20
Quoted 2 lines
meta-oe/recipes-extended/gnuplot/gnuplot.inc +1
-1- --without-lisp-files \ + --without-qt \This would be more universal in a PACKAGECONFIG
e.g. PACKAGECONFIG[qt4] = "--with-qt,--without-qt,qt4-x11-free"Quoted 96 lines
--without-tutorial \ --disable-wxwidgets"meta-oe/recipes-extended/gnuplot/gnuplot/lua-loadlibs- renamed from meta-oe/recipes-extended/gnuplot/gnuplot/lua-loadlibs-configure-in-fix.patch +0
-0configure-in-fix.patch
new file mode 100644
index 0000000..23f2cd2meta-oe/recipes-extended/gnuplot/gnuplot/lua-loadlibs- new file +0
-0configure-in-fix.patch
meta-oe/recipes-extended/gnuplot/gnuplot/lua-loadlibs- new file +16
-0@@ -0,0 +1,16 @@ +Index: gnuplot-4.6.5/configure.in +=================================================================== +--- gnuplot-4.6.5.orig/configure.in ++++ gnuplot-4.6.5/configure.in +@@ -690,6 +690,11 @@ if test "${with_lua}" = yes ; then + fi + + if test "$with_lua" != no; then ++ dnl check for dlopen/dl to fix loadlibs link failure ++ AC_CHECK_FUNC([dlopen], [], ++ AC_CHECK_LIB([dl], [dlopen], DLOPEN_LIBS="-ldl")) ++ AC_SUBST(DLOPEN_LIBS) ++ LUA_LIBS="$LUA_LIBS $DLOPEN_LIBS" + TERMLIBS="$TERMLIBS $LUA_LIBS" + CPPFLAGS="$CPPFLAGS $LUA_CFLAGS" + elsemeta-oe/recipes-extended/gnuplot/gnuplot/subdirs.patch new file +10
-0@@ -0,0 +1,11 @@ +--- /tmp/Makefile.am 2007-08-23 13:10:15.560659023 +0200 ++++ gnuplot-4.2.0/Makefile.am 2007-08-23 13:10:34.961764629 +0200 +@@ -1,7 +1,7 @@ + ## Process this file with automake to produce Makefile.in -*-Makefile-*- + AUTOMAKE_OPTIONS = foreign 1.2h + +-SUBDIRS = config m4 term src docs $(LISPDIR) man demo tutorial share ++SUBDIRS = config m4 term src $(LISPDIR) man share + + EXTRA_DIST = BUGS CodeStyle Copyright FAQ GNUmakefile INSTALLINSTALL.gnu \
+ Makefile.maint PATCHLEVEL PGPKEYS PORTING README README.1ST README.exp \meta-oe/recipes-extended/gnuplot/gnuplot_4.6.5.bb deleted +0
-12@@ -1,14 +0,0 @@ -require gnuplot.inc - -SRC_URI = "${SOURCEFORGE_MIRROR}/gnuplot/${BP}.tar.gz;name=archive \ - http://www.mneuroth.de/privat/zaurus/qtplot-0.2.tar.gz;name=qtplot \ - file://subdirs.patch \ - file://lua-loadlibs-configure-in-fix.patch \ - file://gnuplot.desktop \ - file://gnuplot.png \ -" - -SRC_URI[archive.md5sum] = "9a476b21f74bd99c876f1509d731a0f9" -SRC_URI[archive.sha256sum] = "e550f030c7d04570e89c3d4e3f6e82
296816508419c86ab46c4dd73156519a2d"meta-oe/recipes-extended/gnuplot/gnuplot_4.6.5.bb deleted +0
-2-SRC_URI[qtplot.md5sum] = "0a481885a496092c77eb4017540b5cf6" -SRC_URI[qtplot.sha256sum] = "6df317183ff62cc82f3dcf88207a26
7cd6478cb5147f55d7530c94f1ad5f4132"meta-oe/recipes-extended/gnuplot/gnuplot_5.0.5.bb new file +12
-0@@ -0,0 +1,14 @@ +require gnuplot.inc + +SRC_URI = "${SOURCEFORGE_MIRROR}/gnuplot/${BP}.tar.gz;name=archive \ + http://www.mneuroth.de/privat/zaurus/qtplot-0.2.tar.gz;name=qtplot \ + file://subdirs.patch \ + file://lua-loadlibs-configure-in-fix.patch \ + file://gnuplot.desktop \ + file://gnuplot.png \ +" + +SRC_URI[archive.md5sum] = "c5e96fca73afbee4f57cbc1bfce6b3b8" +SRC_URI[archive.sha256sum] = "25f3e0bf192e01115c580f278c3725
d7a569eb848786e12b455a3fda70312053"meta-oe/recipes-extended/gnuplot/gnuplot_5.0.5.bb new file +2
-0+SRC_URI[qtplot.md5sum] = "0a481885a496092c77eb4017540b5cf6" +SRC_URI[qtplot.sha256sum] = "6df317183ff62cc82f3dcf88207a26
7cd6478cb5147f55d7530c94f1ad5f4132"
--
2.8.3Quoted 6 lines
--
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel--
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Quoted 83 lines · Tim Orling
I would rather see a PACKAGECONFIG for qt5
Quoted 79 lines · Chen Qi
Add '--disable-qt' to
EXTRA_OECONFto fixdo_compilefailure.Signed-off-by Chen Qi <[email protected]>--- .../gnuplot-4.6.5/lua-loadlibs-configure-in-fix.patch | 16 ---------------- .../recipes-extended/gnuplot/gnuplot-4.6.5/subdirs.patch | 11 ----------- meta-oe/recipes-extended/gnuplot/gnuplot.inc | 2 +- .../gnuplot/gnuplot/lua-loadlibs-configure-in-fix.patch | 16 ++++++++++++++++ meta-oe/recipes-extended/gnuplot/gnuplot/subdirs.patch | 11 +++++++++++ meta-oe/recipes-extended/gnuplot/gnuplot_4.6.5.bb | 14 -------------- meta-oe/recipes-extended/gnuplot/gnuplot_5.0.5.bb | 14 ++++++++++++++ 7 files changed, 42 insertions(+), 42 deletions(-)delete mode 100644 meta-oe/recipes-extended/gnuplot/gnuplot-4.6.5/lua-
loadlibs-configure-in-fix.patch
delete mode 100644 meta-oe/recipes-extended/gnuplot/gnuplot-4.6.5/subdirs.patch
create mode 100644 meta-oe/recipes-extended/gnuplot/gnuplot/lua-loadlibs-
configure-in-fix.patch
create mode 100644meta-oe/recipes-extended/gnuplot/gnuplot/subdirs.patchdelete mode 100644 meta-oe/recipes-extended/gnuplot/gnuplot_4.6.5.bb create mode 100644 meta-oe/recipes-extended/gnuplot/gnuplot_5.0.5.bb(quoted diff) +0
-0loadlibs-configure-in-fix.patch b/meta-oe/recipes-extended/
gnuplot/gnuplot-4.6.5/lua-loadlibs-configure-in-fix.patchdeleted file mode 100644
index 23f2cd2..0000000
--- a/meta-oe/recipes-extended/gnuplot/gnuplot-4.6.5/lua- loadlibs-configure-in-fix.patch
+++/dev/nullmeta-oe/recipes-extended/gnuplot/gnuplot-4.6.5/lua-loadlibs-configure-in-fix.patch deleted +0
-16@@ -1,16 +0,0 @@ -Index: gnuplot-4.6.5/configure.in -=================================================================== ---- gnuplot-4.6.5.orig/configure.in -+++ gnuplot-4.6.5/configure.in -@@ -690,6 +690,11 @@ if test "${with_lua}" = yes ; then - fi - - if test "$with_lua" != no; then -+ dnl check for dlopen/dl to fix loadlibs link failure -+ AC_CHECK_FUNC([dlopen], [], -+ AC_CHECK_LIB([dl], [dlopen], DLOPEN_LIBS="-ldl")) -+ AC_SUBST(DLOPEN_LIBS) -+ LUA_LIBS="$LUA_LIBS $DLOPEN_LIBS" - TERMLIBS="$TERMLIBS $LUA_LIBS" - CPPFLAGS="$CPPFLAGS $LUA_CFLAGS" - elsemeta-oe/recipes-extended/gnuplot/gnuplot-4.6.5/subdirs.patch deleted +0
-10@@ -1,11 +0,0 @@ ---- /tmp/Makefile.am 2007-08-23 13:10:15.560659023 +0200 -+++ gnuplot-4.2.0/Makefile.am 2007-08-23 13:10:34.961764629 +0200 -@@ -1,7 +1,7 @@ - ## Process this file with automake to produce Makefile.in -*-Makefile-*- - AUTOMAKE_OPTIONS = foreign 1.2h - --SUBDIRS = config m4 term src docs $(LISPDIR) man demo tutorial share -+SUBDIRS = config m4 term src $(LISPDIR) man share - - EXTRA_DIST = BUGS CodeStyle Copyright FAQ GNUmakefile INSTALLINSTALL.gnu \
- Makefile.maint PATCHLEVEL PGPKEYS PORTING README README.1ST README.exp \meta-oe/recipes-extended/gnuplot/gnuplot.inc +0
-0@@ -17,7 +17,7 @@ PACKAGECONFIG[cairo] = "--with-cairo,--without-cairo,cairopango"
PACKAGECONFIG[lua] = "--with-lua,--without-lua,lua"
Quoted 7 lines
meta-oe/recipes-extended/gnuplot/gnuplot.inc PACKAGECONFIG[cairo] = "--with-cairo,--without-cairo,cairo pango" · line 20
Quoted 4 lines
EXTRA_OECONF = "--with-readline=${STAGING_LIBDIR}/.. \meta-oe/recipes-extended/gnuplot/gnuplot.inc +1
-1- --without-lisp-files \ + --without-qt \This would be more universal in a PACKAGECONFIG
e.g. PACKAGECONFIG[qt4] = "--with-qt,--without-qt,qt4-x11-free"
The problem is that it fails to compile with qt4. So I just disabled it.
Regards,
Chen Qi
Quoted 102 lines
Quoted 102 lines
--without-tutorial \ --disable-wxwidgets"meta-oe/recipes-extended/gnuplot/gnuplot/lua-loadlibs- renamed from meta-oe/recipes-extended/gnuplot/gnuplot/lua-loadlibs-configure-in-fix.patch +0
-0configure-in-fix.patch
new file mode 100644
index 0000000..23f2cd2meta-oe/recipes-extended/gnuplot/gnuplot/lua-loadlibs- new file +0
-0configure-in-fix.patch
meta-oe/recipes-extended/gnuplot/gnuplot/lua-loadlibs- new file +16
-0@@ -0,0 +1,16 @@ +Index: gnuplot-4.6.5/configure.in +=================================================================== +--- gnuplot-4.6.5.orig/configure.in ++++ gnuplot-4.6.5/configure.in +@@ -690,6 +690,11 @@ if test "${with_lua}" = yes ; then + fi + + if test "$with_lua" != no; then ++ dnl check for dlopen/dl to fix loadlibs link failure ++ AC_CHECK_FUNC([dlopen], [], ++ AC_CHECK_LIB([dl], [dlopen], DLOPEN_LIBS="-ldl")) ++ AC_SUBST(DLOPEN_LIBS) ++ LUA_LIBS="$LUA_LIBS $DLOPEN_LIBS" + TERMLIBS="$TERMLIBS $LUA_LIBS" + CPPFLAGS="$CPPFLAGS $LUA_CFLAGS" + elsemeta-oe/recipes-extended/gnuplot/gnuplot/subdirs.patch new file +10
-0@@ -0,0 +1,11 @@ +--- /tmp/Makefile.am 2007-08-23 13:10:15.560659023 +0200 ++++ gnuplot-4.2.0/Makefile.am 2007-08-23 13:10:34.961764629 +0200 +@@ -1,7 +1,7 @@ + ## Process this file with automake to produce Makefile.in -*-Makefile-*- + AUTOMAKE_OPTIONS = foreign 1.2h + +-SUBDIRS = config m4 term src docs $(LISPDIR) man demo tutorial share ++SUBDIRS = config m4 term src $(LISPDIR) man share + + EXTRA_DIST = BUGS CodeStyle Copyright FAQ GNUmakefile INSTALLINSTALL.gnu \
+ Makefile.maint PATCHLEVEL PGPKEYS PORTING README README.1ST README.exp \meta-oe/recipes-extended/gnuplot/gnuplot_4.6.5.bb deleted +0
-12@@ -1,14 +0,0 @@ -require gnuplot.inc - -SRC_URI = "${SOURCEFORGE_MIRROR}/gnuplot/${BP}.tar.gz;name=archive \ - http://www.mneuroth.de/privat/zaurus/qtplot-0.2.tar.gz;name=qtplot \ - file://subdirs.patch \ - file://lua-loadlibs-configure-in-fix.patch \ - file://gnuplot.desktop \ - file://gnuplot.png \ -" - -SRC_URI[archive.md5sum] = "9a476b21f74bd99c876f1509d731a0f9" -SRC_URI[archive.sha256sum] = "e550f030c7d04570e89c3d4e3f6e82
296816508419c86ab46c4dd73156519a2d"meta-oe/recipes-extended/gnuplot/gnuplot_4.6.5.bb deleted +0
-2-SRC_URI[qtplot.md5sum] = "0a481885a496092c77eb4017540b5cf6" -SRC_URI[qtplot.sha256sum] = "6df317183ff62cc82f3dcf88207a26
7cd6478cb5147f55d7530c94f1ad5f4132"meta-oe/recipes-extended/gnuplot/gnuplot_5.0.5.bb new file +12
-0@@ -0,0 +1,14 @@ +require gnuplot.inc + +SRC_URI = "${SOURCEFORGE_MIRROR}/gnuplot/${BP}.tar.gz;name=archive \ + http://www.mneuroth.de/privat/zaurus/qtplot-0.2.tar.gz;name=qtplot \ + file://subdirs.patch \ + file://lua-loadlibs-configure-in-fix.patch \ + file://gnuplot.desktop \ + file://gnuplot.png \ +" + +SRC_URI[archive.md5sum] = "c5e96fca73afbee4f57cbc1bfce6b3b8" +SRC_URI[archive.sha256sum] = "25f3e0bf192e01115c580f278c3725
d7a569eb848786e12b455a3fda70312053"meta-oe/recipes-extended/gnuplot/gnuplot_5.0.5.bb new file +2
-0+SRC_URI[qtplot.md5sum] = "0a481885a496092c77eb4017540b5cf6" +SRC_URI[qtplot.sha256sum] = "6df317183ff62cc82f3dcf88207a26
7cd6478cb5147f55d7530c94f1ad5f4132"
--
2.8.3--
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
It doesn't matter. With the PACKAGECONFIG it will default to disabled. Done. Somebody else's problem if they need qt4.
Quoted 221 lines · ChenQi
Quoted 91 lines · Tim Orling
I would rather see a PACKAGECONFIG for qt5
On Tue, Nov 1, 2016 at 11:30 PM, Chen Qi <[email protected]> wrote:
Add '--disable-qt' to
EXTRA_OECONFto fixdo_compilefailure.Quoted 86 lines
Signed-off-by Chen Qi <[email protected]>--- .../gnuplot-4.6.5/lua-loadlibs-configure-in-fix.patch | 16 ---------------- .../recipes-extended/gnuplot/gnuplot-4.6.5/subdirs.patch | 11 ----------- meta-oe/recipes-extended/gnuplot/gnuplot.inc | 2 +- .../gnuplot/gnuplot/lua-loadlibs-configure-in-fix.patch | 16 ++++++++++++++++ meta-oe/recipes-extended/gnuplot/gnuplot/subdirs.patch | 11 +++++++++++ meta-oe/recipes-extended/gnuplot/gnuplot_4.6.5.bb | 14 -------------- meta-oe/recipes-extended/gnuplot/gnuplot_5.0.5.bb | 14 ++++++++++++++ 7 files changed, 42 insertions(+), 42 deletions(-)delete mode 100644 meta-oe/recipes-extended/gnuplot/gnuplot-4.6.5/lua-
loadlibs-configure-in-fix.patch
delete mode 100644 meta-oe/recipes-extended/gnuplot/gnuplot-4.6.5/subdirs.patch
create mode 100644 meta-oe/recipes-extended/gnupl
ot/gnuplot/lua-loadlibs-
configure-in-fix.patch
create mode 100644 meta-oe/recipes-extended/gnuplot/gnuplot/subdirs.patch
delete mode 100644 meta-oe/recipes-extended/gnuplot/gnuplot_4.6.5.bb create mode 100644 meta-oe/recipes-extended/gnuplot/gnuplot_5.0.5.bb(quoted diff) +0
-0loadlibs-configure-in-fix.patch b/meta-oe/recipes-extended/
gnuplot/gnuplot-4.6.5/lua-loadlibs-configure-in-fix.patchdeleted file mode 100644
index 23f2cd2..0000000
--- a/meta-oe/recipes-extended/gnuplot/gnuplot-4.6.5/lua- loadlibs-configure-in-fix.patch
+++/dev/nullmeta-oe/recipes-extended/gnuplot/gnuplot-4.6.5/lua-loadlibs-configure-in-fix.patch deleted +0
-16@@ -1,16 +0,0 @@ -Index: gnuplot-4.6.5/configure.in -=================================================================== ---- gnuplot-4.6.5.orig/configure.in -+++ gnuplot-4.6.5/configure.in -@@ -690,6 +690,11 @@ if test "${with_lua}" = yes ; then - fi - - if test "$with_lua" != no; then -+ dnl check for dlopen/dl to fix loadlibs link failure -+ AC_CHECK_FUNC([dlopen], [], -+ AC_CHECK_LIB([dl], [dlopen], DLOPEN_LIBS="-ldl")) -+ AC_SUBST(DLOPEN_LIBS) -+ LUA_LIBS="$LUA_LIBS $DLOPEN_LIBS" - TERMLIBS="$TERMLIBS $LUA_LIBS" - CPPFLAGS="$CPPFLAGS $LUA_CFLAGS" - else(quoted diff) +0
-0ch
b/meta-oe/recipes-extended/gnuplot/gnuplot-4.6.5/subdirs.patchdeleted file mode 100644
index 8c7d1f0..0000000meta-oe/recipes-extended/gnuplot/gnuplot-4.6.5/subdirs.patch deleted +0
-11@@ -1,11 +0,0 @@ ---- /tmp/Makefile.am 2007-08-23 13:10:15.560659023 +0200 -+++ gnuplot-4.2.0/Makefile.am 2007-08-23 13:10:34.961764629 +0200 -@@ -1,7 +1,7 @@ - ## Process this file with automake to produce Makefile.in -*-Makefile-*- - AUTOMAKE_OPTIONS = foreign 1.2h - --SUBDIRS = config m4 term src docs $(LISPDIR) man demo tutorial share -+SUBDIRS = config m4 term src $(LISPDIR) man share - - EXTRA_DIST = BUGS CodeStyle Copyright FAQ GNUmakefile INSTALLINSTALL.gnu \
- Makefile.maint PATCHLEVEL PGPKEYS PORTING README README.1ST README.exp \meta-oe/recipes-extended/gnuplot/gnuplot.inc +0
-0@@ -17,7 +17,7 @@ PACKAGECONFIG[cairo] = "--with-cairo,--without-cairo,cairo
pango"
PACKAGECONFIG[lua] = "--with-lua,--without-lua,lua"Quoted 8 lines
Quoted 5 lines
EXTRA_OECONF = "--with-readline=${STAGING_LIBDIR}/.. \meta-oe/recipes-extended/gnuplot/gnuplot.inc +1
-1- --without-lisp-files \ + --without-qt \This would be more universal in a PACKAGECONFIG
e.g. PACKAGECONFIG[qt4] = "--with-qt,--without-qt,qt4-x11-free"
The problem is that it fails to compile with qt4. So I just disabled it.
Regards,
Chen Qi--without-tutorial \Quoted 100 lines
Quoted 100 lines
--disable-wxwidgets"
(quoted diff) +0
-0igure-in-fix.patch b/meta-oe/recipes-extended/gnuplot/gnuplot/lua-loadlibs- configure-in-fix.patch
new file mode 100644
index 0000000..23f2cd2meta-oe/recipes-extended/gnuplot/gnuplot/lua-loadlibs- new file +0
-0configure-in-fix.patch
meta-oe/recipes-extended/gnuplot/gnuplot/lua-loadlibs- new file +16
-0@@ -0,0 +1,16 @@ +Index: gnuplot-4.6.5/configure.in +=================================================================== +--- gnuplot-4.6.5.orig/configure.in ++++ gnuplot-4.6.5/configure.in +@@ -690,6 +690,11 @@ if test "${with_lua}" = yes ; then + fi + + if test "$with_lua" != no; then ++ dnl check for dlopen/dl to fix loadlibs link failure ++ AC_CHECK_FUNC([dlopen], [], ++ AC_CHECK_LIB([dl], [dlopen], DLOPEN_LIBS="-ldl")) ++ AC_SUBST(DLOPEN_LIBS) ++ LUA_LIBS="$LUA_LIBS $DLOPEN_LIBS" + TERMLIBS="$TERMLIBS $LUA_LIBS" + CPPFLAGS="$CPPFLAGS $LUA_CFLAGS" + elsemeta-oe/recipes-extended/gnuplot/gnuplot/subdirs.patch new file +10
-1@@ -0,0 +1,11 @@ +--- /tmp/Makefile.am 2007-08-23 13:10:15.560659023 +0200 ++++ gnuplot-4.2.0/Makefile.am 2007-08-23 13:10:34.961764629 +0200 +@@ -1,7 +1,7 @@ + ## Process this file with automake to produce Makefile.in -*-Makefile-*- + AUTOMAKE_OPTIONS = foreign 1.2h + +-SUBDIRS = config m4 term src docs $(LISPDIR) man demo tutorial share ++SUBDIRS = config m4 term src $(LISPDIR) man share + + EXTRA_DIST = BUGS CodeStyle Copyright FAQ GNUmakefile INSTALLINSTALL.gnu \
+ Makefile.maint PATCHLEVEL PGPKEYS PORTING README README.1ST README.exp \meta-oe/recipes-extended/gnuplot/gnuplot_4.6.5.bb deleted +0
-4@@ -1,14 +0,0 @@ -require gnuplot.inc - -SRC_URI = "${SOURCEFORGE_MIRROR}/gnuplot/${BP}.tar.gz;name=archive \ - http://www.mneuroth.de/privat/zaurus/qtplot-0.2.tar.gz;name=qtplot\
meta-oe/recipes-extended/gnuplot/gnuplot_4.6.5.bb deleted +0
-8- file://subdirs.patch \ - file://lua-loadlibs-configure-in-fix.patch \ - file://gnuplot.desktop \ - file://gnuplot.png \ -" - -SRC_URI[archive.md5sum] = "9a476b21f74bd99c876f1509d731a0f9" -SRC_URI[archive.sha256sum] = "e550f030c7d04570e89c3d4e3f6e82
296816508419c86ab46c4dd73156519a2d"meta-oe/recipes-extended/gnuplot/gnuplot_4.6.5.bb deleted +0
-2-SRC_URI[qtplot.md5sum] = "0a481885a496092c77eb4017540b5cf6" -SRC_URI[qtplot.sha256sum] = "6df317183ff62cc82f3dcf88207a26
7cd6478cb5147f55d7530c94f1ad5f4132"meta-oe/recipes-extended/gnuplot/gnuplot_5.0.5.bb new file +4
-0@@ -0,0 +1,14 @@ +require gnuplot.inc + +SRC_URI = "${SOURCEFORGE_MIRROR}/gnuplot/${BP}.tar.gz;name=archive \ + http://www.mneuroth.de/privat/zaurus/qtplot-0.2.tar.gz;name=qtplot\
meta-oe/recipes-extended/gnuplot/gnuplot_5.0.5.bb new file +8
-0+ file://subdirs.patch \ + file://lua-loadlibs-configure-in-fix.patch \ + file://gnuplot.desktop \ + file://gnuplot.png \ +" + +SRC_URI[archive.md5sum] = "c5e96fca73afbee4f57cbc1bfce6b3b8" +SRC_URI[archive.sha256sum] = "25f3e0bf192e01115c580f278c3725
d7a569eb848786e12b455a3fda70312053"meta-oe/recipes-extended/gnuplot/gnuplot_5.0.5.bb new file +2
-0+SRC_URI[qtplot.md5sum] = "0a481885a496092c77eb4017540b5cf6" +SRC_URI[qtplot.sha256sum] = "6df317183ff62cc82f3dcf88207a26
7cd6478cb5147f55d7530c94f1ad5f4132"
--
2.8.3Quoted 7 lines
Quoted 7 lines
--
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel--
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel