gnuplot : new package
PATCH 1/2 gnuplot : new package
--- package/Config.in | 1 + package/gnuplot/Config.in | 6 ++++++ package/gnuplot/gnuplot.mk | 28 ++++++++++++++++++++++++++++ package/gnuplot/gnuplot.patch | 26 ++++++++++++++++++++++++++ 4 files changed, 61 insertions(+) create mode 100644 package/gnuplot/Config.in create mode 100644 package/gnuplot/gnuplot.mk create mode 100644 package/gnuplot/gnuplot.patch
package/Config.in +1 -0
@@ -108,6 +108,7 @@ menu "Graphic libraries and applications (graphic/text)" comment "Graphic applications" source "package/rrdtool/Config.in" +source "package/gnuplot/Config.in" comment "graphic libraries" source "package/directfb/Config.in"
package/gnuplot/Config.in new file +6 -0
@@ -0,0 +1,6 @@ +config BR2_PACKAGE_GNUPLOT + bool "gnuplot" + help + A portable command-line driven graphing utility. + + http://www.gnuplot.info/
package/gnuplot/gnuplot.mk new file +28 -0
@@ -0,0 +1,28 @@ +############################################################# +# +# gnuplot +# +############################################################# +GNUPLOT_VERSION = 4.6.0 +GNUPLOT_SOURCE = gnuplot-$(GNUPLOT_VERSION).tar.gz +GNUPLOT_SITE = http://superb-dca2.dl.sourceforge.net/project/gnuplot/gnuplot/$(GNUPLOT_VERSION) + +GNUPLOT_INSTALL_STAGING = YES + +GNUPLOT_LICENSE = gnuplot license (open source) +GNUPLOT_LICENSE_FILES = Copyright + +GNUPLOT_CONF_OPT = --without-x \ + --disable-raise-console \ + --disable-mouse \ + --without-tutorial \ + --without-demo --disable-demo \ + --without-row-help \ + --disable-history-file \ + --without-lisp-files \ + --disable-wxwidgets \ + --without-lua \ + --without-latex \ + --without-cairo + +$(eval $(autotools-package))
package/gnuplot/gnuplot.patch new file +26 -0
@@ -0,0 +1,26 @@ +diff --git a/Makefile.am b/Makefile.am +index bc0f2b2..5c00fe5 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -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 tutorial share + + EXTRA_DIST = BUGS CodeStyle Copyright FAQ.pdf GNUmakefile INSTALL INSTALL.gnu \ + Makefile.maint PATCHLEVEL PGPKEYS PORTING README README.1ST \ +diff --git a/Makefile.in b/Makefile.in +index 71118bc..86df133 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -250,7 +250,7 @@ top_build_prefix = @top_build_prefix@ + top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ + AUTOMAKE_OPTIONS = foreign 1.2h +-SUBDIRS = config m4 term src docs $(LISPDIR) man demo tutorial share ++SUBDIRS = config m4 term src $(LISPDIR) man tutorial share + EXTRA_DIST = BUGS CodeStyle Copyright FAQ.pdf GNUmakefile INSTALL INSTALL.gnu \ + Makefile.maint PATCHLEVEL PGPKEYS PORTING README README.1ST \ + VERSION configure.vms pm3d win
Signature · 1 line
1.7.10.4
PATCH 2/2 gnuplot : use new --without-doc and --without-demo configure options
create a generic patch to disable compilation/installation of docs and demo with configure options.
use theses options and remove basic old patch.
--- ...ot-0001-configure-add-without-demo-option.patch | 59 ++++++++++++++++++++ package/gnuplot/gnuplot.mk | 4 +- package/gnuplot/gnuplot.patch | 26 --------- 3 files changed, 62 insertions(+), 27 deletions(-) create mode 100644 package/gnuplot/gnuplot-0001-configure-add-without-demo-option.patch delete mode 100644 package/gnuplot/gnuplot.patch
package/gnuplot/gnuplot-0001-configure-add-without-demo-option.patch new file +59 -0
@@ -0,0 +1,59 @@ +Index: gnuplot-4.6.0/configure.in +=================================================================== +--- gnuplot-4.6.0.orig/configure.in 2012-03-08 05:34:42.000000000 +0100 ++++ gnuplot-4.6.0/configure.in 2013-01-07 11:50:03.003804463 +0100 +@@ -748,6 +748,16 @@ + AC_ARG_WITH(lisp-files,dnl + [ --without-lisp-files do not build emacs lisp files]) + ++dnl Whether we want to build the demo files ++dnl Does nothing here, is passed on to the demo subdir ++AC_ARG_WITH(demo,dnl ++[ --without-demo do not build demo files]) ++ ++dnl Whether we want to build the doc files ++dnl Does nothing here, is passed on to the doc subdir ++AC_ARG_WITH(doc,dnl ++[ --without-doc do not build doc files]) ++ + dnl Sort help/subtopic tables by row or column + AC_ARG_WITH(row-help,dnl + [ --with-row-help format help and subtopic tables by row (default) +@@ -1200,6 +1210,24 @@ + fi + AC_SUBST(LISPDIR) + ++dnl build demo files ++if test "$with_demo" != no; then ++ AC_CONFIG_SUBDIRS(demo) ++ DEMODIR=demo ++else ++ DEMODIR= ++fi ++AC_SUBST(DEMODIR) ++ ++dnl build doc files ++if test "$with_doc" != no; then ++ AC_CONFIG_SUBDIRS(docs) ++ DOCDIR=docs ++else ++ DOCDIR= ++fi ++AC_SUBST(DOCDIR) ++ + dnl Substitute variables + AC_SUBST(PACKAGE) + AC_SUBST(VERSION_MAJOR) +Index: gnuplot-4.6.0/Makefile.am +=================================================================== +--- gnuplot-4.6.0.orig/Makefile.am 2013-01-04 14:07:02.239120935 +0100 ++++ gnuplot-4.6.0/Makefile.am 2013-01-07 11:51:12.034846363 +0100 +@@ -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 $(DOCDIR) $(LISPDIR) $(DEMODIR) man tutorial share + + EXTRA_DIST = BUGS CodeStyle Copyright FAQ.pdf GNUmakefile INSTALL INSTALL.gnu \ + Makefile.maint PATCHLEVEL PGPKEYS PORTING README README.1ST \
package/gnuplot/gnuplot.mk +3 -1
@@ -7,6 +7,7 @@ GNUPLOT_VERSION = 4.6.0 GNUPLOT_SOURCE = gnuplot-$(GNUPLOT_VERSION).tar.gz GNUPLOT_SITE = http://superb-dca2.dl.sourceforge.net/project/gnuplot/gnuplot/$(GNUPLOT_VERSION) +GNUPLOT_AUTORECONF = YES GNUPLOT_INSTALL_STAGING = YES GNUPLOT_LICENSE = gnuplot license (open source)
@@ -16,7 +17,8 @@ GNUPLOT_CONF_OPT = --without-x \ --disable-raise-console \ --disable-mouse \ --without-tutorial \ - --without-demo --disable-demo \ + --without-demo \ + --without-doc \ --without-row-help \ --disable-history-file \ --without-lisp-files \
package/gnuplot/gnuplot.patch deleted +0 -26
@@ -1,26 +0,0 @@ -diff --git a/Makefile.am b/Makefile.am -index bc0f2b2..5c00fe5 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -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 tutorial share - - EXTRA_DIST = BUGS CodeStyle Copyright FAQ.pdf GNUmakefile INSTALL INSTALL.gnu \ - Makefile.maint PATCHLEVEL PGPKEYS PORTING README README.1ST \ -diff --git a/Makefile.in b/Makefile.in -index 71118bc..86df133 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -250,7 +250,7 @@ top_build_prefix = @top_build_prefix@ - top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ - AUTOMAKE_OPTIONS = foreign 1.2h --SUBDIRS = config m4 term src docs $(LISPDIR) man demo tutorial share -+SUBDIRS = config m4 term src $(LISPDIR) man tutorial share - EXTRA_DIST = BUGS CodeStyle Copyright FAQ.pdf GNUmakefile INSTALL INSTALL.gnu \ - Makefile.maint PATCHLEVEL PGPKEYS PORTING README README.1ST \ - VERSION configure.vms pm3d win
Signature · 1 line
1.7.10.4
PATCH 2/2 gnuplot : use new --without-doc and --without-demo configure options
package/gnuplot/gnuplot-0001-configure-add-without-demo-option.patch
Quoted 20 lines · Anthony Viallard
create a generic patch to disable compilation/installation of docs and demo with configure options.
use theses options and remove basic old patch.
Signed-off-by Anthony Viallard<[email protected]>--- ...ot-0001-configure-add-without-demo-option.patch | 59 ++++++++++++++++++++ package/gnuplot/gnuplot.mk | 4 +- package/gnuplot/gnuplot.patch | 26 --------- 3 files changed, 62 insertions(+), 27 deletions(-)create mode 100644
package/gnuplot/gnuplot-0001-configure-add-without-demo-option.patchdelete mode 100644package/gnuplot/gnuplot.patchpackage/gnuplot/gnuplot-0001-configure-add-without-demo-option.patch new file +0
-0@@ -0,0 +1,59 @@
The patch should start with a comment explaining what it does (similar
to a commit message), including a Signed-off-by line.
And don't forget to upstream the patch. If it happens to get accepted
before the buildroot patch is accepted, you can take the upstream commit as the buildroot patch instead.
package/gnuplot/gnuplot-0001-configure-add-without-demo-option.patch line 12
Quoted 12 lines
package/gnuplot/gnuplot-0001-configure-add-without-demo-option.patch new file +12
-0+Index: gnuplot-4.6.0/configure.in +=================================================================== +--- gnuplot-4.6.0.orig/configure.in 2012-03-08 05:34:42.000000000 +0100 ++++ gnuplot-4.6.0/configure.in 2013-01-07 11:50:03.003804463 +0100 +@@ -748,6 +748,16 @@ + AC_ARG_WITH(lisp-files,dnl + [ --without-lisp-files do not build emacs lisp files]) + ++dnl Whether we want to build the demo files ++dnl Does nothing here, is passed on to the demo subdir ++AC_ARG_WITH(demo,dnl ++[ --without-demo do not build demo files])
AC_ARG_ENABLE would be more appropriate. It also allows you to merge
the AC_CONFIG_SUBDIRS(demo) into the AC_ARG_ENABLE. It also means you don't need to add --without-doc to the .mk file, because it's already included in the common configure arguments.
Quoted 16 lines
package/gnuplot/gnuplot-0001-configure-add-without-demo-option.patch new file +16
-0++ ++dnl Whether we want to build the doc files ++dnl Does nothing here, is passed on to the doc subdir ++AC_ARG_WITH(doc,dnl ++[ --without-doc do not build doc files]) ++ + dnl Sort help/subtopic tables by row or column + AC_ARG_WITH(row-help,dnl + [ --with-row-help format help and subtopic tables by row (default) +@@ -1200,6 +1210,24 @@ + fi + AC_SUBST(LISPDIR) + ++dnl build demo files ++if test "$with_demo" != no; then ++ AC_CONFIG_SUBDIRS(demo)
package/gnuplot/gnuplot-0001-configure-add-without-demo-option.patch line 38
Quoted 10 lines
package/gnuplot/gnuplot-0001-configure-add-without-demo-option.patch new file +10
-0++ DEMODIR=demo ++else ++ DEMODIR= ++fi ++AC_SUBST(DEMODIR) ++ ++dnl build doc files ++if test "$with_doc" != no; then ++ AC_CONFIG_SUBDIRS(docs) ++ DOCDIR=docs
There is already a 'docdir' variable, so I'm not sure that DOCDIR is a
good choice. Don't really have a better suggestion, however.
Quoted 8 lines
package/gnuplot/gnuplot-0001-configure-add-without-demo-option.patch new file +8
-0++else ++ DOCDIR= ++fi ++AC_SUBST(DOCDIR) ++ + dnl Substitute variables + AC_SUBST(PACKAGE) + AC_SUBST(VERSION_MAJOR)
package/gnuplot/gnuplot-0001-configure-add-without-demo-option.patch line 56
Quoted 10 lines
package/gnuplot/gnuplot-0001-configure-add-without-demo-option.patch new file +10
-0+Index: gnuplot-4.6.0/Makefile.am +=================================================================== +--- gnuplot-4.6.0.orig/Makefile.am 2013-01-04 14:07:02.239120935 +0100 ++++ gnuplot-4.6.0/Makefile.am 2013-01-07 11:51:12.034846363 +0100 +@@ -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 $(DOCDIR) $(LISPDIR) $(DEMODIR) man tutorial share
It's probably not important, but I wouldn't swap the man and demo subdirs.
Regards,
Arnout
Quoted 57 lines
package/gnuplot/gnuplot-0001-configure-add-without-demo-option.patch new file +3
-0+ + EXTRA_DIST = BUGS CodeStyle Copyright FAQ.pdf GNUmakefile INSTALL INSTALL.gnu \ + Makefile.maint PATCHLEVEL PGPKEYS PORTING README README.1ST \package/gnuplot/gnuplot.mk +3
-1@@ -7,6 +7,7 @@ GNUPLOT_VERSION = 4.6.0 GNUPLOT_SOURCE = gnuplot-$(GNUPLOT_VERSION).tar.gz GNUPLOT_SITE = http://superb-dca2.dl.sourceforge.net/project/gnuplot/gnuplot/$(GNUPLOT_VERSION) +GNUPLOT_AUTORECONF = YES GNUPLOT_INSTALL_STAGING = YES GNUPLOT_LICENSE = gnuplot license (open source)@@ -16,7 +17,8 @@ GNUPLOT_CONF_OPT = --without-x \ --disable-raise-console \ --disable-mouse \ --without-tutorial \ - --without-demo --disable-demo \ + --without-demo \ + --without-doc \ --without-row-help \ --disable-history-file \ --without-lisp-files \package/gnuplot/gnuplot.patch deleted +0
-26@@ -1,26 +0,0 @@ -diff --git a/Makefile.am b/Makefile.am -index bc0f2b2..5c00fe5 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -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 tutorial share - - EXTRA_DIST = BUGS CodeStyle Copyright FAQ.pdf GNUmakefile INSTALL INSTALL.gnu \ - Makefile.maint PATCHLEVEL PGPKEYS PORTING README README.1ST \ -diff --git a/Makefile.in b/Makefile.in -index 71118bc..86df133 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -250,7 +250,7 @@ top_build_prefix = @top_build_prefix@ - top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ - AUTOMAKE_OPTIONS = foreign 1.2h --SUBDIRS = config m4 term src docs $(LISPDIR) man demo tutorial share -+SUBDIRS = config m4 term src $(LISPDIR) man tutorial share - EXTRA_DIST = BUGS CodeStyle Copyright FAQ.pdf GNUmakefile INSTALL INSTALL.gnu \ - Makefile.maint PATCHLEVEL PGPKEYS PORTING README README.1ST \ - VERSION configure.vms pm3d win
Signature · 6 lines
Arnout Vandecappelle arnout at mind be Senior Embedded Software Architect +32-16-286500 Essensium/Mind http://www.mind.be G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle GPG fingerprint: 7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
PATCH 1/2 gnuplot : new package
In reply to Anthony ViallardHi Anthony,
Thank you for your patch. Looks good, a few remarks below.
Quoted 17 lines · Anthony Viallard
Signed-off-by Anthony Viallard<[email protected]>--- package/Config.in | 1 + package/gnuplot/Config.in | 6 ++++++ package/gnuplot/gnuplot.mk | 28 ++++++++++++++++++++++++++++ package/gnuplot/gnuplot.patch | 26 ++++++++++++++++++++++++++ 4 files changed, 61 insertions(+)create mode 100644 package/gnuplot/Config.in create mode 100644
package/gnuplot/gnuplot.mkcreate mode 100644package/gnuplot/gnuplot.patchpackage/Config.in +0
-0
package/Config.in menu "Graphic libraries and applications (graphic/text)" · line 111
Quoted 4 lines
package/Config.in +1
-0@@ -108,6 +108,7 @@ menu "Graphic libraries and applications (graphic/text)" comment "Graphic applications" source "package/rrdtool/Config.in" +source "package/gnuplot/Config.in"
The menus should be sorted alphabetically, so gnuplot should come
before rrdtool.
Quoted 21 lines
package/Config.in +0
-0comment "graphic libraries" source "package/directfb/Config.in"package/gnuplot/Config.in new file +6
-0@@ -0,0 +1,6 @@ +config BR2_PACKAGE_GNUPLOT + bool "gnuplot" + help + A portable command-line driven graphing utility. + + http://www.gnuplot.info/package/gnuplot/gnuplot.mk new file +0
-0
package/gnuplot/gnuplot.mk line 8
Quoted 8 lines
package/gnuplot/gnuplot.mk new file +8
-0@@ -0,0 +1,28 @@ +############################################################# +# +# gnuplot +# +############################################################# +GNUPLOT_VERSION = 4.6.0 +GNUPLOT_SOURCE = gnuplot-$(GNUPLOT_VERSION).tar.gz +GNUPLOT_SITE = http://superb-dca2.dl.sourceforge.net/project/gnuplot/gnuplot/$(GNUPLOT_VERSION)
sourceforge URLs should use the automatic mirror selection:
http://downloads.sourceforge.net/project/gnuplot/gnuplot/
package/gnuplot/gnuplot.mk line 16
Quoted 8 lines
package/gnuplot/gnuplot.mk new file +8
-0+ +GNUPLOT_INSTALL_STAGING = YES + +GNUPLOT_LICENSE = gnuplot license (open source) +GNUPLOT_LICENSE_FILES = Copyright + +GNUPLOT_CONF_OPT = --without-x \ + --disable-raise-console \
Why is this option set?
package/gnuplot/gnuplot.mk line 19
Quoted 3 lines
package/gnuplot/gnuplot.mk new file +3
-0+ --disable-mouse \ + --without-tutorial \ + --without-demo --disable-demo \
These don't exist (yet)
package/gnuplot/gnuplot.mk line 20
Quoted 1 line
package/gnuplot/gnuplot.mk new file +1
-0+ --without-row-help \
Why is this option set?
package/gnuplot/gnuplot.patch
Quoted 13 lines
package/gnuplot/gnuplot.mk new file +8
-0+ --disable-history-file \ + --without-lisp-files \ + --disable-wxwidgets \ + --without-lua \ + --without-latex \ + --without-cairo + +$(eval $(autotools-package))package/gnuplot/gnuplot.patch new file +0
-0
Patch files should be named something like:
gnuplot-0001-disable-demo-and-tutorial.patch
but your second patch does that correctly already. I think you can safely merge that into a single commit.
Regards,
Arnout
Quoted 27 lines
package/gnuplot/gnuplot.patch new file +26
-0@@ -0,0 +1,26 @@ +diff --git a/Makefile.am b/Makefile.am +index bc0f2b2..5c00fe5 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -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 tutorial share + + EXTRA_DIST = BUGS CodeStyle Copyright FAQ.pdf GNUmakefile INSTALL INSTALL.gnu \ + Makefile.maint PATCHLEVEL PGPKEYS PORTING README README.1ST \ +diff --git a/Makefile.in b/Makefile.in +index 71118bc..86df133 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -250,7 +250,7 @@ top_build_prefix = @top_build_prefix@ + top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ + AUTOMAKE_OPTIONS = foreign 1.2h +-SUBDIRS = config m4 term src docs $(LISPDIR) man demo tutorial share ++SUBDIRS = config m4 term src $(LISPDIR) man tutorial share + EXTRA_DIST = BUGS CodeStyle Copyright FAQ.pdf GNUmakefile INSTALL INSTALL.gnu \ + Makefile.maint PATCHLEVEL PGPKEYS PORTING README README.1ST \ + VERSION configure.vms pm3d win
Signature · 6 lines
Arnout Vandecappelle arnout at mind be Senior Embedded Software Architect +32-16-286500 Essensium/Mind http://www.mind.be G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle GPG fingerprint: 7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F