* [meta-oe][PATCH V2] gnuplot: upgrade to 5.0.5
@ 2016-11-02 6:30 Chen Qi
2016-11-04 2:23 ` Tim Orling
0 siblings, 1 reply; 5+ messages in thread
From: Chen Qi @ 2016-11-02 6:30 UTC (permalink / raw)
To: openembedded-devel
Add '--disable-qt' to EXTRA_OECONF to fix do_compile failure.
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
---
.../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
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-4.6.5/lua-loadlibs-configure-in-fix.patch
deleted file mode 100644
index 23f2cd2..0000000
--- a/meta-oe/recipes-extended/gnuplot/gnuplot-4.6.5/lua-loadlibs-configure-in-fix.patch
+++ /dev/null
@@ -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
diff --git a/meta-oe/recipes-extended/gnuplot/gnuplot-4.6.5/subdirs.patch b/meta-oe/recipes-extended/gnuplot/gnuplot-4.6.5/subdirs.patch
deleted file mode 100644
index 8c7d1f0..0000000
--- a/meta-oe/recipes-extended/gnuplot/gnuplot-4.6.5/subdirs.patch
+++ /dev/null
@@ -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 \
diff --git a/meta-oe/recipes-extended/gnuplot/gnuplot.inc b/meta-oe/recipes-extended/gnuplot/gnuplot.inc
index 69bc74b..d8d9a5f 100644
--- a/meta-oe/recipes-extended/gnuplot/gnuplot.inc
+++ b/meta-oe/recipes-extended/gnuplot/gnuplot.inc
@@ -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"
diff --git a/meta-oe/recipes-extended/gnuplot/gnuplot/lua-loadlibs-configure-in-fix.patch b/meta-oe/recipes-extended/gnuplot/gnuplot/lua-loadlibs-configure-in-fix.patch
new file mode 100644
index 0000000..23f2cd2
--- /dev/null
+++ b/meta-oe/recipes-extended/gnuplot/gnuplot/lua-loadlibs-configure-in-fix.patch
@@ -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
diff --git a/meta-oe/recipes-extended/gnuplot/gnuplot/subdirs.patch b/meta-oe/recipes-extended/gnuplot/gnuplot/subdirs.patch
new file mode 100644
index 0000000..8c7d1f0
--- /dev/null
+++ b/meta-oe/recipes-extended/gnuplot/gnuplot/subdirs.patch
@@ -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 \
diff --git a/meta-oe/recipes-extended/gnuplot/gnuplot_4.6.5.bb b/meta-oe/recipes-extended/gnuplot/gnuplot_4.6.5.bb
deleted file mode 100644
index 3f694a0..0000000
--- a/meta-oe/recipes-extended/gnuplot/gnuplot_4.6.5.bb
+++ /dev/null
@@ -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"
diff --git a/meta-oe/recipes-extended/gnuplot/gnuplot_5.0.5.bb b/meta-oe/recipes-extended/gnuplot/gnuplot_5.0.5.bb
new file mode 100644
index 0000000..42308ba
--- /dev/null
+++ b/meta-oe/recipes-extended/gnuplot/gnuplot_5.0.5.bb
@@ -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"
--
2.8.3
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [meta-oe][PATCH V2] gnuplot: upgrade to 5.0.5
2016-11-02 6:30 [meta-oe][PATCH V2] gnuplot: upgrade to 5.0.5 Chen Qi
@ 2016-11-04 2:23 ` Tim Orling
2016-11-04 3:07 ` Khem Raj
2016-11-04 3:13 ` ChenQi
0 siblings, 2 replies; 5+ messages in thread
From: Tim Orling @ 2016-11-04 2:23 UTC (permalink / raw)
To: openembedded-devel@lists.openembedded.org
I would rather see a PACKAGECONFIG for qt5
On Tue, Nov 1, 2016 at 11:30 PM, Chen Qi <Qi.Chen@windriver.com> wrote:
> Add '--disable-qt' to EXTRA_OECONF to fix do_compile failure.
>
> Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
> ---
> .../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
>
> 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-4.6.5/lua-loadlibs-configure-in-fix.patch
> deleted file mode 100644
> index 23f2cd2..0000000
> --- a/meta-oe/recipes-extended/gnuplot/gnuplot-4.6.5/lua-
> loadlibs-configure-in-fix.patch
> +++ /dev/null
> @@ -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
> diff --git a/meta-oe/recipes-extended/gnuplot/gnuplot-4.6.5/subdirs.patch
> b/meta-oe/recipes-extended/gnuplot/gnuplot-4.6.5/subdirs.patch
> deleted file mode 100644
> index 8c7d1f0..0000000
> --- a/meta-oe/recipes-extended/gnuplot/gnuplot-4.6.5/subdirs.patch
> +++ /dev/null
> @@ -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 \
> diff --git a/meta-oe/recipes-extended/gnuplot/gnuplot.inc
> b/meta-oe/recipes-extended/gnuplot/gnuplot.inc
> index 69bc74b..d8d9a5f 100644
> --- a/meta-oe/recipes-extended/gnuplot/gnuplot.inc
> +++ b/meta-oe/recipes-extended/gnuplot/gnuplot.inc
> @@ -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 \
>
This would be more universal in a PACKAGECONFIG
e.g. PACKAGECONFIG[qt4] = "--with-qt,--without-qt,qt4-x11-free"
> --without-tutorial \
> --disable-wxwidgets"
>
> diff --git a/meta-oe/recipes-extended/gnuplot/gnuplot/lua-loadlibs-configure-in-fix.patch
> b/meta-oe/recipes-extended/gnuplot/gnuplot/lua-loadlibs-
> configure-in-fix.patch
> new file mode 100644
> index 0000000..23f2cd2
> --- /dev/null
> +++ b/meta-oe/recipes-extended/gnuplot/gnuplot/lua-loadlibs-
> configure-in-fix.patch
> @@ -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
> diff --git a/meta-oe/recipes-extended/gnuplot/gnuplot/subdirs.patch
> b/meta-oe/recipes-extended/gnuplot/gnuplot/subdirs.patch
> new file mode 100644
> index 0000000..8c7d1f0
> --- /dev/null
> +++ b/meta-oe/recipes-extended/gnuplot/gnuplot/subdirs.patch
> @@ -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 \
> diff --git a/meta-oe/recipes-extended/gnuplot/gnuplot_4.6.5.bb
> b/meta-oe/recipes-extended/gnuplot/gnuplot_4.6.5.bb
> deleted file mode 100644
> index 3f694a0..0000000
> --- a/meta-oe/recipes-extended/gnuplot/gnuplot_4.6.5.bb
> +++ /dev/null
> @@ -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"
> -SRC_URI[qtplot.md5sum] = "0a481885a496092c77eb4017540b5cf6"
> -SRC_URI[qtplot.sha256sum] = "6df317183ff62cc82f3dcf88207a26
> 7cd6478cb5147f55d7530c94f1ad5f4132"
> diff --git a/meta-oe/recipes-extended/gnuplot/gnuplot_5.0.5.bb
> b/meta-oe/recipes-extended/gnuplot/gnuplot_5.0.5.bb
> new file mode 100644
> index 0000000..42308ba
> --- /dev/null
> +++ b/meta-oe/recipes-extended/gnuplot/gnuplot_5.0.5.bb
> @@ -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"
> +SRC_URI[qtplot.md5sum] = "0a481885a496092c77eb4017540b5cf6"
> +SRC_URI[qtplot.sha256sum] = "6df317183ff62cc82f3dcf88207a26
> 7cd6478cb5147f55d7530c94f1ad5f4132"
> --
> 2.8.3
>
> --
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [meta-oe][PATCH V2] gnuplot: upgrade to 5.0.5
2016-11-04 2:23 ` Tim Orling
@ 2016-11-04 3:07 ` Khem Raj
2016-11-04 3:13 ` ChenQi
1 sibling, 0 replies; 5+ messages in thread
From: Khem Raj @ 2016-11-04 3:07 UTC (permalink / raw)
To: openembeded-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
On Thu, Nov 3, 2016 at 7:23 PM, Tim Orling <ticotimo@gmail.com> wrote:
> I would rather see a PACKAGECONFIG for qt5
>
> On Tue, Nov 1, 2016 at 11:30 PM, Chen Qi <Qi.Chen@windriver.com> wrote:
>
>> Add '--disable-qt' to EXTRA_OECONF to fix do_compile failure.
>>
>> Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
>> ---
>> .../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
>>
>> 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-4.6.5/lua-loadlibs-configure-in-fix.patch
>> deleted file mode 100644
>> index 23f2cd2..0000000
>> --- a/meta-oe/recipes-extended/gnuplot/gnuplot-4.6.5/lua-
>> loadlibs-configure-in-fix.patch
>> +++ /dev/null
>> @@ -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
>> diff --git a/meta-oe/recipes-extended/gnuplot/gnuplot-4.6.5/subdirs.patch
>> b/meta-oe/recipes-extended/gnuplot/gnuplot-4.6.5/subdirs.patch
>> deleted file mode 100644
>> index 8c7d1f0..0000000
>> --- a/meta-oe/recipes-extended/gnuplot/gnuplot-4.6.5/subdirs.patch
>> +++ /dev/null
>> @@ -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 \
>> diff --git a/meta-oe/recipes-extended/gnuplot/gnuplot.inc
>> b/meta-oe/recipes-extended/gnuplot/gnuplot.inc
>> index 69bc74b..d8d9a5f 100644
>> --- a/meta-oe/recipes-extended/gnuplot/gnuplot.inc
>> +++ b/meta-oe/recipes-extended/gnuplot/gnuplot.inc
>> @@ -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 \
>>
>
> This would be more universal in a PACKAGECONFIG
> e.g. PACKAGECONFIG[qt4] = "--with-qt,--without-qt,qt4-x11-free"
>
>
>> --without-tutorial \
>> --disable-wxwidgets"
>>
>> diff --git a/meta-oe/recipes-extended/gnuplot/gnuplot/lua-loadlibs-configure-in-fix.patch
>> b/meta-oe/recipes-extended/gnuplot/gnuplot/lua-loadlibs-
>> configure-in-fix.patch
>> new file mode 100644
>> index 0000000..23f2cd2
>> --- /dev/null
>> +++ b/meta-oe/recipes-extended/gnuplot/gnuplot/lua-loadlibs-
>> configure-in-fix.patch
>> @@ -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
>> diff --git a/meta-oe/recipes-extended/gnuplot/gnuplot/subdirs.patch
>> b/meta-oe/recipes-extended/gnuplot/gnuplot/subdirs.patch
>> new file mode 100644
>> index 0000000..8c7d1f0
>> --- /dev/null
>> +++ b/meta-oe/recipes-extended/gnuplot/gnuplot/subdirs.patch
>> @@ -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 \
>> diff --git a/meta-oe/recipes-extended/gnuplot/gnuplot_4.6.5.bb
>> b/meta-oe/recipes-extended/gnuplot/gnuplot_4.6.5.bb
>> deleted file mode 100644
>> index 3f694a0..0000000
>> --- a/meta-oe/recipes-extended/gnuplot/gnuplot_4.6.5.bb
>> +++ /dev/null
>> @@ -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"
>> -SRC_URI[qtplot.md5sum] = "0a481885a496092c77eb4017540b5cf6"
>> -SRC_URI[qtplot.sha256sum] = "6df317183ff62cc82f3dcf88207a26
>> 7cd6478cb5147f55d7530c94f1ad5f4132"
>> diff --git a/meta-oe/recipes-extended/gnuplot/gnuplot_5.0.5.bb
>> b/meta-oe/recipes-extended/gnuplot/gnuplot_5.0.5.bb
>> new file mode 100644
>> index 0000000..42308ba
>> --- /dev/null
>> +++ b/meta-oe/recipes-extended/gnuplot/gnuplot_5.0.5.bb
>> @@ -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"
>> +SRC_URI[qtplot.md5sum] = "0a481885a496092c77eb4017540b5cf6"
>> +SRC_URI[qtplot.sha256sum] = "6df317183ff62cc82f3dcf88207a26
>> 7cd6478cb5147f55d7530c94f1ad5f4132"
>> --
>> 2.8.3
>>
>> --
>> _______________________________________________
>> Openembedded-devel mailing list
>> Openembedded-devel@lists.openembedded.org
>> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
>>
> --
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [meta-oe][PATCH V2] gnuplot: upgrade to 5.0.5
2016-11-04 2:23 ` Tim Orling
2016-11-04 3:07 ` Khem Raj
@ 2016-11-04 3:13 ` ChenQi
2016-11-04 4:40 ` Tim Orling
1 sibling, 1 reply; 5+ messages in thread
From: ChenQi @ 2016-11-04 3:13 UTC (permalink / raw)
To: openembedded-devel
On 11/04/2016 10:23 AM, Tim Orling wrote:
> I would rather see a PACKAGECONFIG for qt5
>
> On Tue, Nov 1, 2016 at 11:30 PM, Chen Qi <Qi.Chen@windriver.com> wrote:
>
>> Add '--disable-qt' to EXTRA_OECONF to fix do_compile failure.
>>
>> Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
>> ---
>> .../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
>>
>> 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-4.6.5/lua-loadlibs-configure-in-fix.patch
>> deleted file mode 100644
>> index 23f2cd2..0000000
>> --- a/meta-oe/recipes-extended/gnuplot/gnuplot-4.6.5/lua-
>> loadlibs-configure-in-fix.patch
>> +++ /dev/null
>> @@ -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
>> diff --git a/meta-oe/recipes-extended/gnuplot/gnuplot-4.6.5/subdirs.patch
>> b/meta-oe/recipes-extended/gnuplot/gnuplot-4.6.5/subdirs.patch
>> deleted file mode 100644
>> index 8c7d1f0..0000000
>> --- a/meta-oe/recipes-extended/gnuplot/gnuplot-4.6.5/subdirs.patch
>> +++ /dev/null
>> @@ -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 \
>> diff --git a/meta-oe/recipes-extended/gnuplot/gnuplot.inc
>> b/meta-oe/recipes-extended/gnuplot/gnuplot.inc
>> index 69bc74b..d8d9a5f 100644
>> --- a/meta-oe/recipes-extended/gnuplot/gnuplot.inc
>> +++ b/meta-oe/recipes-extended/gnuplot/gnuplot.inc
>> @@ -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 \
>>
> 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 \
>> --disable-wxwidgets"
>>
>> diff --git a/meta-oe/recipes-extended/gnuplot/gnuplot/lua-loadlibs-configure-in-fix.patch
>> b/meta-oe/recipes-extended/gnuplot/gnuplot/lua-loadlibs-
>> configure-in-fix.patch
>> new file mode 100644
>> index 0000000..23f2cd2
>> --- /dev/null
>> +++ b/meta-oe/recipes-extended/gnuplot/gnuplot/lua-loadlibs-
>> configure-in-fix.patch
>> @@ -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
>> diff --git a/meta-oe/recipes-extended/gnuplot/gnuplot/subdirs.patch
>> b/meta-oe/recipes-extended/gnuplot/gnuplot/subdirs.patch
>> new file mode 100644
>> index 0000000..8c7d1f0
>> --- /dev/null
>> +++ b/meta-oe/recipes-extended/gnuplot/gnuplot/subdirs.patch
>> @@ -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 \
>> diff --git a/meta-oe/recipes-extended/gnuplot/gnuplot_4.6.5.bb
>> b/meta-oe/recipes-extended/gnuplot/gnuplot_4.6.5.bb
>> deleted file mode 100644
>> index 3f694a0..0000000
>> --- a/meta-oe/recipes-extended/gnuplot/gnuplot_4.6.5.bb
>> +++ /dev/null
>> @@ -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"
>> -SRC_URI[qtplot.md5sum] = "0a481885a496092c77eb4017540b5cf6"
>> -SRC_URI[qtplot.sha256sum] = "6df317183ff62cc82f3dcf88207a26
>> 7cd6478cb5147f55d7530c94f1ad5f4132"
>> diff --git a/meta-oe/recipes-extended/gnuplot/gnuplot_5.0.5.bb
>> b/meta-oe/recipes-extended/gnuplot/gnuplot_5.0.5.bb
>> new file mode 100644
>> index 0000000..42308ba
>> --- /dev/null
>> +++ b/meta-oe/recipes-extended/gnuplot/gnuplot_5.0.5.bb
>> @@ -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"
>> +SRC_URI[qtplot.md5sum] = "0a481885a496092c77eb4017540b5cf6"
>> +SRC_URI[qtplot.sha256sum] = "6df317183ff62cc82f3dcf88207a26
>> 7cd6478cb5147f55d7530c94f1ad5f4132"
>> --
>> 2.8.3
>>
>> --
>> _______________________________________________
>> Openembedded-devel mailing list
>> Openembedded-devel@lists.openembedded.org
>> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
>>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [meta-oe][PATCH V2] gnuplot: upgrade to 5.0.5
2016-11-04 3:13 ` ChenQi
@ 2016-11-04 4:40 ` Tim Orling
0 siblings, 0 replies; 5+ messages in thread
From: Tim Orling @ 2016-11-04 4:40 UTC (permalink / raw)
To: openembedded-devel@lists.openembedded.org
It doesn't matter. With the PACKAGECONFIG it will default to disabled.
Done. Somebody else's problem if they need qt4.
On Thu, Nov 3, 2016 at 8:13 PM, ChenQi <Qi.Chen@windriver.com> wrote:
> On 11/04/2016 10:23 AM, Tim Orling wrote:
>
>> I would rather see a PACKAGECONFIG for qt5
>>
>> On Tue, Nov 1, 2016 at 11:30 PM, Chen Qi <Qi.Chen@windriver.com> wrote:
>>
>> Add '--disable-qt' to EXTRA_OECONF to fix do_compile failure.
>>>
>>> Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
>>> ---
>>> .../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/gnupl
>>> ot/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
>>>
>>> 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-4.6.5/lua-loadlibs-configure-in-fix.patch
>>> deleted file mode 100644
>>> index 23f2cd2..0000000
>>> --- a/meta-oe/recipes-extended/gnuplot/gnuplot-4.6.5/lua-
>>> loadlibs-configure-in-fix.patch
>>> +++ /dev/null
>>> @@ -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
>>> diff --git a/meta-oe/recipes-extended/gnuplot/gnuplot-4.6.5/subdirs.pat
>>> ch
>>> b/meta-oe/recipes-extended/gnuplot/gnuplot-4.6.5/subdirs.patch
>>> deleted file mode 100644
>>> index 8c7d1f0..0000000
>>> --- a/meta-oe/recipes-extended/gnuplot/gnuplot-4.6.5/subdirs.patch
>>> +++ /dev/null
>>> @@ -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
>>> \
>>> diff --git a/meta-oe/recipes-extended/gnuplot/gnuplot.inc
>>> b/meta-oe/recipes-extended/gnuplot/gnuplot.inc
>>> index 69bc74b..d8d9a5f 100644
>>> --- a/meta-oe/recipes-extended/gnuplot/gnuplot.inc
>>> +++ b/meta-oe/recipes-extended/gnuplot/gnuplot.inc
>>> @@ -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 \
>>>
>>> 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 \
>>> --disable-wxwidgets"
>>>
>>> diff --git a/meta-oe/recipes-extended/gnuplot/gnuplot/lua-loadlibs-conf
>>> igure-in-fix.patch
>>> b/meta-oe/recipes-extended/gnuplot/gnuplot/lua-loadlibs-
>>> configure-in-fix.patch
>>> new file mode 100644
>>> index 0000000..23f2cd2
>>> --- /dev/null
>>> +++ b/meta-oe/recipes-extended/gnuplot/gnuplot/lua-loadlibs-
>>> configure-in-fix.patch
>>> @@ -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
>>> diff --git a/meta-oe/recipes-extended/gnuplot/gnuplot/subdirs.patch
>>> b/meta-oe/recipes-extended/gnuplot/gnuplot/subdirs.patch
>>> new file mode 100644
>>> index 0000000..8c7d1f0
>>> --- /dev/null
>>> +++ b/meta-oe/recipes-extended/gnuplot/gnuplot/subdirs.patch
>>> @@ -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
>>> \
>>> diff --git a/meta-oe/recipes-extended/gnuplot/gnuplot_4.6.5.bb
>>> b/meta-oe/recipes-extended/gnuplot/gnuplot_4.6.5.bb
>>> deleted file mode 100644
>>> index 3f694a0..0000000
>>> --- a/meta-oe/recipes-extended/gnuplot/gnuplot_4.6.5.bb
>>> +++ /dev/null
>>> @@ -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"
>>> -SRC_URI[qtplot.md5sum] = "0a481885a496092c77eb4017540b5cf6"
>>> -SRC_URI[qtplot.sha256sum] = "6df317183ff62cc82f3dcf88207a26
>>> 7cd6478cb5147f55d7530c94f1ad5f4132"
>>> diff --git a/meta-oe/recipes-extended/gnuplot/gnuplot_5.0.5.bb
>>> b/meta-oe/recipes-extended/gnuplot/gnuplot_5.0.5.bb
>>> new file mode 100644
>>> index 0000000..42308ba
>>> --- /dev/null
>>> +++ b/meta-oe/recipes-extended/gnuplot/gnuplot_5.0.5.bb
>>> @@ -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"
>>> +SRC_URI[qtplot.md5sum] = "0a481885a496092c77eb4017540b5cf6"
>>> +SRC_URI[qtplot.sha256sum] = "6df317183ff62cc82f3dcf88207a26
>>> 7cd6478cb5147f55d7530c94f1ad5f4132"
>>> --
>>> 2.8.3
>>>
>>> --
>>> _______________________________________________
>>> Openembedded-devel mailing list
>>> Openembedded-devel@lists.openembedded.org
>>> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
>>>
>>>
> --
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
>
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2016-11-04 4:40 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-11-02 6:30 [meta-oe][PATCH V2] gnuplot: upgrade to 5.0.5 Chen Qi
2016-11-04 2:23 ` Tim Orling
2016-11-04 3:07 ` Khem Raj
2016-11-04 3:13 ` ChenQi
2016-11-04 4:40 ` Tim Orling
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.