* [Buildroot] [PATCH 2/5] gnuplot : disable inadequate options for embedded platform
2013-01-07 13:30 [Buildroot] [PATCH 1/5] gnuplot : new package Anthony Viallard
@ 2013-01-07 13:30 ` Anthony Viallard
2013-01-07 13:30 ` [Buildroot] [PATCH 3/5] gnuplot : move under "Graphic applications" section Anthony Viallard
` (3 subsequent siblings)
4 siblings, 0 replies; 9+ messages in thread
From: Anthony Viallard @ 2013-01-07 13:30 UTC (permalink / raw)
To: buildroot
Disable options for embedded platform to save space and
make a good cross compilation.
Signed-off-by: Anthony Viallard <viallard@syscom-instruments.com>
---
package/gnuplot/gnuplot.mk | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/package/gnuplot/gnuplot.mk b/package/gnuplot/gnuplot.mk
index 2f05624..ea4a6f4 100644
--- a/package/gnuplot/gnuplot.mk
+++ b/package/gnuplot/gnuplot.mk
@@ -8,7 +8,17 @@ 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_INSTALL_TARGET = YES
-GNUPLOT_CONF_OPT =
+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))
--
1.7.10.4
^ permalink raw reply related [flat|nested] 9+ messages in thread* [Buildroot] [PATCH 3/5] gnuplot : move under "Graphic applications" section
2013-01-07 13:30 [Buildroot] [PATCH 1/5] gnuplot : new package Anthony Viallard
2013-01-07 13:30 ` [Buildroot] [PATCH 2/5] gnuplot : disable inadequate options for embedded platform Anthony Viallard
@ 2013-01-07 13:30 ` Anthony Viallard
2013-01-07 13:30 ` [Buildroot] [PATCH 4/5] gnuplot : add --without-doc and --without-demo options Anthony Viallard
` (2 subsequent siblings)
4 siblings, 0 replies; 9+ messages in thread
From: Anthony Viallard @ 2013-01-07 13:30 UTC (permalink / raw)
To: buildroot
Gnuplot isn't a "Development tools".
Signed-off-by: Anthony Viallard <viallard@syscom-instruments.com>
---
package/Config.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/package/Config.in b/package/Config.in
index eb18543..63d8ecb 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -70,7 +70,6 @@ endif
source "toolchain/gcc/Config.in.2"
source "package/gettext/Config.in"
source "package/gmp/Config.in"
-source "package/gnuplot/Config.in"
source "package/gperf/Config.in"
if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
source "package/grep/Config.in"
@@ -109,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"
--
1.7.10.4
^ permalink raw reply related [flat|nested] 9+ messages in thread* [Buildroot] [PATCH 4/5] gnuplot : add --without-doc and --without-demo options
2013-01-07 13:30 [Buildroot] [PATCH 1/5] gnuplot : new package Anthony Viallard
2013-01-07 13:30 ` [Buildroot] [PATCH 2/5] gnuplot : disable inadequate options for embedded platform Anthony Viallard
2013-01-07 13:30 ` [Buildroot] [PATCH 3/5] gnuplot : move under "Graphic applications" section Anthony Viallard
@ 2013-01-07 13:30 ` Anthony Viallard
2013-01-07 13:30 ` [Buildroot] [PATCH 4/4] gnuplot : add LICENSE things and new configure options Anthony Viallard
2013-01-07 13:48 ` [Buildroot] [PATCH 1/5] gnuplot : new package Thomas Petazzoni
4 siblings, 0 replies; 9+ messages in thread
From: Anthony Viallard @ 2013-01-07 13:30 UTC (permalink / raw)
To: buildroot
Create a generic patch to disable compilation/installation
of docs and demo with configure options.
Signed-off-by: Anthony Viallard <viallard@syscom-instruments.com>
---
...ot-0001-configure-add-without-demo-option.patch | 59 ++++++++++++++++++++
1 file changed, 59 insertions(+), 0 deletion(-)
create mode 100644 package/gnuplot/gnuplot-0001-configure-add-without-demo-option.patch
diff --git a/package/gnuplot/gnuplot-0001-configure-add-without-demo-option.patch b/package/gnuplot/gnuplot-0001-configure-add-without-demo-option.patch
new file mode 100644
index 0000000..acdc91d
--- /dev/null
+++ b/package/gnuplot/gnuplot-0001-configure-add-without-demo-option.patch
@@ -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 \
--
1.7.10.4
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [Buildroot] [PATCH 4/4] gnuplot : add LICENSE things and new configure options
2013-01-07 13:30 [Buildroot] [PATCH 1/5] gnuplot : new package Anthony Viallard
` (2 preceding siblings ...)
2013-01-07 13:30 ` [Buildroot] [PATCH 4/5] gnuplot : add --without-doc and --without-demo options Anthony Viallard
@ 2013-01-07 13:30 ` Anthony Viallard
2013-01-07 13:48 ` [Buildroot] [PATCH 1/5] gnuplot : new package Thomas Petazzoni
4 siblings, 0 replies; 9+ messages in thread
From: Anthony Viallard @ 2013-01-07 13:30 UTC (permalink / raw)
To: buildroot
Gnuplot isn't under GPL but has his own open source license.
Use autoreconf feature for now. Waiting upstream integration of
gnuplot-0001-configure-add-without-demo-option.patch.
Signed-off-by: Anthony Viallard <viallard@syscom-instruments.com>
---
package/gnuplot/gnuplot.mk | 8 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/package/gnuplot/gnuplot.mk b/package/gnuplot/gnuplot.mk
index 3b4abc2..2e1e8c4 100644
--- a/package/gnuplot/gnuplot.mk
+++ b/package/gnuplot/gnuplot.mk
@@ -7,12 +7,16 @@ 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_INSTALL_TARGET = YES
+GNUPLOT_LICENSE = gnuplot license (open source)
+GNUPLOT_LICENSE_FILES = Copyright
+GNUPLOT_AUTORECONF = YES
+
GNUPLOT_CONF_OPT = --without-x \
--disable-raise-console \
--disable-mouse \
--without-tutorial \
+ --without-demo \
+ --without-doc \
--without-row-help \
--disable-history-file \
--without-lisp-files \
--
1.7.10.4
^ permalink raw reply related [flat|nested] 9+ messages in thread* [Buildroot] [PATCH 1/5] gnuplot : new package
2013-01-07 13:30 [Buildroot] [PATCH 1/5] gnuplot : new package Anthony Viallard
` (3 preceding siblings ...)
2013-01-07 13:30 ` [Buildroot] [PATCH 4/4] gnuplot : add LICENSE things and new configure options Anthony Viallard
@ 2013-01-07 13:48 ` Thomas Petazzoni
2013-01-07 16:02 ` Viallard Anthony
4 siblings, 1 reply; 9+ messages in thread
From: Thomas Petazzoni @ 2013-01-07 13:48 UTC (permalink / raw)
To: buildroot
Dear Anthony Viallard,
On Mon, 7 Jan 2013 14:30:13 +0100, Anthony Viallard wrote:
> +GNUPLOT_INSTALL_TARGET = YES
This line is not needed.
Also, please make your 1/5, 2/5, 3/5 and the LICENSE part of 5/5 a
single patch.
And then, a second patch containing your 4/5 and and the part of 5/5
that disables the documentation and the demos.
There has already been some discussion with Stefan about how to split
patches, and it seems that it is still not clear. Each patch should be
a logical change that works on its own.
So for example, in the same series, putting a package in section "Foo",
and then moving it to section "Bar" is very strange. Since you can
rebase your patches, why don't you put the package in section "Bar" in
the first place, so that we can believe you did everything perfectly
from the very beginning? :-)
You don't need to show to the whole world the gazillions of steps you
followed to create a package. You need to show the whole world a nice,
clean set of commits, where each commit is a logical change, that keeps
the "buildability" of Buildroot.
Does that make sense?
Thomas
--
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com
^ permalink raw reply [flat|nested] 9+ messages in thread* [Buildroot] [PATCH 1/5] gnuplot : new package
2013-01-07 13:48 ` [Buildroot] [PATCH 1/5] gnuplot : new package Thomas Petazzoni
@ 2013-01-07 16:02 ` Viallard Anthony
2013-01-07 16:10 ` Thomas Petazzoni
0 siblings, 1 reply; 9+ messages in thread
From: Viallard Anthony @ 2013-01-07 16:02 UTC (permalink / raw)
To: buildroot
On 07. 01. 13 14:48, Thomas Petazzoni wrote:
> Dear Anthony Viallard,
>
> On Mon, 7 Jan 2013 14:30:13 +0100, Anthony Viallard wrote:
>
>> +GNUPLOT_INSTALL_TARGET = YES
> This line is not needed.
>
> Also, please make your 1/5, 2/5, 3/5 and the LICENSE part of 5/5 a
> single patch.
>
> And then, a second patch containing your 4/5 and and the part of 5/5
> that disables the documentation and the demos.
>
> There has already been some discussion with Stefan about how to split
> patches, and it seems that it is still not clear. Each patch should be
> a logical change that works on its own.
>
> So for example, in the same series, putting a package in section "Foo",
> and then moving it to section "Bar" is very strange. Since you can
> rebase your patches, why don't you put the package in section "Bar" in
> the first place, so that we can believe you did everything perfectly
> from the very beginning? :-)
>
> You don't need to show to the whole world the gazillions of steps you
> followed to create a package. You need to show the whole world a nice,
> clean set of commits, where each commit is a logical change, that keeps
> the "buildability" of Buildroot.
>
> Does that make sense?
>
> Thomas
Indeed,
Sorry, i knew my post is not very sexy. This is because my git
repository is very dirty and i don't known how clean my work.
I thoughwith lucky, my submit will be accepted :) Ok, i do the changes !
avd.
^ permalink raw reply [flat|nested] 9+ messages in thread
* [Buildroot] [PATCH 1/5] gnuplot : new package
2013-01-07 16:02 ` Viallard Anthony
@ 2013-01-07 16:10 ` Thomas Petazzoni
2013-01-08 8:57 ` Viallard Anthony
0 siblings, 1 reply; 9+ messages in thread
From: Thomas Petazzoni @ 2013-01-07 16:10 UTC (permalink / raw)
To: buildroot
Dear Viallard Anthony,
On Mon, 07 Jan 2013 17:02:52 +0100, Viallard Anthony wrote:
> Sorry, i knew my post is not very sexy. This is because my git
> repository is very dirty and i don't known how clean my work.
All you need to learn is how to use "interactive rebase".
See
http://elinux.org/Buildroot_how_to_contribute#In_case_of_mistakes_in_my_branch
for a very basic introduction.
For more details, see
http://git-scm.com/book/en/Git-Tools-Rewriting-History#Changing-Multiple-Commit-Messages.
Once you know how to use interactive rebase, you can prepare very nice
patch series.
Best regards,
Thomas
--
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com
^ permalink raw reply [flat|nested] 9+ messages in thread
* [Buildroot] [PATCH 1/5] gnuplot : new package
2013-01-07 16:10 ` Thomas Petazzoni
@ 2013-01-08 8:57 ` Viallard Anthony
0 siblings, 0 replies; 9+ messages in thread
From: Viallard Anthony @ 2013-01-08 8:57 UTC (permalink / raw)
To: buildroot
On 07. 01. 13 17:10, Thomas Petazzoni wrote:
> Dear Viallard Anthony,
>
> On Mon, 07 Jan 2013 17:02:52 +0100, Viallard Anthony wrote:
>
>> Sorry, i knew my post is not very sexy. This is because my git
>> repository is very dirty and i don't known how clean my work.
> All you need to learn is how to use "interactive rebase".
>
> See
> http://elinux.org/Buildroot_how_to_contribute#In_case_of_mistakes_in_my_branch
> for a very basic introduction.
>
> For more details, see
> http://git-scm.com/book/en/Git-Tools-Rewriting-History#Changing-Multiple-Commit-Messages.
>
> Once you know how to use interactive rebase, you can prepare very nice
> patch series.
>
> Best regards,
>
> Thomas
Dear Petazzoni Thomas,
Thanks for the links. I already knew this command but i didn't realize
it was so powerful !
I've commited better patches, it is good for you ?
Best regards,
avd.
^ permalink raw reply [flat|nested] 9+ messages in thread