added gnuplot support

git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunk@1570 33e552b5-05e3-0310-8538-816dae2090ed

4 files changed, 267 insertions, 2 deletions

diff --git a/config/Config.in b/config/Config.in
index e69fcfaa2..61d97bbdb 100644
--- a/config/Config.in
+++ b/config/Config.in
@@ -163,6 +163,14 @@ endmenu
 
 ############################################################################## 
 
+menu "Scientific Apps     "
+
+source "rules/gnuplot.in"
+
+endmenu
+
+############################################################################## 
+
 menu "Web Applications    "
 
 source "rules/mfirebird.in"
diff --git a/rules/gnuplot.in b/rules/gnuplot.in
new file mode 100644
index 000000000..be159e103
--- /dev/null
+++ b/rules/gnuplot.in
@@ -0,0 +1,43 @@
+menu "gnuplot          "
+
+config GNUPLOT
+	bool
+	prompt "Gnuplot"
+	select ZLIB
+
+config GNUPLOT_FITERRVARS
+	bool
+	prompt "Support for itting error variables"
+	depends on GNUPLOT
+
+config GNUPLOT_WITH_X
+	bool
+	prompt "X support"
+	depends on GNUPLOT
+
+config GNUPLOT_PLOT
+	bool
+	prompt "use Unix plot library"
+	depends on GNUPLOT
+
+config GNUPLOT_PNG
+	bool
+	prompt "PNG support"
+	depends on GNUPLOT
+
+config GNUPLOT_GD
+	bool
+	prompt "GD support"
+	depends on GNUPLOT
+
+config GNUPLOT_GIF
+	bool
+	prompt "GIF support"
+	depends on GNUPLOT
+
+config GNUPLOT_PDF
+	bool
+	prompt "PDF support"
+	depends on GNUPLOT
+
+endmenu
diff --git a/rules/gnuplot.make b/rules/gnuplot.make
new file mode 100644
index 000000000..9662dee5f
--- /dev/null
+++ b/rules/gnuplot.make
@@ -0,0 +1,211 @@
+# -*-makefile-*-
+# $Id: gnuplot.make,v 1.1 2004/08/18 19:18:33 rsc Exp $
+#
+# Copyright (C) 2004 by Robert Schwebel
+#          
+# See CREDITS for details about who has contributed to this project.
+#
+# For further information about the PTXdist project and license conditions
+# see the README file.
+#
+
+#
+# We provide this package
+#
+ifdef PTXCONF_GNUPLOT
+PACKAGES += gnuplot
+endif
+
+#
+# Paths and names
+#
+GNUPLOT_VERSION		= 4.0.0
+GNUPLOT			= gnuplot-$(GNUPLOT_VERSION)
+GNUPLOT_SUFFIX		= tar.gz
+GNUPLOT_URL		= ftp://ftp.gnuplot.info/pub/gnuplot/$(GNUPLOT).$(GNUPLOT_SUFFIX)
+GNUPLOT_SOURCE		= $(SRCDIR)/$(GNUPLOT).$(GNUPLOT_SUFFIX)
+GNUPLOT_DIR		= $(BUILDDIR)/$(GNUPLOT)
+
+# ----------------------------------------------------------------------------
+# Get
+# ----------------------------------------------------------------------------
+
+gnuplot_get: $(STATEDIR)/gnuplot.get
+
+gnuplot_get_deps = $(GNUPLOT_SOURCE)
+
+$(STATEDIR)/gnuplot.get: $(gnuplot_get_deps)
+	@$(call targetinfo, $@)
+	@$(call get_patches, $(GNUPLOT))
+	touch $@
+
+$(GNUPLOT_SOURCE):
+	@$(call targetinfo, $@)
+	@$(call get, $(GNUPLOT_URL))
+
+# ----------------------------------------------------------------------------
+# Extract
+# ----------------------------------------------------------------------------
+
+gnuplot_extract: $(STATEDIR)/gnuplot.extract
+
+gnuplot_extract_deps = $(STATEDIR)/gnuplot.get
+
+$(STATEDIR)/gnuplot.extract: $(gnuplot_extract_deps)
+	@$(call targetinfo, $@)
+	@$(call clean, $(GNUPLOT_DIR))
+	@$(call extract, $(GNUPLOT_SOURCE))
+	@$(call patchin, $(GNUPLOT))
+	touch $@
+
+# ----------------------------------------------------------------------------
+# Prepare
+# ----------------------------------------------------------------------------
+
+gnuplot_prepare: $(STATEDIR)/gnuplot.prepare
+
+#
+# dependencies
+#
+gnuplot_prepare_deps =  $(STATEDIR)/gnuplot.extract
+gnuplot_prepare_deps += $(STATEDIR)/virtual-xchain.install
+ifdef PTXCONF_GNUPLOT_PNG
+gnuplot_prepare_deps += $(STATEDIR)/libpng125.install
+endif
+
+GNUPLOT_PATH	=  PATH=$(CROSS_PATH)
+GNUPLOT_ENV 	=  $(CROSS_ENV)
+#GNUPLOT_ENV	+= PKG_CONFIG_PATH=$(CROSS_LIB_DIR)/lib/pkgconfig
+#GNUPLOT_ENV	+=
+
+#
+# autoconf
+#
+GNUPLOT_AUTOCONF = \
+	--build=$(GNU_HOST) \
+	--host=$(PTXCONF_GNU_TARGET) \
+	--prefix=$(CROSS_LIB_DIR)
+
+GNUPLOT_AUTOCONF += --disable-history-file
+GNUPLOT_AUTOCONF += --disable-mouse
+GNUPLOT_AUTOCONF += --disable-pm3d 
+GNUPLOT_AUTOCONF += --disable-filledboxes
+GNUPLOT_AUTOCONF += --disable-relative-boxwidth
+GNUPLOT_AUTOCONF += --disable-defined-var
+GNUPLOT_AUTOCONF += --disable-thin-splines
+GNUPLOT_AUTOCONF += --disable-iris
+GNUPLOT_AUTOCONF += --disable-mgr
+ifdef PTXCONF_GNUPLOT_FITERRVARS
+GNUPLOT_AUTOCONF += --enable-fiterrvars
+else
+GNUPLOT_AUTOCONF += --disable-fiterrvars
+endif
+GNUPLOT_AUTOCONF += --disable-rgip
+GNUPLOT_AUTOCONF += --disable-h3d-quadtree
+GNUPLOT_AUTOCONF += --disable-h3d-gridbox 
+ifdef PTXCONF_GNUPLOT_X
+GNUPLOT_AUTOCONF += --with-x
+else
+GNUPLOT_AUTOCONF += --without-x
+endif
+GNUPLOT_AUTOCONF += --without-lasergnu
+GNUPLOT_AUTOCONF += --without-gihdir
+GNUPLOT_AUTOCONF += --without-linux-vga
+GNUPLOT_AUTOCONF += --without-ggi
+GNUPLOT_AUTOCONF += --without-xmi
+GNUPLOT_AUTOCONF += --with-readline
+ifdef PTXCONF_GNUPLOT_PLOT
+GNUPLOT_AUTOCONF += --with-plot=FIXME
+else
+GNUPLOT_AUTOCONF += --without-plot
+endif
+ifdef PTXCONF_GNUPLOT_PNG
+GNUPLOT_AUTOCONF += --with-png=$(LIBPNG125_DIR)
+else
+GNUPLOT_AUTOCONF += --without-png
+endif
+ifdef GNUPLOT_GD
+GNUPLOT_AUTOCONF += --with-gd=FIXME
+else
+GNUPLOT_AUTOCONF += --without-gd
+endif
+ifdef PTXCONF_GNUPLOT_GIF
+GNUPLOT_AUTOCONF += --with-gif=FIXME
+else
+GNUPLOT_AUTOCONF += --without-gif
+endif
+ifdef PTXCONF_GNUPLOT_PDF
+GNUPLOT_AUTOCONF += --with-pdf=FIXME
+else
+GNUPLOT_AUTOCONF += --without-pdf
+endif
+GNUPLOT_AUTOCONF += --without-cwdrc 
+GNUPLOT_AUTOCONF += --without-lisp-files
+GNUPLOT_AUTOCONF += --without-row-help
+GNUPLOT_AUTOCONF += --without-tutorial
+
+GNUPLOT_ENV      += ac_cv_path_LIBPNG_CONFIG=$(LIBPNG125_DIR)/libpng-config
+
+$(STATEDIR)/gnuplot.prepare: $(gnuplot_prepare_deps)
+	@$(call targetinfo, $@)
+	@$(call clean, $(GNUPLOT_DIR)/config.cache)
+	cd $(GNUPLOT_DIR) && \
+		$(GNUPLOT_PATH) $(GNUPLOT_ENV) \
+		./configure $(GNUPLOT_AUTOCONF)
+	touch $@
+
+# ----------------------------------------------------------------------------
+# Compile
+# ----------------------------------------------------------------------------
+
+gnuplot_compile: $(STATEDIR)/gnuplot.compile
+
+gnuplot_compile_deps = $(STATEDIR)/gnuplot.prepare
+
+$(STATEDIR)/gnuplot.compile: $(gnuplot_compile_deps)
+	@$(call targetinfo, $@)
+
+	# This has to be built with host compiler!!
+	# FIXME: uggly workaround for now...
+	cd $(GNUPLOT_DIR)/src && make bf_test CC=$(HOSTCC) CFLAGS='-O2' LDFLAGS=''
+
+	cd $(GNUPLOT_DIR) && $(GNUPLOT_ENV) $(GNUPLOT_PATH) make
+	touch $@
+
+# ----------------------------------------------------------------------------
+# Install
+# ----------------------------------------------------------------------------
+
+gnuplot_install: $(STATEDIR)/gnuplot.install
+
+$(STATEDIR)/gnuplot.install: $(STATEDIR)/gnuplot.compile
+	@$(call targetinfo, $@)
+	cd $(GNUPLOT_DIR) && $(GNUPLOT_ENV) $(GNUPLOT_PATH) make install
+	touch $@
+
+# ----------------------------------------------------------------------------
+# Target-Install
+# ----------------------------------------------------------------------------
+
+gnuplot_targetinstall: $(STATEDIR)/gnuplot.targetinstall
+
+gnuplot_targetinstall_deps =  $(STATEDIR)/gnuplot.compile
+ifdef PTXCONF_GNUPLOT_PNG
+gnuplot_targetinstall_deps += $(STATEDIR)/libpng125.targetinstall
+endif
+
+$(STATEDIR)/gnuplot.targetinstall: $(gnuplot_targetinstall_deps)
+	@$(call targetinfo, $@)
+	cp -a $(GNUPLOT_DIR)/src/gnuplot $(ROOTDIR)/usr/bin/
+	$(CROSSSTRIP) -R .note -R .comment $(ROOTDIR)/bin/busybox
+	touch $@
+
+# ----------------------------------------------------------------------------
+# Clean
+# ----------------------------------------------------------------------------
+
+gnuplot_clean:
+	rm -rf $(STATEDIR)/gnuplot.*
+	rm -rf $(GNUPLOT_DIR)
+
+# vim: syntax=make
diff --git a/rules/libpng125.make b/rules/libpng125.make
index b587214f5..173705c60 100644
--- a/rules/libpng125.make
+++ b/rules/libpng125.make
@@ -1,5 +1,5 @@
 # -*-makefile-*-
-# $Id: libpng125.make,v 1.2 2003/10/23 15:01:19 mkl Exp $
+# $Id: libpng125.make,v 1.3 2004/08/18 19:18:33 rsc Exp $
 #
 # Copyright (C) 2003 by Robert Schwebel <r.schwebel@pengutronix.de>
 #                       Pengutronix <info@pengutronix.de>, Germany
@@ -72,6 +72,7 @@ libpng125_prepare_deps =  \
 
 LIBPNG125_PATH	=  PATH=$(CROSS_PATH)
 LIBPNG125_ENV 	=  $(CROSS_ENV)
+LIBPNG125_ENV   += prefix=$(PTXCONF_PREFIX)/$(PTXCONF_GNU_TARGET)
 
 ifdef PTXCONF_LIBPNG125_FOO
 LIBPNG125_AUTOCONF	+= --enable-foo
@@ -81,7 +82,9 @@ $(STATEDIR)/libpng125.prepare: $(libpng125_prepare_deps)
 	@$(call targetinfo, $@)
 	@$(call clean, $(LIBPNG125_BUILDDIR))
 	cp $(LIBPNG125_DIR)/scripts/makefile.linux $(LIBPNG125_DIR)/Makefile
+	# Fix some cross unfriendly mess
 	perl -i -p -e "s/CC=/CC?=/g" $(LIBPNG125_DIR)/Makefile
+	perl -i -p -e "s/^prefix=/prefix?=/g" $(LIBPNG125_DIR)/Makefile
 	touch $@
 
 # ----------------------------------------------------------------------------
@@ -95,7 +98,7 @@ libpng125_compile_deps += $(STATEDIR)/zlib.install
 
 $(STATEDIR)/libpng125.compile: $(libpng125_compile_deps)
 	@$(call targetinfo, $@)
-	$(LIBPNG125_PATH) $(LIBPNG125_ENV) make -C $(LIBPNG125_DIR)
+	cd $(LIBPNG125_DIR) && $(LIBPNG125_PATH) $(LIBPNG125_ENV) make
 	touch $@
 
 # ----------------------------------------------------------------------------