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 1UJUzf-0004mA-Vz for ptxdist@pengutronix.de; Sat, 23 Mar 2013 21:24:50 +0100 Received: from falbala.lespocky.dyndns.org ([10.182.63.94] helo=falbala) by idefix.lespocky.dyndns.org with esmtpsa (TLSv1:DHE-RSA-AES128-SHA:128) (Exim 4.80.1) (envelope-from ) id 1UJUzT-0005X0-8N for ptxdist@pengutronix.de; Sat, 23 Mar 2013 21:24:41 +0100 Date: Sat, 23 Mar 2013 21:24:34 +0100 From: Alexander Dahl Message-ID: <20130323202433.GC28337@falbala> References: <1364061496-21661-1-git-send-email-bernhard@bwalle.de> MIME-Version: 1.0 In-Reply-To: <1364061496-21661-1-git-send-email-bernhard@bwalle.de> Subject: Re: [ptxdist] [PATCH] gnuplot: bump to 4.6.2 Reply-To: ptxdist@pengutronix.de List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: multipart/mixed; boundary="===============1683230100==" Sender: ptxdist-bounces@pengutronix.de Errors-To: ptxdist-bounces@pengutronix.de To: ptxdist@pengutronix.de --===============1683230100== Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="NU0Ex4SbNnrxsi6C" Content-Disposition: inline --NU0Ex4SbNnrxsi6C Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Hei hei,=20 I didn't have a look in this yet, but did you have a look at my patch for gnuplot 4.6.x I posted last year? Michael wanted me to add some more stuff but I didn't have time to make myself familiar with autotools yet. :-/ Greets Alex 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. >=20 > Signed-off-by: Bernhard Walle > --- > Now with -M :-) >=20 > ...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-documentatio= n-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-d= ocumentation-ge.patch =3D> gnuplot-4.6.2/0001-Don-t-use-LDFLAGS-when-buildi= ng-the-documentation-ge.patch} (86%) > create mode 100644 patches/gnuplot-4.6.2/0002-Don-t-build-and-install-in= fo-pages.patch > create mode 100644 patches/gnuplot-4.6.2/series >=20 > diff --git a/patches/gnuplot-4.4.3/0001-gnuplot-build-documentation-gener= ator-tools-with-CC_.patch b/patches/gnuplot-4.4.3/0001-gnuplot-build-docume= ntation-generator-tools-with-CC_.patch > deleted file mode 100644 > index cbc130b..0000000 > --- a/patches/gnuplot-4.4.3/0001-gnuplot-build-documentation-generator-to= ols-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=3Ddetail&aid=3D291= 8992&group_id=3D2055&atid=3D302055 > - > - 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) > -=20 > -+AM_MAINTAINER_MODE > -+ > - VERSION_MAJOR=3D"`cat $srcdir/VERSION`" > - PATCHLEVEL=3D"`cat $srcdir/PATCHLEVEL`" > -=20 > -@@ -26,6 +28,46 @@ AC_C_INLINE > - AC_C_STRINGIZE > - AC_PROG_LN_S > -=20 > -+ > -+if test "${build}" !=3D "${host}" > -+then > -+ CC=3D${CC-${host_alias}-gcc} > -+ CFLAGS=3D${CFLAGS-"-g -O2"} > -+ CXX=3D${CXX-${host_alias}-c++} > -+ CXXFLAGS=3D${CXXFLAGS-"-g -O2"} > -+ CC_FOR_BUILD=3D${CC_FOR_BUILD-gcc} > -+else > -+ CC_FOR_BUILD=3D"\$(CC)" > -+ AC_PROG_CC > -+ > -+ # We must set the default linker to the linker used by gcc for the co= rrect > -+ # operation of libtool. If LD is not defined and we are using gcc, t= ry to > -+ # set the LD default to the ld used by gcc. > -+ if test -z "$LD" > -+ then > -+ if test "$GCC" =3D yes > -+ then > -+ case $build in > -+ *-*-mingw*) > -+ gcc_prog_ld=3D`$CC -print-prog-name=3Dld 2>&1 | tr -d '\015'` ;; > -+ *) > -+ gcc_prog_ld=3D`$CC -print-prog-name=3Dld 2>&1` ;; > -+ esac > -+ case $gcc_prog_ld in > -+ # Accept absolute paths. > -+ [[\\/]* | [A-Za-z]:[\\/]*)] > -+ LD=3D"$gcc_prog_ld" ;; > -+ esac > -+ fi > -+ fi > -+ > -+ CXX=3D${CXX-"c++"} > -+ CFLAGS=3D${CFLAGS-"-g -O2"} > -+ CXXFLAGS=3D${CXXFLAGS-"-g -O2"} > -+fi > -+AC_SUBST(CC_FOR_BUILD) > -+ > -+ > - dnl Various programs > - dnl X/Emacs for building lisp packages and creating .texi version of do= cs > - # 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 =3D : > -=20 > - INFO_DEPS =3D $(srcdir)/gnuplot.info > -=20 > --CC =3D @CC@ > -+CC =3D @CC_FOR_BUILD@ > - CPP =3D @CPP@ > - DEFS =3D @DEFS@ > - DEFAULT_INCLUDES =3D -I. -I$(srcdir) -I.. -I$(top_builddir) > -@@ -79,7 +79,7 @@ CFLAGS =3D @CFLAGS@ > - GIHDIR =3D @GIHDIR@ > - INCLUDES =3D -I$(top_srcdir)/src -I$(top_srcdir)/term > - LDFLAGS =3D @LDFLAGS@ > --LIBS =3D @LIBS@ > -+LIBS =3D > -=20 > - COMPILE =3D $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CPPFLAGS) $= (CFLAGS) > - CCLD =3D $(CC) > diff --git a/patches/gnuplot-4.4.3/autogen.sh b/patches/gnuplot-4.4.3/aut= ogen.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-t= he-documentation-ge.patch b/patches/gnuplot-4.6.2/0001-Don-t-use-LDFLAGS-wh= en-building-the-documentation-ge.patch > similarity index 86% > rename from patches/gnuplot-4.4.3/0002-Don-t-use-LDFLAGS-when-building-th= e-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-docu= mentation-ge.patch > +++ b/patches/gnuplot-4.6.2/0001-Don-t-use-LDFLAGS-when-building-the-docu= mentation-ge.patch > @@ -12,14 +12,14 @@ don't also need special LDFLAGS. Omit them. > =20 > Signed-off-by: Bernhard Walle > --- > - docs/Makefile.in | 2 +- > - 1 files changed, 1 insertions(+), 1 deletions(-) > + docs/Makefile.in | 2 +- > + 1 file changed, 1 insertion(+), 1 deletion(-) > =20 > 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 =3D > +@@ -85,7 +85,7 @@ LIBS =3D @LIBS@ > =20 > COMPILE =3D $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CPPFLAGS) $= (CFLAGS) > CCLD =3D $(CC) > diff --git a/patches/gnuplot-4.6.2/0002-Don-t-build-and-install-info-page= s.patch b/patches/gnuplot-4.6.2/0002-Don-t-build-and-install-info-pages.pat= ch > 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 > +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 whic= h 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 > +--- > + 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 > +=20 > + # install section > +-install: install-gih install-info install-pdf > ++install: install-gih > +=20 > + 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) +=3D gnuplot > # > # Paths and names > # > -GNUPLOT_VERSION :=3D 4.4.3 > -GNUPLOT_MD5 :=3D 639603752996f4923bc02c895fa03b45 > +GNUPLOT_VERSION :=3D 4.6.2 > +GNUPLOT_MD5 :=3D 060e0a77cabb6d6055c5917b0f0b5769 > GNUPLOT :=3D gnuplot-$(GNUPLOT_VERSION) > GNUPLOT_SUFFIX :=3D tar.gz > GNUPLOT_URL :=3D $(call ptx/mirror, SF, gnuplot/$(GNUPLOT).$(GNUPLOT_SUF= FIX)) > @@ -58,6 +58,7 @@ GNUPLOT_AUTOCONF =3D \ > --disable-h3d-gridbox \ > --disable-wxwidgets \ > --without-kpsexpand \ > + --without-latex \ > --without-lasergnu \ > --without-linux-vga \ > --without-ggi \ > @@ -74,7 +75,10 @@ GNUPLOT_AUTOCONF =3D \ > --$(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 > =20 > # ----------------------------------------------------------------------= ------ > # Compile > --=20 > 1.8.2 >=20 >=20 > --=20 > ptxdist mailing list > ptxdist@pengutronix.de --=20 =BBWith the first link, the chain is forged. The first speech censured,=20 the first thought forbidden, the first freedom denied, chains us all=20 irrevocably.=AB (Jean-Luc Picard, quoting Judge Aaron Satie) *** GnuPG-FP: 02C8 A590 7FE5 CA5F 3601 D1D5 8FBA 7744 CC87 10D0 *** --NU0Ex4SbNnrxsi6C Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.12 (GNU/Linux) iEYEABECAAYFAlFOD4EACgkQj7p3RMyHENAVKQCgyL55GHmOStQTDINO9F0Mj1fY HkYAoLDJVVGzBvxvhF12jzEkoHYv9PSa =DjNe -----END PGP SIGNATURE----- --NU0Ex4SbNnrxsi6C-- --===============1683230100== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline -- ptxdist mailing list ptxdist@pengutronix.de --===============1683230100==--