From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from moutng.kundenserver.de ([212.227.17.9]) by metis.ext.pengutronix.de with esmtp (Exim 4.72) (envelope-from ) id 1TMgtx-0005gv-EL for ptxdist@pengutronix.de; Fri, 12 Oct 2012 17:11:53 +0200 From: Alexander Dahl Date: Fri, 12 Oct 2012 17:09:02 +0200 Message-Id: <1350054543-30759-2-git-send-email-post@lespocky.de> In-Reply-To: <1350054543-30759-1-git-send-email-post@lespocky.de> References: <1350054543-30759-1-git-send-email-post@lespocky.de> Subject: [ptxdist] [PATCH 1/2] gnuplot: upgrade to 4.6.1 removing one patch integrated upstream Reply-To: ptxdist@pengutronix.de List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: ptxdist-bounces@pengutronix.de Errors-To: ptxdist-bounces@pengutronix.de To: ptxdist@pengutronix.de Signed-off-by: Alexander Dahl --- ...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 -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 ---- -# 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 -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 ---- - 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 +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 +--- + 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