Mercurial > mxe-octave
changeset 3934:8ed7da7e39d4
gcc: parial undo of c/s ee802fc5dd9b
* src/build-gcc.mk: version, checksum to 4.9.2
* src/native-gcc.mk: version, checksum to 4.9.2
* src/isl.mk: version 0.12.2
* src/isl-1-fixes.patch: add back patch file
| author | John Donoghue |
|---|---|
| date | Thu, 07 May 2015 17:14:09 -0400 |
| parents | eef6ad84c349 |
| children | e66c883008d4 |
| files | src/build-gcc.mk src/isl-1-fixes.patch src/isl.mk src/native-gcc.mk |
| diffstat | 4 files changed, 44 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/src/build-gcc.mk Wed May 06 21:14:42 2015 -0400 +++ b/src/build-gcc.mk Thu May 07 17:14:09 2015 -0400 @@ -3,14 +3,14 @@ PKG := build-gcc $(PKG)_IGNORE := -$(PKG)_VERSION := 5.1.0 -$(PKG)_CHECKSUM := b6c947b09adf780fe02065d0c48bfd7b4bdddfa3 +$(PKG)_VERSION := 4.9.2 +$(PKG)_CHECKSUM := 79dbcb09f44232822460d80b033c962c0237c6d8 $(PKG)_SUBDIR := gcc-$($(PKG)_VERSION) $(PKG)_FILE := gcc-$($(PKG)_VERSION).tar.bz2 $(PKG)_URL := ftp://ftp.gnu.org/pub/gnu/gcc/gcc-$($(PKG)_VERSION)/$($(PKG)_FILE) $(PKG)_URL_2 := ftp://ftp.mirrorservice.org/sites/sourceware.org/pub/gcc/releases/gcc-$($(PKG)_VERSION)/$($(PKG)_FILE) -$(PKG)_DEPS := build-cmake gcc-gmp gcc-isl gcc-mpc gcc-mpfr +$(PKG)_DEPS := build-cmake gcc-gmp gcc-isl gcc-mpc gcc-mpfr gcc-cloog ifneq ($(MXE_NATIVE_BUILD),yes) $(PKG)_DEPS += build-binutils endif
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/isl-1-fixes.patch Thu May 07 17:14:09 2015 -0400 @@ -0,0 +1,36 @@ +diff -ur a/include/isl/int.h b/include/isl/int.h +--- a/include/isl/int.h 2012-11-29 03:47:32.000000000 -0500 ++++ b/include/isl/int.h 2014-02-19 02:44:04.311137242 -0500 +@@ -14,7 +14,7 @@ + #include <string.h> + #include <gmp.h> + #if defined(__cplusplus) +-#include <iostream> ++#include <ostream> + #endif + + #if defined(__cplusplus) +diff -u isl-0.12.2.orig/Makefile.am isl-0.12.2/Makefile.am +--- isl-0.12.2.orig/Makefile.am 2014-04-25 14:38:30.985118233 -0400 ++++ isl-0.12.2/Makefile.am 2014-04-25 14:39:56.860765352 -0400 +@@ -154,7 +154,7 @@ + isl_sample_piplib.h \ + isl_piplib.c + libisl_la_LIBADD = @PIPLIB_LIBS@ @GMP_LIBS@ +-libisl_la_LDFLAGS = -version-info @versioninfo@ \ ++libisl_la_LDFLAGS = -no-undefined -version-info @versioninfo@ \ + @PIPLIB_LDFLAGS@ @GMP_LDFLAGS@ + libisl_la_CPPFLAGS = $(INCLUDES) @PIPLIB_CPPFLAGS@ @GMP_CPPFLAGS@ + +diff -u isl-0.12.2.orig/Makefile.in isl-0.12.2/Makefile.in +--- isl-0.12.2.orig/Makefile.in 2014-04-25 14:38:30.972117984 -0400 ++++ isl-0.12.2/Makefile.in 2014-04-25 14:40:36.809531647 -0400 +@@ -645,7 +645,7 @@ + isl_piplib.c + + libisl_la_LIBADD = @PIPLIB_LIBS@ @GMP_LIBS@ +-libisl_la_LDFLAGS = -version-info @versioninfo@ \ ++libisl_la_LDFLAGS = -no-undefined -version-info @versioninfo@ \ + @PIPLIB_LDFLAGS@ @GMP_LDFLAGS@ + + libisl_la_CPPFLAGS = $(INCLUDES) @PIPLIB_CPPFLAGS@ @GMP_CPPFLAGS@
--- a/src/isl.mk Wed May 06 21:14:42 2015 -0400 +++ b/src/isl.mk Thu May 07 17:14:09 2015 -0400 @@ -3,17 +3,13 @@ PKG := isl $(PKG)_IGNORE := -$(PKG)_VERSION := 0.14 -$(PKG)_CHECKSUM := b09e25df265c97ed54002cd811d227a9a26c5f9c +$(PKG)_VERSION := 0.12.2 +$(PKG)_CHECKSUM := ca98a91e35fb3ded10d080342065919764d6f928 $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.bz2 $(PKG)_URL := ftp://gcc.gnu.org/pub/gcc/infrastructure/$($(PKG)_FILE) $(PKG)_DEPS := build-gcc gmp -ifeq ($(MXE_WINDOWS_BUILD),yes) - $(PKG)_EXTRA_MAKE_FLAGS="LDFLAGS='-no-undefined'" -endif - # stick to tested versions from gcc define $(PKG)_UPDATE $(WGET) -q -O- 'ftp://gcc.gnu.org/pub/gcc/infrastructure/' | \
--- a/src/native-gcc.mk Wed May 06 21:14:42 2015 -0400 +++ b/src/native-gcc.mk Thu May 07 17:14:09 2015 -0400 @@ -3,14 +3,14 @@ PKG := native-gcc $(PKG)_IGNORE := -$(PKG)_VERSION := 5.1.0 -$(PKG)_CHECKSUM := b6c947b09adf780fe02065d0c48bfd7b4bdddfa3 +$(PKG)_VERSION := 4.9.2 +$(PKG)_CHECKSUM := 79dbcb09f44232822460d80b033c962c0237c6d8 $(PKG)_SUBDIR := gcc-$($(PKG)_VERSION) $(PKG)_FILE := gcc-$($(PKG)_VERSION).tar.bz2 $(PKG)_URL := ftp://ftp.gnu.org/pub/gnu/gcc/gcc-$($(PKG)_VERSION)/$($(PKG)_FILE) $(PKG)_URL_2 := ftp://ftp.mirrorservice.org/sites/sourceware.org/pub/gcc/releases/gcc-$($(PKG)_VERSION)/$($(PKG)_FILE) -$(PKG)_DEPS := native-binutils gmp isl mpc mpfr +$(PKG)_DEPS := native-binutils gmp isl mpc mpfr cloog ifeq ($(MXE_SYSTEM),mingw) $(PKG)_DEPS += mingw-w64 endif