diff options
| author | Vincent Sanders <vince@kyllikki.org> | 2014-12-20 16:47:26 +0000 |
|---|---|---|
| committer | Vincent Sanders <vince@kyllikki.org> | 2014-12-20 16:47:26 +0000 |
| commit | 499e14b8b6b2900d4272278936345a00501dae43 (patch) | |
| tree | 2bc048be18964c0add2326942b6abd2041e2265b | |
| parent | 488befc4e4a21ef6bb2347cae0148002221e965f (diff) | |
| download | toolchains-499e14b8b6b2900d4272278936345a00501dae43.tar.gz toolchains-499e14b8b6b2900d4272278936345a00501dae43.tar.bz2 | |
add required gmp patch to get it compiling on the CI system
| -rw-r--r-- | m68k-unknown-amigaos/Makefile | 21 | ||||
| -rw-r--r-- | m68k-unknown-amigaos/recipes/patches/gcc/gmp-configure.p | 11 |
2 files changed, 24 insertions, 8 deletions
diff --git a/m68k-unknown-amigaos/Makefile b/m68k-unknown-amigaos/Makefile index 3ee99f6..1544c74 100644 --- a/m68k-unknown-amigaos/Makefile +++ b/m68k-unknown-amigaos/Makefile @@ -94,11 +94,16 @@ $(BUILDSTEPS)/ndk.d: $(SOURCESDIR)/$(UPSTREAM_NDK_TARBALL) $(SOURCESDIR)/$(UPSTR ### $(BUILDSTEPS)/bootstrap-compiler.d: $(BUILDSTEPS)/srcdir-step3.d $(BUILDSTEPS)/binutils.d - cd $(BUILDDIR) && PATH="$(PREFIX)/bin:$(PATH)" $(GCC_SRCDIR)/configure --prefix=$(PREFIX) --target=$(TARGET_NAME) \ - --with-cpu=m68040 --disable-threads --disable-nls --disable-c-mbchar \ - --enable-languages=c --enable-checking=no --enable-c99 --with-cross-host \ - --disable-multilib --without-x --enable-maintainer-mode --disable-shared \ - --without-headers + cd $(BUILDDIR) && PATH="$(PREFIX)/bin:$(PATH)" $(GCC_SRCDIR)/configure \ + --prefix=$(PREFIX) \ + --target=$(TARGET_NAME) \ + --with-cpu=m68040 --disable-threads \ + --disable-nls --disable-c-mbchar \ + --enable-languages=c --enable-checking=no \ + --enable-c99 --with-cross-host \ + --disable-multilib --without-x \ + --enable-maintainer-mode --disable-shared \ + --without-headers cd $(BUILDDIR) && PATH="$(PREFIX)/bin:$(PATH)" make all-gcc cd $(BUILDDIR) && PATH="$(PREFIX)/bin:$(PATH)" make install-gcc touch $@ @@ -114,11 +119,11 @@ $(BUILDSTEPS)/srcdir-step3.d: $(BUILDSTEPS)/srcdir-step2.d touch $@ $(BUILDSTEPS)/srcdir-step2.d: $(BUILDSTEPS)/srcdir-step1.d $(SOURCESDIR)/$(UPSTREAM_GMP_TARBALL) $(SOURCESDIR)/$(UPSTREAM_MPFR_TARBALL) $(SOURCESDIR)/$(UPSTREAM_MPC_TARBALL) - tar xjf $(SOURCESDIR)/$(UPSTREAM_GMP_TARBALL) + tar xaf $(SOURCESDIR)/$(UPSTREAM_GMP_TARBALL) mv gmp-$(UPSTREAM_GMP_VERSION) $(GCC_SRCDIR)/gmp - tar xjf $(SOURCESDIR)/$(UPSTREAM_MPFR_TARBALL) + tar xaf $(SOURCESDIR)/$(UPSTREAM_MPFR_TARBALL) mv mpfr-$(UPSTREAM_MPFR_VERSION) $(GCC_SRCDIR)/mpfr - tar xzf $(SOURCESDIR)/$(UPSTREAM_MPC_TARBALL) + tar xaf $(SOURCESDIR)/$(UPSTREAM_MPC_TARBALL) mv mpc-$(UPSTREAM_MPC_VERSION) $(GCC_SRCDIR)/mpc touch $@ diff --git a/m68k-unknown-amigaos/recipes/patches/gcc/gmp-configure.p b/m68k-unknown-amigaos/recipes/patches/gcc/gmp-configure.p new file mode 100644 index 0000000..a8ac807 --- /dev/null +++ b/m68k-unknown-amigaos/recipes/patches/gcc/gmp-configure.p @@ -0,0 +1,11 @@ +--- gmp/configure.orig 2012-08-17 18:03:57.000000000 +0100 ++++ gmp/configure 2012-08-17 18:04:17.000000000 +0100 +@@ -30006,8 +30006,6 @@ + echo "define(<M4WRAP_SPURIOUS>,<$gmp_cv_m4_m4wrap_spurious>)" >> $gmp_tmpconfigm4 + + +-else +- M4=m4-not-needed + fi + + # Only do the GMP_ASM checks if there's a .S or .asm wanting them. |