diff options
| author | Florian Franzmann | 2019-11-24 22:05:13 +0100 |
|---|---|---|
| committer | Florian Franzmann | 2019-12-22 01:14:50 +0100 |
| commit | ccefdc8c1f6254e1741d0bf169c95a007f32c2d4 (patch) | |
| tree | 9a6dc46acb5dd1c0a5ddc46595b11cf860000caf /gnu | |
| parent | 9dcf20eaebc20328f31d7731ee4eefcbe7a295ad (diff) | |
gnu/gcc: make isl part of the gcc spell
Diffstat (limited to 'gnu')
| -rwxr-xr-x | gnu/gcc/DEPENDS | 9 | ||||
| -rwxr-xr-x | gnu/gcc/DETAILS | 9 | ||||
| -rw-r--r-- | gnu/gcc/HISTORY | 4 | ||||
| -rwxr-xr-x | gnu/gcc/PRE_BUILD | 7 |
4 files changed, 20 insertions, 9 deletions
diff --git a/gnu/gcc/DEPENDS b/gnu/gcc/DEPENDS index f25e201eb3..4f3087e56a 100755 --- a/gnu/gcc/DEPENDS +++ b/gnu/gcc/DEPENDS @@ -41,12 +41,5 @@ fi && if is_version_less $(installed_version libmpc) 0.8.1; then force_depends libmpc -fi && - - -if [[ "$GCC_CLOOG" == "y" ]]; then - depends isl "--with-isl" && - if is_version_less $(installed_version isl) 0.15; then - force_depends isl - fi fi + diff --git a/gnu/gcc/DETAILS b/gnu/gcc/DETAILS index c591a921f1..84a0f4acc6 100755 --- a/gnu/gcc/DETAILS +++ b/gnu/gcc/DETAILS @@ -1,6 +1,7 @@ SPELL=gcc VERSION=9.2.0 - PATCHLEVEL=2 + ISL_VERSION=0.20 + PATCHLEVEL=3 BASE_SOURCE_URL="ftp://ftp.gnu.org/pub/gnu/gcc/gcc-$VERSION" SOURCE=gcc-$VERSION.tar.xz SOURCE2=$SOURCE.sig @@ -12,6 +13,12 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/gcc-$VERSION SOURCE_GPG=gnu.gpg:$SOURCE.sig:UPSTREAM_KEY SOURCE2_IGNORE=signature +if [[ "$GCC_CLOOG" == "y" ]]; then + SOURCE3=isl-${ISL_VERSION}.tar.xz + SOURCE3_URL[0]=http://isl.gforge.inria.fr/$SOURCE3 + SOURCE3_HASH=sha512:394bccd22d8e63cb052a60ad8b1a75f4ec43916a9482c66f5167b534b538161179c47919815983b7fbc20dfaa1a590e88b251850aa092bbffc2891635bf30dc4 +fi + if list_find "$GCC_COMPILER" "ada" ; then # howto generate the ada bootstraper diff --git a/gnu/gcc/HISTORY b/gnu/gcc/HISTORY index d7351c875a..6761713327 100644 --- a/gnu/gcc/HISTORY +++ b/gnu/gcc/HISTORY @@ -1,3 +1,7 @@ +2019-11-24 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de> + * DEPENDS, DETAILS, PRE_BUILD: make isl part of the gcc spell to + increase robustness + 2019-08-12 Treeve Jelbert <treeve@sourcemage.org> * DETAILS: version 9.2.0 diff --git a/gnu/gcc/PRE_BUILD b/gnu/gcc/PRE_BUILD index 3572c671d5..959dbeec18 100755 --- a/gnu/gcc/PRE_BUILD +++ b/gnu/gcc/PRE_BUILD @@ -1,4 +1,11 @@ default_pre_build && + +if [[ "$GCC_CLOOG" == "y" ]]; then + cd "$SOURCE_DIRECTORY" && + unpack_file 3 && + mv isl-$ISL_VERSION isl +fi && + if list_find "$GCC_COMPILER" "ada" ; then cd $SOURCE_DIRECTORY && |