Re: [ptxdist] [PATCH 2/2] gnuplot: fix broken build options for new gnuplot version

[Michael Olbrich <m.olbrich@pengutronix.de>]

On Mon, Oct 15, 2012 at 01:07:17PM +0200, Michael Olbrich wrote:
> On Mon, Oct 15, 2012 at 11:30:30AM +0200, Alexander Dahl wrote:
> > 
> > Signed-off-by: Alexander Dahl <post@lespocky.de>
> > ---
> >  rules/gnuplot.in   |   49 ++++++++++++++++++++++++++++---------------------
> >  rules/gnuplot.make |   21 ++-------------------
> >  2 files changed, 30 insertions(+), 40 deletions(-)
> > 
> > diff --git a/rules/gnuplot.in b/rules/gnuplot.in
> > index f25f2c1..c5bd109 100644
> > --- a/rules/gnuplot.in
> > +++ b/rules/gnuplot.in
> > @@ -6,8 +6,11 @@ menuconfig GNUPLOT
> >  	select GCCLIBS_CXX
> >  	select GCCLIBS_GCC_S
> >  	select ZLIB
> > -	select LIBPNG if GNUPLOT_PNG
> >  	select XORG_LIB_XT if GNUPLOT_X
> > +	select LIBGD if GNUPLOT_GD
> > +	select LIBGD_PNG if GNUPLOT_GD_PNG
> > +	select LIBGD_JPEG if GNUPLOT_GD_JPEG
> > +	select LIBGD_FREETYPE if GNUPLOT_GD_TTF
> >  	help
> >  	  A command-line driven interactive plotting program for
> >  	  making 2D and 3D graphs from data and functions.
> > @@ -49,30 +52,34 @@ config GNUPLOT_X
> >  	help
> >  	  Enable the graphical X11 user interface of GNUplot
> >  
> > -config GNUPLOT_PLOT
> > +menuconfig GNUPLOT_GD
> >  	bool
> > -	prompt "use Unix plot library"
> > -	depends on BROKEN
> > +	prompt "GD support                    "
> >  	help
> > -	  If you link this program with the Unix plot library
> > -	  (rather outdated) it will be able to generate Unix
> > -	  plot output.
> > +	  Use the GD library. GD is an open source code library for the
> > +	  dynamic creation of images. You get support for png and jpeg if
> > +	  you select this. Note: setting options in the submenu leads to
> > +	  compiling libgd with the very features.
> >  
> > -config GNUPLOT_PNG
> > -	bool
> > -	prompt "PNG support"
> > -	help
> > -	  Include support for PNG (Portable Network Graphics)
> > -	  graphics format
> > +if GNUPLOT_GD
> > +	config GNUPLOT_GD_PNG
> > +		bool
> > +		prompt "PNG support"
> > +		help
> > +		  Add dependency to compile libgd with PNG support.
> >  
> > -config GNUPLOT_GD
> > -	bool
> > -	prompt "GD support"
> > -	depends on BROKEN
> > -	help
> > -	  Use the GD library.
> > -	  GD is an open source code library for the dynamic
> > -	  creation of images.
> > +	config GNUPLOT_GD_JPEG
> > +		bool
> > +		prompt "JPEG support"
> > +		help
> > +		  Add dependency to compile libgd with PNG support.
> > +
> > +	config GNUPLOT_GD_TTF
> > +		bool
> > +		prompt "TTF support"
> > +		help
> > +		  Add dependency to compile libgd with TTF support.
> > +endif
> >  
> >  config GNUPLOT_PDF
> >  	bool
> > diff --git a/rules/gnuplot.make b/rules/gnuplot.make
> > index 2159933..699c35a 100644
> > --- a/rules/gnuplot.make
> > +++ b/rules/gnuplot.make
> > @@ -31,29 +31,14 @@ GNUPLOT_DIR	:= $(BUILDDIR)/$(GNUPLOT)
> >  
> >  GNUPLOT_PATH	:= PATH=$(CROSS_PATH)
> 
> You need to make sure png/jpg/ttf support is not automatically enabled:
> 
> GNUPLOT_ENV	:= \
> 	$(CROSS_ENV) \
> 	ac_cv_lib_gd_gdImagePng=$(call ptx/ifdef, PTXCONF_GNUPLOT_GD_PNG)

This should be:

	ac_cv_lib_gd_gdImagePng=$(call ptx/ifdef, PTXCONF_GNUPLOT_GD_PNG,yes,no)


Michael

> > -
> > -#
> > -# autoconf
> > -#
> > -# 4.2.4: --disable-datastrings is broken
> > -#        --disable-binary-data-file is broken
> > -#
> > -GNUPLOT_AUTOCONF = \
> > +GNUPLOT_CONF_TOOL	:= autoconf
> > +GNUPLOT_CONF_OPT = \
> >  	$(CROSS_AUTOCONF_USR) \
> >  	--disable-history-file \
> >  	--disable-x11-mbfonts \
> > -	--enable-binary-data-file \
> > -	--disable-with-image \
> > -	--disable-binary-x11-polygon \
> >  	--disable-thin-splines \
> > -	--enable-datastrings \
> > -	--disable-histograms \
> >  	--disable-objects \
> > -	--disable-stringvariables \
> >  	--disable-macros \
> > -	--disable-iris \
> > -	--disable-mgr \
> > -	--disable-rgip \
> >  	--disable-h3d-quadtree \
> >  	--disable-h3d-gridbox \
> >  	--disable-wxwidgets \
> > @@ -71,8 +56,6 @@ GNUPLOT_AUTOCONF = \
> >  	--without-lua \
> >  	--$(call ptx/endis, PTXCONF_GNUPLOT_X)-mouse \
> >  	--$(call ptx/wwo, PTXCONF_GNUPLOT_X)-x \
> > -	--$(call ptx/wwo, PTXCONF_GNUPLOT_PLOT)-plot \
> > -	--$(call ptx/wwo, PTXCONF_GNUPLOT_PNG)-png \
> >  	--$(call ptx/wwo, PTXCONF_GNUPLOT_GD)-gd \
> >  	--$(call ptx/wwo, PTXCONF_GNUPLOT_PDF)-pdf
> >  
> > -- 
> > 1.7.2.5
> > 
> > 
> > -- 
> > ptxdist mailing list
> > ptxdist@pengutronix.de
> > 
> 
> -- 
> Pengutronix e.K.                           |                             |
> Industrial Linux Solutions                 | http://www.pengutronix.de/  |
> Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
> Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |
> 
> -- 
> ptxdist mailing list
> ptxdist@pengutronix.de
> 

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

-- 
ptxdist mailing list
ptxdist@pengutronix.de