4 files changed, 9 insertions, 38 deletions
diff --git a/plugins/gcc5/gcc5-overlay.mk b/plugins/gcc5/gcc5-overlay.mk
deleted file mode 100644
index 9b6d425..0000000
--- a/plugins/gcc5/gcc5-overlay.mk
+++ /dev/null
@@ -1,25 +0,0 @@
-# This file is part of MXE. See LICENSE.md for licensing information.
-
-# override relevant cloog, isl, and gcc variables changed in:
-# https://github.com/mxe/mxe/pull/965
-#
-# simply expanded variables (*_SUBDIR, *_FILE, etc.) need to be set
-# libmysqlclient patch changes don't adversely affect 5.2 series
-
-PKG             := cloog
-$(PKG)_TARGETS  := $(MXE_TARGETS)
-
-PKG             := isl
-$(PKG)_VERSION  := 0.15
-$(PKG)_CHECKSUM := 8ceebbf4d9a81afa2b4449113cee4b7cb14a687d7a549a963deb5e2a41458b6b
-$(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
-$(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.bz2
-$(PKG)_URL      := http://isl.gforge.inria.fr/$($(PKG)_FILE)
-$(PKG)_URL_2    := ftp://gcc.gnu.org/pub/gcc/infrastructure/$($(PKG)_FILE)
-
-PKG             := gcc
-$(PKG)_VERSION  := 5.4.0
-$(PKG)_CHECKSUM := 608df76dec2d34de6558249d8af4cbee21eceddbcb580d666f7a5a583ca3303a
-$(PKG)_SUBDIR   := gcc-$($(PKG)_VERSION)
-$(PKG)_FILE     := gcc-$($(PKG)_VERSION).tar.bz2
-$(PKG)_URL      := http://ftp.gnu.org/pub/gnu/gcc/gcc-$($(PKG)_VERSION)/$($(PKG)_FILE)
diff --git a/src/cloog.mk b/src/cloog.mk
index 0e3d98c..0124f68 100644
--- a/src/cloog.mk
+++ b/src/cloog.mk
@@ -4,21 +4,17 @@ PKG             := cloog
 $(PKG)_WEBSITE  := http://www.cloog.org/
 $(PKG)_DESCR    := CLooG Code Generator
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 0.18.1
-$(PKG)_CHECKSUM := 02500a4edd14875f94fe84cbeda4290425cb0c1c2474c6f75d75a303d64b4196
+$(PKG)_VERSION  := 0.18.4
+$(PKG)_CHECKSUM := 325adf3710ce2229b7eeb9e84d3b539556d093ae860027185e7af8a8b00a750e
 $(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
 $(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.gz
 $(PKG)_URL      := http://www.bastoul.net/cloog/pages/download/$($(PKG)_FILE)
 $(PKG)_URL_2    := ftp://gcc.gnu.org/pub/gcc/infrastructure/$($(PKG)_FILE)
-$(PKG)_TARGETS  := $(BUILD) $(MXE_TARGETS)
+$(PKG)_TARGETS  := $(MXE_TARGETS)
 $(PKG)_DEPS     := gcc gmp isl
 
-$(PKG)_DEPS_$(BUILD) := gmp isl
-
-# stick to tested versions from gcc
-# after gcc4 series, switch to normal updates and bundled isl
 define $(PKG)_UPDATE
-    $(WGET) -q -O- 'ftp://gcc.gnu.org/pub/gcc/infrastructure/' | \
+    $(WGET) -q -O- 'http://www.bastoul.net/cloog/download.php' | \
     $(SED) -n 's,.*cloog-\([0-9][^>]*\)\.tar.*,\1,p' | \
     $(SORT) -V |
     tail -1
diff --git a/src/gcc.mk b/src/gcc.mk
index d36416c..be4ebfd 100644
--- a/src/gcc.mk
+++ b/src/gcc.mk
@@ -3,9 +3,9 @@
 PKG             := gcc
 $(PKG)_WEBSITE  := http://gcc.gnu.org/
 $(PKG)_DESCR    := GCC
-$(PKG)_IGNORE   := 5%
-$(PKG)_VERSION  := 4.9.4
-$(PKG)_CHECKSUM := 6c11d292cd01b294f9f84c9a59c230d80e9e4a47e5c6355f046bb36d4f358092
+$(PKG)_IGNORE   := 6%
+$(PKG)_VERSION  := 5.4.0
+$(PKG)_CHECKSUM := 608df76dec2d34de6558249d8af4cbee21eceddbcb580d666f7a5a583ca3303a
 $(PKG)_SUBDIR   := gcc-$($(PKG)_VERSION)
 $(PKG)_FILE     := gcc-$($(PKG)_VERSION).tar.bz2
 $(PKG)_URL      := http://ftp.gnu.org/pub/gnu/gcc/gcc-$($(PKG)_VERSION)/$($(PKG)_FILE)
diff --git a/src/isl.mk b/src/isl.mk
index 0e59ccf..6b6bae3 100644
--- a/src/isl.mk
+++ b/src/isl.mk
@@ -4,8 +4,8 @@ PKG             := isl
 $(PKG)_WEBSITE  := http://isl.gforge.inria.fr/
 $(PKG)_DESCR    := Integer Set Library
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 0.12.2
-$(PKG)_CHECKSUM := f4b3dbee9712850006e44f0db2103441ab3d13b406f77996d1df19ee89d11fb4
+$(PKG)_VERSION  := 0.15
+$(PKG)_CHECKSUM := 8ceebbf4d9a81afa2b4449113cee4b7cb14a687d7a549a963deb5e2a41458b6b
 $(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
 $(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.bz2
 $(PKG)_URL      := http://isl.gforge.inria.fr/$($(PKG)_FILE)