vlc | branch: master | Martin Storsjö <mar...@martin.st> | Tue Apr 2 16:28:47 2013 +0300| [e495dc9b378f4aae95581535ff3505787233dd24] | committer: Martin Storsjö
contrib: gmp: Patch away the ansi2knr mentionings The latest automake versions (as built by extras/tools) have removed support for ansi2knr altogether, so this is required for reconfiguration to work. We still need to do the reconf since the host system ANSI check in the tarball is broken. Signed-off-by: Martin Storsjö <mar...@martin.st> > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=e495dc9b378f4aae95581535ff3505787233dd24 --- contrib/src/gmp/ansi2knr.diff | 32 ++++++++++++++++++++++++++++++++ contrib/src/gmp/rules.mak | 1 + 2 files changed, 33 insertions(+) diff --git a/contrib/src/gmp/ansi2knr.diff b/contrib/src/gmp/ansi2knr.diff new file mode 100644 index 0000000..f352b7d --- /dev/null +++ b/contrib/src/gmp/ansi2knr.diff @@ -0,0 +1,32 @@ +--- gmp-4.2.1/configure.in.orig 2013-04-02 16:26:56.000000000 +0300 ++++ gmp-4.2.1/configure.in 2013-04-02 16:27:25.000000000 +0300 +@@ -67,7 +67,7 @@ + dnl Note that there's a copy of these options in the top-level Makefile.am, + dnl so update there too if changing anything. + dnl +-AM_INIT_AUTOMAKE([1.8 gnu no-dependencies $(top_builddir)/ansi2knr]) ++AM_INIT_AUTOMAKE([1.8 gnu no-dependencies]) + AM_CONFIG_HEADER(config.h:config.in) + AM_MAINTAINER_MODE + +@@ -2024,9 +2024,6 @@ + echo " MPN_PATH=\"$path\"" + + +-# Automake ansi2knr support. +-AM_C_PROTOTYPES +- + GMP_PROG_AR + GMP_PROG_NM + +--- gmp-4.2.1/Makefile.am.orig 2013-04-02 16:27:07.000000000 +0300 ++++ gmp-4.2.1/Makefile.am 2013-04-02 16:27:13.000000000 +0300 +@@ -27,7 +27,7 @@ + # Makefiles in subdirectories, but here we must omit it so automake gives + # the actual ansi2knr build rule, not "cd $(top_builddir) && make ansi2knr". + # +-AUTOMAKE_OPTIONS = 1.8 gnu no-dependencies ansi2knr ++AUTOMAKE_OPTIONS = 1.8 gnu no-dependencies + + + # Libtool -version-info for libgmp.la and libmp.la. See "Versioning" in the diff --git a/contrib/src/gmp/rules.mak b/contrib/src/gmp/rules.mak index ad05ab5..5f60fb0 100644 --- a/contrib/src/gmp/rules.mak +++ b/contrib/src/gmp/rules.mak @@ -15,6 +15,7 @@ gmp: gmp-$(GMP_VERSION).tar.bz2 .sum-gmp $(UNPACK) $(APPLY) $(SRC)/gmp/inline.diff $(APPLY) $(SRC)/gmp/ansitest.diff + $(APPLY) $(SRC)/gmp/ansi2knr.diff $(MOVE) .gmp: gmp _______________________________________________ vlc-commits mailing list vlc-commits@videolan.org http://mailman.videolan.org/listinfo/vlc-commits
