diff options
Diffstat (limited to 'x86_64-w64-mingw32/Makefile')
| -rw-r--r-- | x86_64-w64-mingw32/Makefile | 55 |
1 files changed, 27 insertions, 28 deletions
diff --git a/x86_64-w64-mingw32/Makefile b/x86_64-w64-mingw32/Makefile index 05c881d..0476c53 100644 --- a/x86_64-w64-mingw32/Makefile +++ b/x86_64-w64-mingw32/Makefile @@ -2,11 +2,11 @@ # mingw toolchain -UPSTREAM_GCC_VERSION := 4.6.3 -UPSTREAM_GCC_TARBALL := gcc-core-$(UPSTREAM_GCC_VERSION).tar.bz2 +UPSTREAM_GCC_VERSION := 4.8.4 +UPSTREAM_GCC_TARBALL := gcc-$(UPSTREAM_GCC_VERSION).tar.bz2 UPSTREAM_GCC_URI := http://ftpmirror.gnu.org/gcc/gcc-$(UPSTREAM_GCC_VERSION)/$(UPSTREAM_GCC_TARBALL) -UPSTREAM_BINUTILS_VERSION := 2.22 +UPSTREAM_BINUTILS_VERSION := 2.25 UPSTREAM_BINUTILS_TARBALL := binutils-$(UPSTREAM_BINUTILS_VERSION).tar.bz2 UPSTREAM_BINUTILS_URI := http://ftpmirror.gnu.org/binutils/$(UPSTREAM_BINUTILS_TARBALL) @@ -23,10 +23,9 @@ UPSTREAM_MPC_VERSION := 0.8.2 UPSTREAM_MPC_TARBALL := mpc-$(UPSTREAM_MPC_VERSION).tar.gz UPSTREAM_MPC_URI := http://www.multiprecision.org/mpc/download/$(UPSTREAM_MPC_TARBALL) -UPSTREAM_MINGW_VERSION := 2.0.4 -UPSTREAM_MINGW_TARBALL := mingw-w64-v$(UPSTREAM_MINGW_VERSION).tar.gz -UPSTREAM_MINGW_URI := "http://downloads.sourceforge.net/project/mingw-w64/mingw-w64/mingw-w64-release/$(UPSTREAM_MINGW_TARBALL)?r=http%3A%2F%2Fsourceforge.net%2Fprojects%2Fmingw-w64%2F&ts=1342830561&use_mirror=switch" - +UPSTREAM_MINGW_VERSION := 3.3.0 +UPSTREAM_MINGW_TARBALL := mingw-w64-v$(UPSTREAM_MINGW_VERSION).tar.bz2 +UPSTREAM_MINGW_URI := "http://downloads.sourceforge.net/project/mingw-w64/mingw-w64/mingw-w64-release/$(UPSTREAM_MINGW_TARBALL)?r=http%3A%2F%2Fmingw-w64.sourceforge.net%2Fdownload.php&ts=1426088797&use_mirror=cznic" TOP := $(CURDIR) RECIPES := $(TOP)/recipes @@ -61,7 +60,7 @@ $(BUILDSTEPS)/gcc-core.d: $(BUILDSTEPS)/srcdir-step3.d $(BUILDSTEPS)/binutils.d mkdir -p $(BUILDDIR)/gcc cd $(BUILDDIR)/gcc && PATH="$(PREFIX)/bin:$(PATH)" $(GCC_SRCDIR)/configure \ --prefix=$(PREFIX) --target=$(TARGET_NAME) \ - --enable-languages=c --with-system-zlib --disable-multilib \ + --enable-languages=c,c++ --with-system-zlib --disable-multilib \ --enable-shared --enable-fully-dynamic-string cd $(BUILDDIR)/gcc && PATH="$(PREFIX)/bin:$(PATH)" make all-gcc -j 4 cd $(BUILDDIR)/gcc && PATH="$(PREFIX)/bin:$(PATH)" make install-gcc @@ -79,8 +78,9 @@ $(BUILDSTEPS)/gcc-final.d: $(BUILDSTEPS)/buildsteps.d $(BUILDSTEPS)/gcc-core.d $ $(BUILDSTEPS)/mingw-headers.d: $(BUILDSTEPS)/mingw-srcdir.d mkdir -p $(BUILDDIR)/mingw-headers - cd $(BUILDDIR)/mingw-headers && PATH="$(PREFIX)/bin:$(PATH)" $(MINGW_SRCDIR)/mingw-w64-headers/configure \ - --prefix=$(PREFIX) --host=$(TARGET_NAME) + cd $(BUILDDIR)/mingw-headers && PATH="$(PREFIX)/bin:$(PATH)" \ + $(MINGW_SRCDIR)/mingw-w64-headers/configure \ + --prefix=$(PREFIX)/x86_64-w64-mingw32 --host=$(TARGET_NAME) cd $(BUILDDIR)/mingw-headers && PATH="$(PREFIX)/bin:$(PATH)" make cd $(BUILDDIR)/mingw-headers && PATH="$(PREFIX)/bin:$(PATH)" make install touch $@ @@ -88,13 +88,13 @@ $(BUILDSTEPS)/mingw-headers.d: $(BUILDSTEPS)/mingw-srcdir.d $(BUILDSTEPS)/mingw-crt.d: $(BUILDSTEPS)/mingw-srcdir.d mkdir -p $(BUILDDIR)/mingw-crt cd $(BUILDDIR)/mingw-crt && PATH="$(PREFIX)/bin:$(PATH)" $(MINGW_SRCDIR)/configure \ - --prefix=$(PREFIX) --host=$(TARGET_NAME) + --prefix=$(PREFIX)/x86_64-w64-mingw32 --host=$(TARGET_NAME) cd $(BUILDDIR)/mingw-crt && PATH="$(PREFIX)/bin:$(PATH)" make cd $(BUILDDIR)/mingw-crt && PATH="$(PREFIX)/bin:$(PATH)" make install touch $@ $(BUILDSTEPS)/mingw-srcdir.d: $(SOURCESDIR)/$(UPSTREAM_MINGW_TARBALL) - tar xzf $(SOURCESDIR)/$(UPSTREAM_MINGW_TARBALL) + tar xaf $(SOURCESDIR)/$(UPSTREAM_MINGW_TARBALL) mv mingw-w64-v$(UPSTREAM_MINGW_VERSION) $(MINGW_SRCDIR) touch $@ @@ -106,16 +106,16 @@ $(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 $@ $(BUILDSTEPS)/srcdir-step1.d: $(SOURCESDIR)/$(UPSTREAM_GCC_TARBALL) - tar xjf $(SOURCESDIR)/$(UPSTREAM_GCC_TARBALL) + tar xaf $(SOURCESDIR)/$(UPSTREAM_GCC_TARBALL) mv gcc-$(UPSTREAM_GCC_VERSION) $(GCC_SRCDIR) touch $@ @@ -133,7 +133,7 @@ $(BUILDSTEPS)/binutils.d: $(BUILDSTEPS)/binutils-srcdir.d touch $@ $(BUILDSTEPS)/binutils-srcdir.d: $(SOURCESDIR)/$(UPSTREAM_BINUTILS_TARBALL) - tar xjf $(SOURCESDIR)/$(UPSTREAM_BINUTILS_TARBALL) + tar xaf $(SOURCESDIR)/$(UPSTREAM_BINUTILS_TARBALL) mv binutils-$(UPSTREAM_BINUTILS_VERSION) $(BINUTILS_SRCDIR) touch $@ @@ -141,35 +141,34 @@ $(BUILDSTEPS)/binutils-srcdir.d: $(SOURCESDIR)/$(UPSTREAM_BINUTILS_TARBALL) # Rules to fetch upstream sources ### -$(SOURCESDIR)/$(UPSTREAM_GCC_TARBALL): $(SOURCESDIR)/sourcesdir.d +$(SOURCESDIR)/$(UPSTREAM_GCC_TARBALL): wget -q -O $@ $(UPSTREAM_GCC_URI) -$(SOURCESDIR)/$(UPSTREAM_GMP_TARBALL): $(SOURCESDIR)/sourcesdir.d +$(SOURCESDIR)/$(UPSTREAM_GMP_TARBALL): wget -q -O $@ $(UPSTREAM_GMP_URI) -$(SOURCESDIR)/$(UPSTREAM_MPFR_TARBALL): $(SOURCESDIR)/sourcesdir.d +$(SOURCESDIR)/$(UPSTREAM_MPFR_TARBALL): wget -q -O $@ $(UPSTREAM_MPFR_URI) -$(SOURCESDIR)/$(UPSTREAM_MPC_TARBALL): $(SOURCESDIR)/sourcesdir.d +$(SOURCESDIR)/$(UPSTREAM_MPC_TARBALL): wget -q -O $@ $(UPSTREAM_MPC_URI) -$(SOURCESDIR)/$(UPSTREAM_BINUTILS_TARBALL): $(SOURCESDIR)/sourcesdir.d +$(SOURCESDIR)/$(UPSTREAM_BINUTILS_TARBALL): wget -q -O $@ $(UPSTREAM_BINUTILS_URI) -$(SOURCESDIR)/$(UPSTREAM_MINGW_TARBALL): $(SOURCESDIR)/sourcesdir.d +$(SOURCESDIR)/$(UPSTREAM_MINGW_TARBALL): wget -q -O $@ $(UPSTREAM_MINGW_URI) ### # Rule to create buildsteps dir ### -$(BUILDSTEPS)/buildsteps.d: +$(BUILDSTEPS)/buildsteps.d: $(SOURCESDIR) $(SRCDIR) mkdir -p $(BUILDSTEPS) - mkdir -p $(SRCDIR) touch $@ -$(SOURCESDIR)/sourcesdir.d: +$(SOURCESDIR): mkdir -p $(SOURCESDIR) - ${RM} $@ - touch $@ +$(SRCDIR): + mkdir -p $(SRCDIR)
\ No newline at end of file |