diff options
author | François Revol <revol@free.fr> | 2014-01-24 20:47:59 +0100 |
---|---|---|
committer | Vincent Sanders <vince@kyllikki.org> | 2019-02-22 08:57:40 +0000 |
commit | 95a9aa06c85692f643e597cfc5c9ca21e273e2ae (patch) | |
tree | 5b44f2889d3f98c77ac41e1beaf21f66c6486b31 /m68k-atari-mint | |
parent | 8c92676e7ce1620309cfbb64b81266ec1ceae637 (diff) | |
download | toolchains-95a9aa06c85692f643e597cfc5c9ca21e273e2ae.tar.gz toolchains-95a9aa06c85692f643e597cfc5c9ca21e273e2ae.tar.bz2 |
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.
Diffstat (limited to 'm68k-atari-mint')
-rw-r--r-- | m68k-atari-mint/Makefile | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/m68k-atari-mint/Makefile b/m68k-atari-mint/Makefile index 8b3800d..bd43f2c 100644 --- a/m68k-atari-mint/Makefile +++ b/m68k-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 \ @@ -153,9 +155,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 $@ |