diff options
| author | François Revol <revol@free.fr> | 2014-01-24 20:47:59 +0100 |
|---|---|---|
| committer | François Revol <revol@free.fr> | 2018-06-02 23:01:38 +0200 |
| commit | edaee891d3bd39a0ec797b5e2671746257e67625 (patch) | |
| tree | 338bbcd350a98417d5db33b78014b463b18e1c67 | |
| parent | 00b34defde4a2e3ef965dd078ed674624e013cd4 (diff) | |
| download | toolchains-edaee891d3bd39a0ec797b5e2671746257e67625.tar.gz toolchains-edaee891d3bd39a0ec797b5e2671746257e67625.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.
| -rw-r--r-- | README | 2 | ||||
| -rw-r--r-- | m5475-atari-mint/Makefile | 10 | ||||
| -rw-r--r-- | m68k-atari-mint/Makefile | 10 |
3 files changed, 13 insertions, 9 deletions
@@ -5,7 +5,7 @@ Pre-requisites for Debian systems $ apt-get install build-essential autoconf automake autogen flex bison $ apt-get install libtool texinfo help2man subversion cvs git - $ apt-get install lhasa unzip autoconf2.64 + $ apt-get install lhasa unzip autoconf2.64 automake1.11 On multiarch-aware systems: 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 $@ 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 $@ |