* [ptxdist] gnuplot: update and fix broken stuff @ 2012-10-12 15:09 Alexander Dahl 2012-10-12 15:09 ` [ptxdist] [PATCH 1/2] gnuplot: upgrade to 4.6.1 removing one patch integrated upstream Alexander Dahl 2012-10-12 15:09 ` [ptxdist] [PATCH 2/2] gnuplot: fix broken build options for new gnuplot version Alexander Dahl 0 siblings, 2 replies; 8+ messages in thread From: Alexander Dahl @ 2012-10-12 15:09 UTC (permalink / raw) To: ptxdist Hei hei, I prepared two patches for gnuplot. First is just a version bump recreating the patches because one was integrated upstream meanwhile. The other one fixes the broken menu entries, removes build options not present anymore and introduces a submenu for configuring options of libgd which is used for creating png and jpeg output. HTH & greets Alex -- ptxdist mailing list ptxdist@pengutronix.de ^ permalink raw reply [flat|nested] 8+ messages in thread
* [ptxdist] [PATCH 1/2] gnuplot: upgrade to 4.6.1 removing one patch integrated upstream 2012-10-12 15:09 [ptxdist] gnuplot: update and fix broken stuff Alexander Dahl @ 2012-10-12 15:09 ` Alexander Dahl 2012-10-14 10:45 ` Michael Olbrich 2012-10-12 15:09 ` [ptxdist] [PATCH 2/2] gnuplot: fix broken build options for new gnuplot version Alexander Dahl 1 sibling, 1 reply; 8+ messages in thread From: Alexander Dahl @ 2012-10-12 15:09 UTC (permalink / raw) To: ptxdist Signed-off-by: Alexander Dahl <post@lespocky.de> --- ...ld-documentation-generator-tools-with-CC_.patch | 99 -------------------- ...DFLAGS-when-building-the-documentation-ge.patch | 30 ------ patches/gnuplot-4.4.3/autogen.sh | 1 - patches/gnuplot-4.4.3/series | 5 - ...DFLAGS-when-building-the-documentation-ge.patch | 30 ++++++ patches/gnuplot-4.6.1/autogen.sh | 1 + patches/gnuplot-4.6.1/series | 4 + rules/gnuplot.make | 12 +- 8 files changed, 41 insertions(+), 141 deletions(-) delete mode 100644 patches/gnuplot-4.4.3/0001-gnuplot-build-documentation-generator-tools-with-CC_.patch delete mode 100644 patches/gnuplot-4.4.3/0002-Don-t-use-LDFLAGS-when-building-the-documentation-ge.patch delete mode 120000 patches/gnuplot-4.4.3/autogen.sh delete mode 100644 patches/gnuplot-4.4.3/series create mode 100644 patches/gnuplot-4.6.1/0001-Don-t-use-LDFLAGS-when-building-the-documentation-ge.patch create mode 120000 patches/gnuplot-4.6.1/autogen.sh create mode 100644 patches/gnuplot-4.6.1/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/0002-Don-t-use-LDFLAGS-when-building-the-documentation-ge.patch b/patches/gnuplot-4.4.3/0002-Don-t-use-LDFLAGS-when-building-the-documentation-ge.patch deleted file mode 100644 index 968eaf8..0000000 --- a/patches/gnuplot-4.4.3/0002-Don-t-use-LDFLAGS-when-building-the-documentation-ge.patch +++ /dev/null @@ -1,30 +0,0 @@ -From: Bernhard Walle <bernhard@bwalle.de> -Date: Sun, 22 Jan 2012 00:03:59 +0100 -Subject: [PATCH] Don't use LDFLAGS when building the documentation generator - -The documentation generator is a tool running on the build machine. -Therefore the LDFLAGS computed for the cross compiler may not work, such -as the "-Wl,-rpath-link" flag which is not understood by the Darwin -linker. - -The doc2gih is simple and doesn't require an external library. So we -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(-) - -diff --git a/docs/Makefile.in b/docs/Makefile.in -index 591d818..0e2ef8f 100644 ---- a/docs/Makefile.in -+++ b/docs/Makefile.in -@@ -83,7 +83,7 @@ LIBS = - - COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) - CCLD = $(CC) --LINK = $(CCLD) $(CFLAGS) $(LDFLAGS) -o $@ -+LINK = $(CCLD) $(CFLAGS) -o $@ - - .c.o: - $(COMPILE) -c $< 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.6.1/0001-Don-t-use-LDFLAGS-when-building-the-documentation-ge.patch b/patches/gnuplot-4.6.1/0001-Don-t-use-LDFLAGS-when-building-the-documentation-ge.patch new file mode 100644 index 0000000..dedd05e --- /dev/null +++ b/patches/gnuplot-4.6.1/0001-Don-t-use-LDFLAGS-when-building-the-documentation-ge.patch @@ -0,0 +1,30 @@ +From: Bernhard Walle <bernhard@bwalle.de> +Date: Sun, 22 Jan 2012 00:03:59 +0100 +Subject: [PATCH] Don't use LDFLAGS when building the documentation generator + +The documentation generator is a tool running on the build machine. +Therefore the LDFLAGS computed for the cross compiler may not work, such +as the "-Wl,-rpath-link" flag which is not understood by the Darwin +linker. + +The doc2gih is simple and doesn't require an external library. So we +don't also need special LDFLAGS. Omit them. + +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 0560553..628c006 100644 +--- a/docs/Makefile.in ++++ b/docs/Makefile.in +@@ -85,7 +85,7 @@ LIBS = @LIBS@ + + COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) + CCLD = $(CC) +-LINK = $(CCLD) $(CFLAGS) $(LDFLAGS) -o $@ ++LINK = $(CCLD) $(CFLAGS) -o $@ + + .c.o: + $(COMPILE) -c $< diff --git a/patches/gnuplot-4.6.1/autogen.sh b/patches/gnuplot-4.6.1/autogen.sh new file mode 120000 index 0000000..9f8a4cb --- /dev/null +++ b/patches/gnuplot-4.6.1/autogen.sh @@ -0,0 +1 @@ +../autogen.sh \ No newline at end of file diff --git a/patches/gnuplot-4.6.1/series b/patches/gnuplot-4.6.1/series new file mode 100644 index 0000000..fb98f2d --- /dev/null +++ b/patches/gnuplot-4.6.1/series @@ -0,0 +1,4 @@ +# generated by git-ptx-patches +#tag:base --start-number 1 +0001-Don-t-use-LDFLAGS-when-building-the-documentation-ge.patch +# e1be0237a784ae87b7f45927269e59ad - git-ptx-patches magic diff --git a/rules/gnuplot.make b/rules/gnuplot.make index 0142e7c..2159933 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.1 +GNUPLOT_MD5 := 4c9a06461f402482c30cf94e267eb877 GNUPLOT := gnuplot-$(GNUPLOT_VERSION) GNUPLOT_SUFFIX := tar.gz GNUPLOT_URL := $(call ptx/mirror, SF, gnuplot/$(GNUPLOT).$(GNUPLOT_SUFFIX)) @@ -101,19 +101,19 @@ $(STATEDIR)/gnuplot.targetinstall: @$(call install_copy, gnuplot, 0, 0, 0755, -, /usr/bin/gnuplot) ifdef PTXCONF_GNUPLOT_HELP - @$(call install_copy, gnuplot, 0, 0, 0644, -, /usr/share/gnuplot/4.4/gnuplot.gih) + @$(call install_copy, gnuplot, 0, 0, 0644, -, /usr/share/gnuplot/4.6/gnuplot.gih) endif ifdef PTXCONF_GNUPLOT_POSTSCRIPT - @$(call install_tree, gnuplot, 0, 0, -, /usr/share/gnuplot/4.4/PostScript) + @$(call install_tree, gnuplot, 0, 0, -, /usr/share/gnuplot/4.6/PostScript) endif ifdef PTXCONF_GNUPLOT_JS - @$(call install_tree, gnuplot, 0, 0, -, /usr/share/gnuplot/4.4/js) + @$(call install_tree, gnuplot, 0, 0, -, /usr/share/gnuplot/4.6/js) endif ifdef PTXCONF_GNUPLOT_X - @$(call install_copy, gnuplot, 0, 0, 0755, -, /usr/libexec/gnuplot/4.4/gnuplot_x11) + @$(call install_copy, gnuplot, 0, 0, 0755, -, /usr/libexec/gnuplot/4.6/gnuplot_x11) endif @$(call install_finish, gnuplot) -- 1.7.2.5 -- ptxdist mailing list ptxdist@pengutronix.de ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [ptxdist] [PATCH 1/2] gnuplot: upgrade to 4.6.1 removing one patch integrated upstream 2012-10-12 15:09 ` [ptxdist] [PATCH 1/2] gnuplot: upgrade to 4.6.1 removing one patch integrated upstream Alexander Dahl @ 2012-10-14 10:45 ` Michael Olbrich 2012-10-14 13:25 ` Alexander Dahl 0 siblings, 1 reply; 8+ messages in thread From: Michael Olbrich @ 2012-10-14 10:45 UTC (permalink / raw) To: ptxdist On Fri, Oct 12, 2012 at 05:09:02PM +0200, Alexander Dahl wrote: > > Signed-off-by: Alexander Dahl <post@lespocky.de> > --- > ...ld-documentation-generator-tools-with-CC_.patch | 99 -------------------- > ...DFLAGS-when-building-the-documentation-ge.patch | 30 ------ > patches/gnuplot-4.4.3/autogen.sh | 1 - > patches/gnuplot-4.4.3/series | 5 - > ...DFLAGS-when-building-the-documentation-ge.patch | 30 ++++++ > patches/gnuplot-4.6.1/autogen.sh | 1 + > patches/gnuplot-4.6.1/series | 4 + > rules/gnuplot.make | 12 +- > 8 files changed, 41 insertions(+), 141 deletions(-) > delete mode 100644 patches/gnuplot-4.4.3/0001-gnuplot-build-documentation-generator-tools-with-CC_.patch > delete mode 100644 patches/gnuplot-4.4.3/0002-Don-t-use-LDFLAGS-when-building-the-documentation-ge.patch > delete mode 120000 patches/gnuplot-4.4.3/autogen.sh > delete mode 100644 patches/gnuplot-4.4.3/series > create mode 100644 patches/gnuplot-4.6.1/0001-Don-t-use-LDFLAGS-when-building-the-documentation-ge.patch > create mode 120000 patches/gnuplot-4.6.1/autogen.sh > create mode 100644 patches/gnuplot-4.6.1/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 = This last hunk was not integrated upstream, so doc2gih fails to link because of missing libraries. Michael > - > - COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) > - CCLD = $(CC) > diff --git a/patches/gnuplot-4.4.3/0002-Don-t-use-LDFLAGS-when-building-the-documentation-ge.patch b/patches/gnuplot-4.4.3/0002-Don-t-use-LDFLAGS-when-building-the-documentation-ge.patch > deleted file mode 100644 > index 968eaf8..0000000 > --- a/patches/gnuplot-4.4.3/0002-Don-t-use-LDFLAGS-when-building-the-documentation-ge.patch > +++ /dev/null > @@ -1,30 +0,0 @@ > -From: Bernhard Walle <bernhard@bwalle.de> > -Date: Sun, 22 Jan 2012 00:03:59 +0100 > -Subject: [PATCH] Don't use LDFLAGS when building the documentation generator > - > -The documentation generator is a tool running on the build machine. > -Therefore the LDFLAGS computed for the cross compiler may not work, such > -as the "-Wl,-rpath-link" flag which is not understood by the Darwin > -linker. > - > -The doc2gih is simple and doesn't require an external library. So we > -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(-) > - > -diff --git a/docs/Makefile.in b/docs/Makefile.in > -index 591d818..0e2ef8f 100644 > ---- a/docs/Makefile.in > -+++ b/docs/Makefile.in > -@@ -83,7 +83,7 @@ LIBS = > - > - COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) > - CCLD = $(CC) > --LINK = $(CCLD) $(CFLAGS) $(LDFLAGS) -o $@ > -+LINK = $(CCLD) $(CFLAGS) -o $@ > - > - .c.o: > - $(COMPILE) -c $< > 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.6.1/0001-Don-t-use-LDFLAGS-when-building-the-documentation-ge.patch b/patches/gnuplot-4.6.1/0001-Don-t-use-LDFLAGS-when-building-the-documentation-ge.patch > new file mode 100644 > index 0000000..dedd05e > --- /dev/null > +++ b/patches/gnuplot-4.6.1/0001-Don-t-use-LDFLAGS-when-building-the-documentation-ge.patch > @@ -0,0 +1,30 @@ > +From: Bernhard Walle <bernhard@bwalle.de> > +Date: Sun, 22 Jan 2012 00:03:59 +0100 > +Subject: [PATCH] Don't use LDFLAGS when building the documentation generator > + > +The documentation generator is a tool running on the build machine. > +Therefore the LDFLAGS computed for the cross compiler may not work, such > +as the "-Wl,-rpath-link" flag which is not understood by the Darwin > +linker. > + > +The doc2gih is simple and doesn't require an external library. So we > +don't also need special LDFLAGS. Omit them. > + > +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 0560553..628c006 100644 > +--- a/docs/Makefile.in > ++++ b/docs/Makefile.in > +@@ -85,7 +85,7 @@ LIBS = @LIBS@ > + > + COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) > + CCLD = $(CC) > +-LINK = $(CCLD) $(CFLAGS) $(LDFLAGS) -o $@ > ++LINK = $(CCLD) $(CFLAGS) -o $@ > + > + .c.o: > + $(COMPILE) -c $< > diff --git a/patches/gnuplot-4.6.1/autogen.sh b/patches/gnuplot-4.6.1/autogen.sh > new file mode 120000 > index 0000000..9f8a4cb > --- /dev/null > +++ b/patches/gnuplot-4.6.1/autogen.sh > @@ -0,0 +1 @@ > +../autogen.sh > \ No newline at end of file > diff --git a/patches/gnuplot-4.6.1/series b/patches/gnuplot-4.6.1/series > new file mode 100644 > index 0000000..fb98f2d > --- /dev/null > +++ b/patches/gnuplot-4.6.1/series > @@ -0,0 +1,4 @@ > +# generated by git-ptx-patches > +#tag:base --start-number 1 > +0001-Don-t-use-LDFLAGS-when-building-the-documentation-ge.patch > +# e1be0237a784ae87b7f45927269e59ad - git-ptx-patches magic > diff --git a/rules/gnuplot.make b/rules/gnuplot.make > index 0142e7c..2159933 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.1 > +GNUPLOT_MD5 := 4c9a06461f402482c30cf94e267eb877 > GNUPLOT := gnuplot-$(GNUPLOT_VERSION) > GNUPLOT_SUFFIX := tar.gz > GNUPLOT_URL := $(call ptx/mirror, SF, gnuplot/$(GNUPLOT).$(GNUPLOT_SUFFIX)) > @@ -101,19 +101,19 @@ $(STATEDIR)/gnuplot.targetinstall: > @$(call install_copy, gnuplot, 0, 0, 0755, -, /usr/bin/gnuplot) > > ifdef PTXCONF_GNUPLOT_HELP > - @$(call install_copy, gnuplot, 0, 0, 0644, -, /usr/share/gnuplot/4.4/gnuplot.gih) > + @$(call install_copy, gnuplot, 0, 0, 0644, -, /usr/share/gnuplot/4.6/gnuplot.gih) > endif > > ifdef PTXCONF_GNUPLOT_POSTSCRIPT > - @$(call install_tree, gnuplot, 0, 0, -, /usr/share/gnuplot/4.4/PostScript) > + @$(call install_tree, gnuplot, 0, 0, -, /usr/share/gnuplot/4.6/PostScript) > endif > > ifdef PTXCONF_GNUPLOT_JS > - @$(call install_tree, gnuplot, 0, 0, -, /usr/share/gnuplot/4.4/js) > + @$(call install_tree, gnuplot, 0, 0, -, /usr/share/gnuplot/4.6/js) > endif > > ifdef PTXCONF_GNUPLOT_X > - @$(call install_copy, gnuplot, 0, 0, 0755, -, /usr/libexec/gnuplot/4.4/gnuplot_x11) > + @$(call install_copy, gnuplot, 0, 0, 0755, -, /usr/libexec/gnuplot/4.6/gnuplot_x11) > endif > > @$(call install_finish, gnuplot) > -- > 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 ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [ptxdist] [PATCH 1/2] gnuplot: upgrade to 4.6.1 removing one patch integrated upstream 2012-10-14 10:45 ` Michael Olbrich @ 2012-10-14 13:25 ` Alexander Dahl 2012-10-14 13:37 ` Alexander Dahl 0 siblings, 1 reply; 8+ messages in thread From: Alexander Dahl @ 2012-10-14 13:25 UTC (permalink / raw) To: ptxdist [-- Attachment #1.1: Type: text/plain, Size: 696 bytes --] Hei hei, On Sun, Oct 14, 2012 at 12:45:38PM +0200, Michael Olbrich wrote: > This last hunk was not integrated upstream, so doc2gih fails to link > because of missing libraries. Strange. Build didn't fail for me, but maybe I have not tried with the option to build this docu thing. I will have a second look into it tomorrow. I guess this means changing the patch instead of dropping it? Greets Alex -- »With the first link, the chain is forged. The first speech censured, the first thought forbidden, the first freedom denied, chains us all irrevocably.« (Jean-Luc Picard, quoting Judge Aaron Satie) *** GnuPG-FP: 02C8 A590 7FE5 CA5F 3601 D1D5 8FBA 7744 CC87 10D0 *** [-- Attachment #1.2: Type: application/pgp-signature, Size: 198 bytes --] [-- Attachment #2: Type: text/plain, Size: 48 bytes --] -- ptxdist mailing list ptxdist@pengutronix.de ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [ptxdist] [PATCH 1/2] gnuplot: upgrade to 4.6.1 removing one patch integrated upstream 2012-10-14 13:25 ` Alexander Dahl @ 2012-10-14 13:37 ` Alexander Dahl 2012-10-15 6:07 ` Michael Olbrich 0 siblings, 1 reply; 8+ messages in thread From: Alexander Dahl @ 2012-10-14 13:37 UTC (permalink / raw) To: ptxdist [-- Attachment #1.1: Type: text/plain, Size: 637 bytes --] On Sun, Oct 14, 2012 at 03:25:36PM +0200, Alexander Dahl wrote: > Strange. Build didn't fail for me, but maybe I have not tried with the > option to build this docu thing. I will have a second look into it > tomorrow. I guess this means changing the patch instead of dropping > it? Or make a new patch containing this not integrated change? Alex -- »With the first link, the chain is forged. The first speech censured, the first thought forbidden, the first freedom denied, chains us all irrevocably.« (Jean-Luc Picard, quoting Judge Aaron Satie) *** GnuPG-FP: 02C8 A590 7FE5 CA5F 3601 D1D5 8FBA 7744 CC87 10D0 *** [-- Attachment #1.2: Type: application/pgp-signature, Size: 198 bytes --] [-- Attachment #2: Type: text/plain, Size: 48 bytes --] -- ptxdist mailing list ptxdist@pengutronix.de ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [ptxdist] [PATCH 1/2] gnuplot: upgrade to 4.6.1 removing one patch integrated upstream 2012-10-14 13:37 ` Alexander Dahl @ 2012-10-15 6:07 ` Michael Olbrich 0 siblings, 0 replies; 8+ messages in thread From: Michael Olbrich @ 2012-10-15 6:07 UTC (permalink / raw) To: ptxdist On Sun, Oct 14, 2012 at 03:37:01PM +0200, Alexander Dahl wrote: > On Sun, Oct 14, 2012 at 03:25:36PM +0200, Alexander Dahl wrote: > > Strange. Build didn't fail for me, but maybe I have not tried with the > > option to build this docu thing. I will have a second look into it > > tomorrow. I guess this means changing the patch instead of dropping > > it? > > Or make a new patch containing this not integrated change? Just change the remaining patch. It's basically the same topic anyways. Michael -- 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 ^ permalink raw reply [flat|nested] 8+ messages in thread
* [ptxdist] [PATCH 2/2] gnuplot: fix broken build options for new gnuplot version 2012-10-12 15:09 [ptxdist] gnuplot: update and fix broken stuff Alexander Dahl 2012-10-12 15:09 ` [ptxdist] [PATCH 1/2] gnuplot: upgrade to 4.6.1 removing one patch integrated upstream Alexander Dahl @ 2012-10-12 15:09 ` Alexander Dahl 2012-10-14 10:46 ` Michael Olbrich 1 sibling, 1 reply; 8+ messages in thread From: Alexander Dahl @ 2012-10-12 15:09 UTC (permalink / raw) To: ptxdist 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..27682de 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) GNUPLOT_ENV := $(CROSS_ENV) - -# -# 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 ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [ptxdist] [PATCH 2/2] gnuplot: fix broken build options for new gnuplot version 2012-10-12 15:09 ` [ptxdist] [PATCH 2/2] gnuplot: fix broken build options for new gnuplot version Alexander Dahl @ 2012-10-14 10:46 ` Michael Olbrich 0 siblings, 0 replies; 8+ messages in thread From: Michael Olbrich @ 2012-10-14 10:46 UTC (permalink / raw) To: ptxdist On Fri, Oct 12, 2012 at 05:09:03PM +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..27682de 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" prompt "GD support " Michael > 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) > GNUPLOT_ENV := $(CROSS_ENV) > - > -# > -# 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 ^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2012-10-15 6:07 UTC | newest] Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2012-10-12 15:09 [ptxdist] gnuplot: update and fix broken stuff Alexander Dahl 2012-10-12 15:09 ` [ptxdist] [PATCH 1/2] gnuplot: upgrade to 4.6.1 removing one patch integrated upstream Alexander Dahl 2012-10-14 10:45 ` Michael Olbrich 2012-10-14 13:25 ` Alexander Dahl 2012-10-14 13:37 ` Alexander Dahl 2012-10-15 6:07 ` Michael Olbrich 2012-10-12 15:09 ` [ptxdist] [PATCH 2/2] gnuplot: fix broken build options for new gnuplot version Alexander Dahl 2012-10-14 10:46 ` Michael Olbrich
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox