Geht auf !x86 nicht: ./doc2gih ./gnuplot.doc gnuplot.gih ./doc2gih: 1: Syntax error: word unexpected (expecting ")")
doc2gih wird fuers target compiliert. GNUPLOT_MAKE_OPT := -C src/ GNUPLOT_INSTALL_OPT := $(GNUPLOT_MAKE_OPT) install anstelle der momentanen compile stage sollte helfen. Michael On Tue, Jun 21, 2011 at 07:29:37AM +0200, Bernhard Walle wrote: > The patch gnuplot-4.2.2-cc-for-build.diff has been integrated upstream > and is superfluous. > > Signed-off-by: Bernhard Walle <[email protected]> > --- > patches/gnuplot-4.2.6/autogen.sh | 1 - > .../gnuplot-4.2.6/gnuplot-4.2.2-cc-for-build.diff | 89 > -------------------- > patches/gnuplot-4.2.6/series | 1 - > rules/gnuplot.make | 11 +-- > 4 files changed, 5 insertions(+), 97 deletions(-) > delete mode 120000 patches/gnuplot-4.2.6/autogen.sh > delete mode 100644 patches/gnuplot-4.2.6/gnuplot-4.2.2-cc-for-build.diff > delete mode 100644 patches/gnuplot-4.2.6/series > > diff --git a/patches/gnuplot-4.2.6/autogen.sh > b/patches/gnuplot-4.2.6/autogen.sh > deleted file mode 120000 > index 9f8a4cb..0000000 > --- a/patches/gnuplot-4.2.6/autogen.sh > +++ /dev/null > @@ -1 +0,0 @@ > -../autogen.sh > \ No newline at end of file > diff --git a/patches/gnuplot-4.2.6/gnuplot-4.2.2-cc-for-build.diff > b/patches/gnuplot-4.2.6/gnuplot-4.2.2-cc-for-build.diff > deleted file mode 100644 > index e0f63b9..0000000 > --- a/patches/gnuplot-4.2.6/gnuplot-4.2.2-cc-for-build.diff > +++ /dev/null > @@ -1,89 +0,0 @@ > -Subject: gnuplot: build documentation generator tools with CC_FOR_BUILD > -From: Robert Schwebel <[email protected]> > - > -When cross compiling gnuplot, it tries to build the documentation > -generation tools in docs/ with the cross compiler, not with > -CC_FOR_BUILD. > - > -Signed-off-by: Robert Schwebel <[email protected]> > - > ---- > -# 20091222 rsc: > https://sourceforge.net/tracker/?func=detail&aid=2918992&group_id=2055&atid=302055 > - > - configure.in | 40 ++++++++++++++++++++++++++++++++++++++++ > - docs/Makefile.in | 2 +- > - 2 files changed, 41 insertions(+), 1 deletion(-) > - > -Index: gnuplot-4.2.4/docs/Makefile.in > -=================================================================== > ---- gnuplot-4.2.4.orig/docs/Makefile.in 2009-01-06 18:46:41.000000000 > +0100 > -+++ gnuplot-4.2.4/docs/Makefile.in 2009-01-06 18:46:46.000000000 +0100 > -@@ -70,7 +70,7 @@ > - > - INFO_DEPS = $(srcdir)/gnuplot.info > - > --CC = @CC@ > -+CC = @CC_FOR_BUILD@ > - CPP = @CPP@ > - DEFS = @DEFS@ > - DEFAULT_INCLUDES = -I. -I$(srcdir) -I.. -I$(top_builddir) > -Index: gnuplot-4.2.4/configure.in > -=================================================================== > ---- gnuplot-4.2.4.orig/configure.in 2009-01-06 18:46:41.000000000 +0100 > -+++ gnuplot-4.2.4/configure.in 2009-01-06 18:46:56.000000000 +0100 > -@@ -12,6 +12,8 @@ > - AM_CONFIG_HEADER(config.h:config.hin) > - AM_INIT_AUTOMAKE(1.7.9) > - > -+AM_MAINTAINER_MODE > -+ > - VERSION_MAJOR="`cat $srcdir/VERSION`" > - PATCHLEVEL="`cat $srcdir/PATCHLEVEL`" > - > -@@ -27,6 +29,46 @@ > - AC_C_INLINE > - AC_C_STRINGIZE > - > -+ > -+if test "${build}" != "${host}" > -+then > -+ CC=${CC-${host_alias}-gcc} > -+ CFLAGS=${CFLAGS-"-g -O2"} > -+ CXX=${CXX-${host_alias}-c++} > -+ CXXFLAGS=${CXXFLAGS-"-g -O2"} > -+ CC_FOR_BUILD=${CC_FOR_BUILD-gcc} > -+else > -+ CC_FOR_BUILD="\$(CC)" > -+ AC_PROG_CC > -+ > -+ # We must set the default linker to the linker used by gcc for the correct > -+ # operation of libtool. If LD is not defined and we are using gcc, try to > -+ # set the LD default to the ld used by gcc. > -+ if test -z "$LD" > -+ then > -+ if test "$GCC" = yes > -+ then > -+ case $build in > -+ *-*-mingw*) > -+ gcc_prog_ld=`$CC -print-prog-name=ld 2>&1 | tr -d '\015'` ;; > -+ *) > -+ gcc_prog_ld=`$CC -print-prog-name=ld 2>&1` ;; > -+ esac > -+ case $gcc_prog_ld in > -+ # Accept absolute paths. > -+ [[\\/]* | [A-Za-z]:[\\/]*)] > -+ LD="$gcc_prog_ld" ;; > -+ esac > -+ fi > -+ fi > -+ > -+ CXX=${CXX-"c++"} > -+ CFLAGS=${CFLAGS-"-g -O2"} > -+ CXXFLAGS=${CXXFLAGS-"-g -O2"} > -+fi > -+AC_SUBST(CC_FOR_BUILD) > -+ > -+ > - dnl Various programs > - dnl X/Emacs for building lisp packages and creating .texi version of docs > - # If set to t, that means we are running in a shell under Emacs. > diff --git a/patches/gnuplot-4.2.6/series b/patches/gnuplot-4.2.6/series > deleted file mode 100644 > index 12cf91b..0000000 > --- a/patches/gnuplot-4.2.6/series > +++ /dev/null > @@ -1 +0,0 @@ > -gnuplot-4.2.2-cc-for-build.diff > diff --git a/rules/gnuplot.make b/rules/gnuplot.make > index 4de83b0..0a2ed36 100644 > --- a/rules/gnuplot.make > +++ b/rules/gnuplot.make > @@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_GNUPLOT) += gnuplot > # > # Paths and names > # > -GNUPLOT_VERSION := 4.2.6 > -GNUPLOT_MD5 := c10468d74030e8bed0fd6865a45cf1fd > +GNUPLOT_VERSION := 4.4.3 > +GNUPLOT_MD5 := 639603752996f4923bc02c895fa03b45 > GNUPLOT := gnuplot-$(GNUPLOT_VERSION) > GNUPLOT_SUFFIX := tar.gz > GNUPLOT_URL := > $(PTXCONF_SETUP_SFMIRROR)/gnuplot/$(GNUPLOT).$(GNUPLOT_SUFFIX) > @@ -49,7 +49,6 @@ GNUPLOT_ENV := $(CROSS_ENV) > GNUPLOT_AUTOCONF = \ > $(CROSS_AUTOCONF_USR) \ > --disable-history-file \ > - --disable-mouse \ > --disable-x11-mbfonts \ > --enable-binary-data-file \ > --disable-with-image \ > @@ -85,9 +84,9 @@ GNUPLOT_AUTOCONF += --disable-fiterrvars > endif > > ifdef PTXCONF_GNUPLOT_X > -GNUPLOT_AUTOCONF += --with-x > +GNUPLOT_AUTOCONF += --with-x --enable-mouse > else > -GNUPLOT_AUTOCONF += --without-x > +GNUPLOT_AUTOCONF += --without-x --disable-mouse > endif > > ifdef PTXCONF_GNUPLOT_PLOT > @@ -139,7 +138,7 @@ $(STATEDIR)/gnuplot.targetinstall: > @$(call install_copy, gnuplot, 0, 0, 0755, -, /usr/bin/gnuplot) > > ifdef PTXCONF_GNUPLOT_X > - @$(call install_copy, gnuplot, 0, 0, 0755, -, > /usr/libexec/gnuplot/4.2/gnuplot_x11) > + @$(call install_copy, gnuplot, 0, 0, 0755, -, > /usr/libexec/gnuplot/4.4/gnuplot_x11) > endif > > @$(call install_finish, gnuplot) > -- > 1.7.5.4 > > > -- > ptxdist mailing list > [email protected] > -- 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 [email protected]
