From: Michael Olbrich <m.olbrich@pengutronix.de>
To: ptxdist@pengutronix.de
Subject: Re: [ptxdist] [PATCH] gnuplot: bump to 4.6.2
Date: Sat, 23 Mar 2013 20:29:19 +0100 [thread overview]
Message-ID: <20130323192919.GG1289@pengutronix.de> (raw)
In-Reply-To: <1364061496-21661-1-git-send-email-bernhard@bwalle.de>
On Sat, Mar 23, 2013 at 06:58:16PM +0100, Bernhard Walle wrote:
> And also fix a build error with new texinfo (makeinfo) installed on the
> host by disabling building the info page which is not needed.
Try to build with all sub-options enabled. :-)
targetinstall contains the old version in some of the paths.
> Signed-off-by: Bernhard Walle <bernhard@bwalle.de>
> ---
> Now with -M :-)
:-)
Michael
> ...ld-documentation-generator-tools-with-CC_.patch | 99 ----------------------
> patches/gnuplot-4.4.3/autogen.sh | 1 -
> patches/gnuplot-4.4.3/series | 5 --
> ...FLAGS-when-building-the-documentation-ge.patch} | 8 +-
> .../0002-Don-t-build-and-install-info-pages.patch | 31 +++++++
> patches/gnuplot-4.6.2/series | 5 ++
> rules/gnuplot.make | 10 ++-
> 7 files changed, 47 insertions(+), 112 deletions(-)
> delete mode 100644 patches/gnuplot-4.4.3/0001-gnuplot-build-documentation-generator-tools-with-CC_.patch
> delete mode 120000 patches/gnuplot-4.4.3/autogen.sh
> delete mode 100644 patches/gnuplot-4.4.3/series
> rename patches/{gnuplot-4.4.3/0002-Don-t-use-LDFLAGS-when-building-the-documentation-ge.patch => gnuplot-4.6.2/0001-Don-t-use-LDFLAGS-when-building-the-documentation-ge.patch} (86%)
> create mode 100644 patches/gnuplot-4.6.2/0002-Don-t-build-and-install-info-pages.patch
> create mode 100644 patches/gnuplot-4.6.2/series
>
> diff --git a/patches/gnuplot-4.4.3/0001-gnuplot-build-documentation-generator-tools-with-CC_.patch b/patches/gnuplot-4.4.3/0001-gnuplot-build-documentation-generator-tools-with-CC_.patch
> deleted file mode 100644
> index cbc130b..0000000
> --- a/patches/gnuplot-4.4.3/0001-gnuplot-build-documentation-generator-tools-with-CC_.patch
> +++ /dev/null
> @@ -1,99 +0,0 @@
> -From: Robert Schwebel <r.schwebel@pengutronix.de>
> -Date: Wed, 12 Oct 2011 15:29:54 +0200
> -Subject: [PATCH] gnuplot: build documentation generator tools with
> - CC_FOR_BUILD
> -
> -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 <r.schwebel@pengutronix.de>
> ----
> -# 20091222 rsc: https://sourceforge.net/tracker/?func=detail&aid=2918992&group_id=2055&atid=302055
> -
> - configure.in | 42 ++++++++++++++++++++++++++++++++++++++++++
> - docs/Makefile.in | 4 ++--
> - 2 files changed, 44 insertions(+), 2 deletions(-)
> -
> -diff --git a/configure.in b/configure.in
> -index 655217b..c6278d2 100755
> ---- a/configure.in
> -+++ b/configure.in
> -@@ -10,6 +10,8 @@ AC_PREREQ(2.58)
> - 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`"
> -
> -@@ -26,6 +28,46 @@ AC_C_INLINE
> - AC_C_STRINGIZE
> - AC_PROG_LN_S
> -
> -+
> -+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/docs/Makefile.in b/docs/Makefile.in
> -index 51ebe6b..591d818 100644
> ---- a/docs/Makefile.in
> -+++ b/docs/Makefile.in
> -@@ -70,7 +70,7 @@ POST_UNINSTALL = :
> -
> - INFO_DEPS = $(srcdir)/gnuplot.info
> -
> --CC = @CC@
> -+CC = @CC_FOR_BUILD@
> - CPP = @CPP@
> - DEFS = @DEFS@
> - DEFAULT_INCLUDES = -I. -I$(srcdir) -I.. -I$(top_builddir)
> -@@ -79,7 +79,7 @@ CFLAGS = @CFLAGS@
> - GIHDIR = @GIHDIR@
> - INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/term
> - LDFLAGS = @LDFLAGS@
> --LIBS = @LIBS@
> -+LIBS =
> -
> - COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
> - CCLD = $(CC)
> diff --git a/patches/gnuplot-4.4.3/autogen.sh b/patches/gnuplot-4.4.3/autogen.sh
> deleted file mode 120000
> index 9f8a4cb..0000000
> --- a/patches/gnuplot-4.4.3/autogen.sh
> +++ /dev/null
> @@ -1 +0,0 @@
> -../autogen.sh
> \ No newline at end of file
> diff --git a/patches/gnuplot-4.4.3/series b/patches/gnuplot-4.4.3/series
> deleted file mode 100644
> index 585745c..0000000
> --- a/patches/gnuplot-4.4.3/series
> +++ /dev/null
> @@ -1,5 +0,0 @@
> -# generated by git-ptx-patches
> -#tag:base --start-number 1
> -0001-gnuplot-build-documentation-generator-tools-with-CC_.patch
> -0002-Don-t-use-LDFLAGS-when-building-the-documentation-ge.patch
> -# ffd95c4575ca3e3194e093f925705906 - git-ptx-patches magic
> diff --git a/patches/gnuplot-4.4.3/0002-Don-t-use-LDFLAGS-when-building-the-documentation-ge.patch b/patches/gnuplot-4.6.2/0001-Don-t-use-LDFLAGS-when-building-the-documentation-ge.patch
> similarity index 86%
> rename from patches/gnuplot-4.4.3/0002-Don-t-use-LDFLAGS-when-building-the-documentation-ge.patch
> rename to patches/gnuplot-4.6.2/0001-Don-t-use-LDFLAGS-when-building-the-documentation-ge.patch
> index 968eaf8..c3ba691 100644
> --- a/patches/gnuplot-4.4.3/0002-Don-t-use-LDFLAGS-when-building-the-documentation-ge.patch
> +++ b/patches/gnuplot-4.6.2/0001-Don-t-use-LDFLAGS-when-building-the-documentation-ge.patch
> @@ -12,14 +12,14 @@ don't also need special LDFLAGS. Omit them.
>
> Signed-off-by: Bernhard Walle <bernhard@bwalle.de>
> ---
> - docs/Makefile.in | 2 +-
> - 1 files changed, 1 insertions(+), 1 deletions(-)
> + docs/Makefile.in | 2 +-
> + 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/docs/Makefile.in b/docs/Makefile.in
> -index 591d818..0e2ef8f 100644
> +index 0560553..628c006 100644
> --- a/docs/Makefile.in
> +++ b/docs/Makefile.in
> -@@ -83,7 +83,7 @@ LIBS =
> +@@ -85,7 +85,7 @@ LIBS = @LIBS@
>
> COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
> CCLD = $(CC)
> diff --git a/patches/gnuplot-4.6.2/0002-Don-t-build-and-install-info-pages.patch b/patches/gnuplot-4.6.2/0002-Don-t-build-and-install-info-pages.patch
> new file mode 100644
> index 0000000..3291116
> --- /dev/null
> +++ b/patches/gnuplot-4.6.2/0002-Don-t-build-and-install-info-pages.patch
> @@ -0,0 +1,31 @@
> +From: Bernhard Walle <bernhard@bwalle.de>
> +Date: Sat, 23 Mar 2013 18:50:38 +0100
> +Subject: [PATCH] Don't build and install info pages
> +
> +With GNU texinfo 5.1 I get following error:
> +
> + ./gnuplot.texi:9205: warning: @ref should not appear in @uref
> + ./gnuplot.texi:17653: raising the section level of @subsubsection which is too low
> +
> +Since the texinfo file is generated by some Emacs Lisp script (and my
> +keyboard doesn't have enough brackets to program Lisp) and since the
> +texinfo file is not needed on the target, just disable its build.
> +
> +Signed-off-by: Bernhard Walle <bernhard@bwalle.de>
> +---
> + docs/Makefile.in | 2 +-
> + 1 file changed, 1 insertion(+), 1 deletion(-)
> +
> +diff --git a/docs/Makefile.in b/docs/Makefile.in
> +index 628c006..dc731d6 100644
> +--- a/docs/Makefile.in
> ++++ b/docs/Makefile.in
> +@@ -449,7 +449,7 @@ checkdoc.o: checkdoc.c $(BUILT_SOURCES)
> + $(COMPILE) -DALL_TERM_DOC -c $(srcdir)/checkdoc.c
> +
> + # install section
> +-install: install-gih install-info install-pdf
> ++install: install-gih
> +
> + install-gih: gnuplot.gih
> + $(top_srcdir)/mkinstalldirs $(DESTDIR)$(GIHDIR)
> diff --git a/patches/gnuplot-4.6.2/series b/patches/gnuplot-4.6.2/series
> new file mode 100644
> index 0000000..cd19e38
> --- /dev/null
> +++ b/patches/gnuplot-4.6.2/series
> @@ -0,0 +1,5 @@
> +# generated by git-ptx-patches
> +#tag:base --start-number 1
> +0001-Don-t-use-LDFLAGS-when-building-the-documentation-ge.patch
> +0002-Don-t-build-and-install-info-pages.patch
> +# 1692ae53011b545d0969e00025d9b2b4 - git-ptx-patches magic
> diff --git a/rules/gnuplot.make b/rules/gnuplot.make
> index 0142e7c..9cc95fa 100644
> --- a/rules/gnuplot.make
> +++ b/rules/gnuplot.make
> @@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_GNUPLOT) += gnuplot
> #
> # Paths and names
> #
> -GNUPLOT_VERSION := 4.4.3
> -GNUPLOT_MD5 := 639603752996f4923bc02c895fa03b45
> +GNUPLOT_VERSION := 4.6.2
> +GNUPLOT_MD5 := 060e0a77cabb6d6055c5917b0f0b5769
> GNUPLOT := gnuplot-$(GNUPLOT_VERSION)
> GNUPLOT_SUFFIX := tar.gz
> GNUPLOT_URL := $(call ptx/mirror, SF, gnuplot/$(GNUPLOT).$(GNUPLOT_SUFFIX))
> @@ -58,6 +58,7 @@ GNUPLOT_AUTOCONF = \
> --disable-h3d-gridbox \
> --disable-wxwidgets \
> --without-kpsexpand \
> + --without-latex \
> --without-lasergnu \
> --without-linux-vga \
> --without-ggi \
> @@ -74,7 +75,10 @@ GNUPLOT_AUTOCONF = \
> --$(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
> + --without-plot \
> + --$(call ptx/wwo, PTXCONF_GNUPLOT_PDF)-pdf \
> + --without-tutorial \
> + --without-cairo
>
> # ----------------------------------------------------------------------------
> # Compile
> --
> 1.8.2
>
>
> --
> 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
next prev parent reply other threads:[~2013-03-23 19:29 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-03-23 17:58 Bernhard Walle
2013-03-23 19:29 ` Michael Olbrich [this message]
2013-03-23 21:21 ` Bernhard Walle
2013-03-23 21:23 ` Bernhard Walle
2013-03-24 9:54 ` Michael Olbrich
2013-03-23 20:24 ` Alexander Dahl
2013-03-23 21:24 ` Bernhard Walle
2013-03-24 18:08 ` Alexander Dahl
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20130323192919.GG1289@pengutronix.de \
--to=m.olbrich@pengutronix.de \
--cc=ptxdist@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox