upgrade julia and allowed llvm compilation

Author: zerothi

R/R-basic.bash

@@ -59,6 +59,7 @@ R_append rlang
 R_append utf8
 R_append pillar
 R_append digest
+R_append isoband
 R_append praise
 R_append withr
 R_append magrittr
@@ -69,6 +70,7 @@ R_append covr
 R_append stringi
 R_append ellipsis
 R_append clipr
+R_append cpp11
 R_append evaluate
 R_append yaml
 R_append knitr
@@ -83,6 +85,7 @@ R_append plogr
 R_append reshape2
 R_append classInt
 R_append DBI
+R_append generics
 
 
 R_install

compiler/gcc/gcc.bash

@@ -48,6 +48,16 @@ source_pack compiler/gcc/8/isl.bash
 source_pack compiler/gcc/8/gcc.bash
 source_pack compiler/gcc/8/gdb.bash
 
+gcc_v=10.2.0
+gcc=gcc_$gcc_v
+source_pack compiler/gcc/prereq.bash
+source_pack compiler/gcc/10/gmp.bash
+source_pack compiler/gcc/10/mpfr.bash
+source_pack compiler/gcc/10/mpc.bash
+source_pack compiler/gcc/10/isl.bash
+source_pack compiler/gcc/10/gcc.bash
+source_pack compiler/gcc/10/gdb.bash
+
 gcc_v=9.3.0
 gcc=gcc_$gcc_v
 source_pack compiler/gcc/prereq.bash
@@ -58,15 +68,6 @@ source_pack compiler/gcc/9/isl.bash
 source_pack compiler/gcc/9/gcc.bash
 source_pack compiler/gcc/9/gdb.bash
 
-gcc_v=10.2.0
-gcc=gcc_$gcc_v
-source_pack compiler/gcc/prereq.bash
-source_pack compiler/gcc/10/gmp.bash
-source_pack compiler/gcc/10/mpfr.bash
-source_pack compiler/gcc/10/mpc.bash
-source_pack compiler/gcc/10/isl.bash
-source_pack compiler/gcc/10/gcc.bash
-source_pack compiler/gcc/10/gdb.bash
 
 
 # Local variables which should only be visible here...

compiler/llvm/8/llvm.bash

@@ -1,7 +1,6 @@
 v=8.0.1
 add_package -directory llvm-$v.src -package llvm -version $v \
 	    https://github.com/llvm/llvm-project/releases/download/llvmorg-$v/llvm-$v.src.tar.xz
-
 pack_set -s $IS_MODULE -s $BUILD_DIR -s $MAKE_PARALLEL -s $CRT_DEF_MODULE
 
 pack_set -install-query $(pack_get -prefix)/bin/llvm-ar
@@ -28,7 +27,7 @@ for name in cfe compiler-rt libcxx libcxxabi libunwind lld lldb openmp polly cla
 	    ;;
     esac
     o=$(pwd_archives)/$(pack_get -package)-$(pack_get -version)-$name-$v.src.tar.xz
-    dwn_file ${tmp//llvm-/$name-} $o
+    dwn_file ${tmp//llvm-$v/$name-$v} $o
     case $name in
 	cfe|clang-tools-extra)
 	    pack_cmd "tar xfJ $o -C ../tools/"

compiler/llvm/llvm.bash

@@ -1,4 +1,4 @@
 source_pack compiler/llvm/7/llvm.bash
-#source_pack compiler/llvm/8/llvm.bash
+source_pack compiler/llvm/8/llvm.bash
 source_pack compiler/llvm/9/llvm.bash
 source_pack compiler/llvm/10/llvm.bash

helpers/libffi.bash

@@ -1,13 +1,12 @@
-add_package --build generic --alias gen-libffi --package gen-libffi \
+add_package -build generic -alias gen-libffi -package gen-libffi \
 	    ftp://sourceware.org/pub/libffi/libffi-3.3.tar.gz
 
 pack_set -s $MAKE_PARALLEL -s $IS_MODULE
 
-pack_set --install-query $(pack_get --prefix)/include/ffi.h
+pack_set -install-query $(pack_get -prefix)/include/ffi.h
 
 # Install commands that it should run
-pack_cmd "./configure" \
-	 "--prefix $(pack_get --prefix)"
+pack_cmd "./configure --prefix $(pack_get -prefix)"
 
 # Make commands
 pack_cmd "make $(get_make_parallel)"
@@ -21,10 +20,10 @@ pack_cmd "make install"
 
 # Fix include path and pkgconfig
 for f in lib lib64 ; do
-    flib="$(pack_get --prefix)/$f/pkgconfig/libffi.pc"
+    flib="$(pack_get -prefix)/$f/pkgconfig/libffi.pc"
     pack_cmd "[ -e $flib ] && sed -i -e 's:includedir=.*:includedir=\${prefix}/include:' $flib || true"
-    flib="$(pack_get --prefix)/$f/libffi-$(pack_get --version)"
-    pack_cmd "[ -d $flib/include ] && mv $flib/include $(pack_get --prefix)/include || true"
+    flib="$(pack_get -prefix)/$f/libffi-$(pack_get -version)"
+    pack_cmd "[ -d $flib/include ] && mv $flib/include $(pack_get -prefix)/include || true"
     pack_cmd "[ -d $flib ] && rm -rf $flib || true"
 done
 unset flib

julia.bash

@@ -1,5 +1,5 @@
-jV=1.4
-IjV=$jV.2
+jV=1.5
+IjV=$jV.0
 add_package -package julia \
 	    -directory julia-$IjV \
 	    https://github.com/JuliaLang/julia/releases/download/v$IjV/julia-$IjV-full.tar.gz
@@ -68,14 +68,15 @@ LDFLAGS += $(list -LD-rp lapack-$la)\n\
 fi
 
 pack_cmd "make $(get_make_parallel)"
-# limit number of julia processors for tests
-pack_cmd "export JULIA_NUM_THREADS=$NPROCS"
-pack_cmd "export JULIA_CPU_THREADS=$NPROCS"
-pack_cmd "make test 2>&1 | tee julia.test"
 pack_cmd "make install"
-
+if ! $(is_host nicpa) ; then
+    # limit number of julia processors for tests
+    pack_cmd "export JULIA_NUM_THREADS=$NPROCS"
+    pack_cmd "export JULIA_CPU_THREADS=$NPROCS"
+    pack_cmd "make test 2>&1 | tee julia.test"
+    pack_store julia.test
+fi
 pack_store Make.user
-pack_store julia.test
 
 
 # Create a new build with this module