From 95a9aa06c85692f643e597cfc5c9ca21e273e2ae Mon Sep 17 00:00:00 2001 From: François Revol Date: Fri, 24 Jan 2014 20:47:59 +0100 Subject: atari-mint: Force automake/aclocal to 1.11 Since we force autoconf and friends to 2.64, on Debian unstable at leastsome aclocal macros complain that they require at least 2.65. Also add automake1.11 to the list of required debian packages. --- m5475-atari-mint/Makefile | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'm5475-atari-mint/Makefile') diff --git a/m5475-atari-mint/Makefile b/m5475-atari-mint/Makefile index 0e98c1d..0c01623 100644 --- a/m5475-atari-mint/Makefile +++ b/m5475-atari-mint/Makefile @@ -49,6 +49,8 @@ GCC_AUTOCONF := autoconf2.64 GCC_AUTOHEADER := autoheader2.64 GCC_AUTORECONF := autoreconf2.64 GCC_AUTOM4TE := autom4te2.64 +GCC_AUTOMAKE := automake-1.11 +GCC_ACLOCAL := aclocal-1.11 TOP := $(CURDIR) RECIPES := $(TOP)/recipes @@ -131,7 +133,7 @@ $(BUILDSTEPS)/mintlib.d: $(BUILDSTEPS)/bootstrap-compiler.d $(SOURCESDIR)/$(UPST # Rules to build and install the bootstrap compiler ### -GCC_ENV_PARAMS := AUTOCONF=$(GCC_AUTOCONF) AUTOHEADER=$(GCC_AUTOHEADER) AUTOM4TE=$(GCC_AUTOM4TE) PATH="$(PREFIX)/bin:$(PATH)" +GCC_ENV_PARAMS := AUTOCONF=$(GCC_AUTOCONF) AUTOHEADER=$(GCC_AUTOHEADER) AUTOM4TE=$(GCC_AUTOM4TE) ACLOCAL=$(GCC_ACLOCAL) AUTOMAKE=$(GCC_AUTOMAKE) PATH="$(PREFIX)/bin:$(PATH)" $(BUILDSTEPS)/bootstrap-compiler.d: $(BUILDSTEPS)/srcdir-step3.d $(BUILDSTEPS)/binutils.d $(BUILDSTEPS)/mintbin.d cd $(BUILDDIR) && $(GCC_ENV_PARAMS) $(GCC_SRCDIR)/configure \ @@ -154,9 +156,9 @@ $(BUILDSTEPS)/bootstrap-compiler.d: $(BUILDSTEPS)/srcdir-step3.d $(BUILDSTEPS)/b $(BUILDSTEPS)/srcdir-step3.d: $(BUILDSTEPS)/srcdir-step2.d $(SOURCESDIR)/$(UPSTREAM_GCC_PATCH) bzcat $(SOURCESDIR)/$(UPSTREAM_GCC_PATCH) | patch -d $(GCC_SRCDIR) -p1 cd $(GCC_SRCDIR) && ./contrib/gcc_update --touch - $(GCC_AUTORECONF) -f $(GCC_SRCDIR)/libmudflap - $(GCC_AUTORECONF) -f $(GCC_SRCDIR)/libssp - $(GCC_AUTORECONF) -f $(GCC_SRCDIR)/libquadmath + $(GCC_ENV_PARAMS) $(GCC_AUTORECONF) -f $(GCC_SRCDIR)/libmudflap + $(GCC_ENV_PARAMS) $(GCC_AUTORECONF) -f $(GCC_SRCDIR)/libssp + $(GCC_ENV_PARAMS) $(GCC_AUTORECONF) -f $(GCC_SRCDIR)/libquadmath for p in `ls $(RECIPES)/patches/gcc/*.p` ; do patch -d $(GCC_SRCDIR) -p0 <$$p ; done touch $@ -- cgit v1.2.3