diff options
| author | Sukneet Basuta | 2012-06-11 13:52:31 -0400 |
|---|---|---|
| committer | Vlad Glagolev | 2012-06-14 12:39:01 +0400 |
| commit | dca9b923ac6e4208471044d83971c672c3005b5c (patch) | |
| tree | 8a668f39e4ff19f7c0ac085f53a6ff8c35abe837 | |
| parent | fc7b4afe1c9969dfd9cc6ba2fcdaa9463797cb4e (diff) | |
gnuplot: apply fix for automake-1.12
patch from upstream
(cherry picked from commit f31d056cf13f4edae864beb3a967370c0b3860ac)
| -rw-r--r-- | utils/gnuplot/HISTORY | 5 | ||||
| -rwxr-xr-x | utils/gnuplot/PRE_BUILD | 2 | ||||
| -rw-r--r-- | utils/gnuplot/automake-1.12.patch | 36 |
3 files changed, 43 insertions, 0 deletions
diff --git a/utils/gnuplot/HISTORY b/utils/gnuplot/HISTORY index a13ecd95df..42d40d3966 100644 --- a/utils/gnuplot/HISTORY +++ b/utils/gnuplot/HISTORY @@ -1,3 +1,8 @@ +2012-06-11 Sukneet Basuta <sukneet@sourcemage.org> + * PRE_BUILD: apply fix for automake-1.12 + * automake-1.12.patch: added, patch for automake 1.12. + From upstream. Remove on next update. + 2012-05-25 Thomas Orgis <sobukus@sourcemage.org> * DETAILS: update to 4.6 * PRE_BUILD, BUILD, crossbuild.patch, FINAL, INSTALL, POST_REMOVE: diff --git a/utils/gnuplot/PRE_BUILD b/utils/gnuplot/PRE_BUILD index af643b4805..fa1663b627 100755 --- a/utils/gnuplot/PRE_BUILD +++ b/utils/gnuplot/PRE_BUILD @@ -4,6 +4,8 @@ cd "$SOURCE_DIRECTORY" && # Hopefully fixed in gnuplot 4.7 . patch -Np0 < "$SPELL_DIRECTORY/crossbuild.patch" && +patch -p0 < $SPELL_DIRECTORY/automake-1.12.patch && + # remove the true when removing the patch above if true || [[ $GNUPLOT_BRANCH == scm ]]; then cd "$SOURCE_DIRECTORY" && diff --git a/utils/gnuplot/automake-1.12.patch b/utils/gnuplot/automake-1.12.patch new file mode 100644 index 0000000000..30d976ddb8 --- /dev/null +++ b/utils/gnuplot/automake-1.12.patch @@ -0,0 +1,36 @@ +--- Makefile.am 2012/01/14 08:18:00 1.20.2.1 ++++ Makefile.am 2012/05/08 20:28:19 1.20.2.2 +@@ -1,5 +1,5 @@ + ## Process this file with automake to produce Makefile.in -*-Makefile-*- +-AUTOMAKE_OPTIONS = foreign 1.2h ++AUTOMAKE_OPTIONS = foreign + + SUBDIRS = config m4 term src docs $(LISPDIR) man demo tutorial share + +--- src/Makefile.am 2012/01/19 07:03:27 1.86.2.3 ++++ src/Makefile.am 2012/05/08 20:28:20 1.86.2.4 +@@ -1,5 +1,5 @@ + ## Process this file with automake to produce Makefile.in -*-Makefile-*- +-AUTOMAKE_OPTIONS = ansi2knr foreign 1.2h ++AUTOMAKE_OPTIONS = foreign + + # in the spirit of automake ... + pkglibexecdir = $(libexecdir)/@PACKAGE@/@VERSION_MAJOR@ +--- configure.in 2012/04/26 22:53:11 1.297.2.14 ++++ configure.in 2012/05/08 20:28:19 1.297.2.15 +@@ -20,11 +20,12 @@ + dnl configure.in body + + dnl Compiler characteristics +-dnl Check for ANSI C prototypes, the const and inline keywords, +-dnl and ANSI style stringification ++dnl Check for the const and inline keywords and ANSI style stringification ++dnl automake 1.12 dropped support for AM_C_PROTOTYPES and ansi2knr ++dnl But our code still tests for #ifdef PROTOTYPES, so define it here ++AC_DEFINE(PROTOTYPES,1,[Automake 1.12 dropped support for building without prototypes]) + AC_GNU_SOURCE + AC_PROG_CC +-AM_C_PROTOTYPES + AC_PROG_CPP + AC_C_CONST + AC_C_INLINE |