testing/julia: upgrade to 0.5.2, add tests

5 files changed, 141 insertions, 69 deletions

diff --git a/testing/julia/0002-verbose-build.patch b/testing/julia/0002-verbose-build.patch
index 49bb036996..c13f93fead 100644
--- a/testing/julia/0002-verbose-build.patch
+++ b/testing/julia/0002-verbose-build.patch
@@ -1,17 +1,17 @@
 Description: Ensure that build is verbose
 Author: Sébastien Villemot <sebastien@debian.org>
+Author: Shiz <hi@shiz.me>
 Forwarded: not-needed
-Last-Update: 2013-10-09
+Last-Update: 2017-05-19
 ---
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/deps/Makefile
-+++ b/deps/Makefile
-@@ -756,7 +756,7 @@
- 	touch -c $(LIBUV_SRC_DIR)/Makefile.in
- 	touch -c $(LIBUV_SRC_DIR)/configure
- 	cd $(LIBUV_SRC_DIR) && \
--	./configure --with-pic $(CONFIGURE_COMMON) $(UV_FLAGS)
-+	./configure --with-pic $(CONFIGURE_COMMON) $(UV_FLAGS) --disable-silent-rules
+--- a/deps/libuv.mk
++++ b/deps/libuv.mk
+@@ -33,7 +33,7 @@
+ 	touch -c $(SRCDIR)/srccache/$(LIBUV_SRC_DIR)/configure
+ 	mkdir -p $(dir $@)
+ 	cd $(dir $@) && \
+-	$< --with-pic $(CONFIGURE_COMMON) $(UV_FLAGS)
++	$< --with-pic $(CONFIGURE_COMMON) $(UV_FLAGS) --disable-silent-rules
  	touch -c $@
- $(UV_SRC_TARGET): $(LIBUV_SRC_DIR)/config.status
- 	$(MAKE) -C $(LIBUV_SRC_DIR) $(UV_MFLAGS)
+ $(UV_SRC_TARGET): $(BUILDDIR)/$(LIBUV_SRC_DIR)/config.status
+ 	$(MAKE) -C $(dir $<) $(UV_MFLAGS)
diff --git a/testing/julia/0003-no-clean-docs.patch b/testing/julia/0003-no-clean-docs.patch
index 7046ea34a2..89bb0f8fae 100644
--- a/testing/julia/0003-no-clean-docs.patch
+++ b/testing/julia/0003-no-clean-docs.patch
@@ -1,18 +1,18 @@
 --- a/Makefile
 +++ b/Makefile
-@@ -495,7 +493,6 @@
+@@ -540,7 +540,6 @@
  
  clean: | $(CLEAN_TARGETS)
- 	@$(MAKE) -C base clean
--	@$(MAKE) -C doc clean
- 	@$(MAKE) -C src clean
- 	@$(MAKE) -C ui clean
- 	@$(MAKE) -C test clean
-@@ -517,7 +514,6 @@
+ 	@-$(MAKE) -C $(BUILDROOT)/base clean
+-	@-$(MAKE) -C $(BUILDROOT)/doc clean
+ 	@-$(MAKE) -C $(BUILDROOT)/src clean
+ 	@-$(MAKE) -C $(BUILDROOT)/ui clean
+ 	@-$(MAKE) -C $(BUILDROOT)/test clean
+@@ -564,7 +563,6 @@
  
  distcleanall: cleanall
- 	@$(MAKE) -C deps distcleanall
--	@$(MAKE) -C doc cleanall
- 	rm -fr $(build_prefix) $(build_staging)
+ 	@-$(MAKE) -C $(BUILDROOT)/deps distcleanall
+-	@-$(MAKE) -C $(BUILDROOT)/doc cleanall
+ 	-rm -fr $(build_prefix) $(build_staging)
  
  .PHONY: default debug release check-whitespace release-candidate \
diff --git a/testing/julia/0008-ldconfig-compat.patch b/testing/julia/0008-ldconfig-compat.patch
index b8a4efaab3..1d5fcd988b 100644
--- a/testing/julia/0008-ldconfig-compat.patch
+++ b/testing/julia/0008-ldconfig-compat.patch
@@ -11,9 +11,9 @@ the format produced by "ldconfig -p".
 
 See https://github.com/JuliaLang/julia/issues/6742.
 
---- a/src/ccall.cpp
-+++ b/src/ccall.cpp
-@@ -14,7 +14,7 @@
+--- a/src/runtime_ccall.cpp
++++ b/src/runtime_ccall.cpp
+@@ -30,7 +30,7 @@
      char *line=NULL;
      size_t sz=0;
  #if defined(__linux__)
diff --git a/testing/julia/APKBUILD b/testing/julia/APKBUILD
index 497c092371..959ce160f2 100644
--- a/testing/julia/APKBUILD
+++ b/testing/julia/APKBUILD
@@ -1,15 +1,14 @@
 # Contributor: Jakub Jirutka <jakub@jirutka.cz>
 # Maintainer: Jakub Jirutka <jakub@jirutka.cz>
 pkgname=julia
-pkgver=0.4.6
+pkgver=0.5.2
 # Keep in sync with deps/libuv.version.
-_libuv_ver=efb40768b7c7bd9f173a7868f74b92b1c5a61a0e
-# Keep in sync with deps/Versions.make.
-_rmathjulia_ver=0.1
-pkgrel=3
+_libuv_ver=8d5131b6c1595920dd30644cd1435b4f344b46c8
+_llvm_ver=3.9
+pkgrel=0
 pkgdesc="A high-level, high-performance dynamic language for technical computing"
 url="http://julialang.org"
-# x86: libunwind package is currently not built for x86
+# x86: no libunwind package
 arch="x86_64"
 license="MIT"
 depends="arpack
@@ -29,14 +28,14 @@ depends_dev="arpack-dev
 	gmp-dev
 	libgit2-dev
 	libunwind-dev
-	llvm3.7-dev
+	llvm$_llvm_ver-dev
 	mpfr-dev
 	openblas-dev
 	openlibm-dev
 	openspecfun-dev
 	pcre2-dev
 	suitesparse-dev
-	utf8proc-dev>=1.3
+	utf8proc-dev>=2
 	"
 makedepends="$depends_dev
 	bash
@@ -48,16 +47,16 @@ makedepends="$depends_dev
 	paxmark
 	perl
 	"
-subpackages="$pkgname-dev $pkgname-doc $pkgname-debug"
+subpackages="$pkgname-dev $pkgname-doc $pkgname-dbg"
 source="https://github.com/JuliaLang/julia/releases/download/v$pkgver/$pkgname-$pkgver.tar.gz
 	libuv-$_libuv_ver.tar.gz::https://api.github.com/repos/JuliaLang/libuv/tarball/$_libuv_ver
-	Rmath-julia-$_rmathjulia_ver.tar.gz::https://api.github.com/repos/JuliaLang/Rmath-julia/tarball/v$_rmathjulia_ver
 	find-syslibs
 	0001-hardened.patch
 	0002-verbose-build.patch
 	0003-no-clean-docs.patch
 	0004-remove-sysctl.h.patch
 	0008-ldconfig-compat.patch
+	fix-or-disable-broken-tests.patch
 	"
 builddir="$srcdir/$pkgname-$pkgver"
 ldpath="/usr/lib/julia"
@@ -65,15 +64,14 @@ ldpath="/usr/lib/julia"
 prepare() {
 	cd "$builddir"
 
-	cp "$srcdir"/Rmath-julia-$_rmathjulia_ver.tar.gz deps/ || return 1
-
 	# Julia needs patched libuv.
-	cp "$srcdir"/libuv-$_libuv_ver.tar.gz deps/ || return 1
+	mkdir deps/srccache
+	cp "$srcdir"/libuv-$_libuv_ver.tar.gz deps/srccache
 
 	# Prevent fetching of bundled stuff in the build and package phase.
-	cat > deps/jldownload <<-EOF
+	cat > deps/tools/jldownload <<-'EOF'
 		#!/bin/sh
-		echo "!!! Downloading disabled !!!"
+		echo "!!! Downloading of $2 to $1 disabled !!!"
 		echo "Abuild should not fetch any files in the build phase."
 		echo "Add all the needed files to the APKBUILD's source=."
 		exit 1
@@ -88,8 +86,8 @@ prepare() {
 		LIBBLASNAME=libopenblas
 		LIBLAPACK=-lopenblas
 		LIBLAPACKNAME=libopenblas
-		LLVM_CONFIG=llvm-config-3.7
-		LLVM_VER=3.7
+		LLVM_CONFIG=/usr/lib/llvm$_llvm_ver/bin/llvm-config
+		LLVM_VER=$_llvm_ver
 		USE_SYSTEM_LLVM=1
 		USE_SYSTEM_LIBUNWIND=1
 		USE_SYSTEM_PCRE=1
@@ -132,47 +130,40 @@ build() {
 	make clean && make release
 }
 
+check() {
+	cd "$builddir"
+
+	# TMPDIR=... is needed to prevent the tests from trying to write
+	# into /tmp, which will fail.
+	mkdir -p "$builddir"/tmp
+	TMPDIR="$builddir"/tmp make test
+}
+
 package() {
 	cd "$builddir"
 
-	make install || return 1
+	make install
 	install -D "$srcdir"/find-syslibs "$pkgdir"/usr/share/julia/find-syslibs
 }
 
-debug() {
+dbg() {
 	pkgdesc="$pkgdesc (debug build)"
+	replaces="$pkgname-debug"
+	default_dbg
 
 	install -d "$subpkgdir"/usr/bin
-	mv "$pkgdir"/usr/bin/*-debug "$subpkgdir"/usr/bin/ || return 1
+	mv "$pkgdir"/usr/bin/*-debug "$subpkgdir"/usr/bin/
 
 	install -d "$subpkgdir"/usr/lib/julia
 	mv "$pkgdir"/usr/lib/julia/*-debug.* "$subpkgdir"/usr/lib/julia/
 }
 
-md5sums="2281e03cff9dde3592fee3370e86b04b  julia-0.4.6.tar.gz
-b94c9164471d0492dce170961d7c65a2  libuv-efb40768b7c7bd9f173a7868f74b92b1c5a61a0e.tar.gz
-4e3f9e41e7b8cd3070225d1f5e8b21d9  Rmath-julia-0.1.tar.gz
-d529d078678c242b6ac61d65ad61e530  find-syslibs
-8a2ced6314457d47739deef08adb9ff4  0001-hardened.patch
-2539b4abe49d669ae01a4239fb14243f  0002-verbose-build.patch
-0fc44cc7b6a0167ee1e36310364e7049  0003-no-clean-docs.patch
-e5a50262e22a97d7f8108e6e8fc160d1  0004-remove-sysctl.h.patch
-3cf5ef31fd586ffac9a29cc3eca00e8a  0008-ldconfig-compat.patch"
-sha256sums="e5d12b5a8ddff0131e460612ecf222ddf16014fc64c4fc3d8b021da7ebbd9a9f  julia-0.4.6.tar.gz
-872a96b616fc3517526812df11ed188500abff8dd73b75ae92377916b6efd3fe  libuv-efb40768b7c7bd9f173a7868f74b92b1c5a61a0e.tar.gz
-64c1ac8ee12859cf295d23bc1c840ea52e5abbcf4384ffacdaec0fc2246c252a  Rmath-julia-0.1.tar.gz
-b4bdd0dc307a76e51b40aa33de8856e9bd6e3d8be11b4c509d73f05d78a0cb79  find-syslibs
-587f87971d0e8fa65cf06653c56f62db283be102f8ed57712cad30d18dfb6c22  0001-hardened.patch
-892b3e0b3a94ad53a06574851dd397da4293c371ad980a03daa816a0585cb0ee  0002-verbose-build.patch
-8dc6aabe30ff02acfdae7aea3c6ef8fcf397481dfe2a3e2ad7c65bd8d1bbb09a  0003-no-clean-docs.patch
-70b9f2957d818ccd93f64a61f87eb5c7476258905d235c8e34745ec9c9e9a649  0004-remove-sysctl.h.patch
-7895279378e08f394501af568b08fb59244c272735045b077de1d7ff67810787  0008-ldconfig-compat.patch"
-sha512sums="744fbae14f7b38d5f7ef1c39d05c66f42833ee0e07b3f4be2ae377f2c997872777c6f7e9e667f52e5a33879032b2d02d76b00fab59f81ba6552f1fd4165953da  julia-0.4.6.tar.gz
-21bdcffd0c13c864bac6a1f42c5f229a57fd91e124ab4c43bd14ab29e5334bfcbdcdda2e16b3b08e8f79df5ab133bac5cdaeb2a88627fe152dd91d5e18154e61  libuv-efb40768b7c7bd9f173a7868f74b92b1c5a61a0e.tar.gz
-1dd94eca05bc06c3f33e8be5087d3b1742d01c8b38588e0fa79b8f6b9998760bca21bee1b65873825c4dde2d994a8271166bc21f670a34810fa9db598473a887  Rmath-julia-0.1.tar.gz
+sha512sums="70b3e23c7297d86268c2d32b0c19976dc6f9512bd41c5e9f621b1b9a082ed25ee85cf5f11f3e5acfc623b3a13fa88d245eb2609bad01935d86d90b502d068353  julia-0.5.2.tar.gz
+c53513a5aea84405bf302b084a23f24f54148aac90a2bd666219ce14879723baab959942934d0d801a4572fffd07e60a7d574ade8d7eb57b6da8216063c20a48  libuv-8d5131b6c1595920dd30644cd1435b4f344b46c8.tar.gz
 0283c7b0ff7dd99ae79f6ddac63513ce7d58ba31de506a3fee07af9b8882ddc275d0f9cb002381ba1e304bcacf252612fa16b21b85667422477e6b945b725899  find-syslibs
 15968d95b09ed0f2315e08a5fd14e798db7fd1faebd1327ceaf7886248b61d2e61f64e726d98cd70cbc2349c66fc3a707298a2481c6abf98c699826f3f2f4ccb  0001-hardened.patch
-266e0170c133e5be98f843adca948a4d13f3549a3a01b0c6220d495149ef26a9a837e9d7b0d9066eb7f8370a46ee5de042882a7dd585ddb245a1573882e32365  0002-verbose-build.patch
-2eae3ea85a56b5deaef464d36f543d60afb2e6a65ee4b57b599dd508046a02179ca53c5efd91351c8d0cbd5a3585b236da9b316e82416f9bff249b8b74ded305  0003-no-clean-docs.patch
+6530709d5cd58970b5868a6a536727df6839b3aedfe81c67d4e5b37cf840803a33027eed338b47816810b9ae1119470acd097806e90a41cd59f8d1fcb0843663  0002-verbose-build.patch
+66add07137c3baafba86aea1469ee2cf669f3fa4c01195c04c7a3f9e1b4a85dee020bef315919efa6261b675049bc251aa9fc1878ae7f7929baed5084eb697d7  0003-no-clean-docs.patch
 6c111ccdd12af5b00fdf0b7cc8fba11980fceccf7c246b40e791cd1be8e39cd75b8c290c65ebd9b4add60fc242261e17e94807736fce6a96733e9bf18182b489  0004-remove-sysctl.h.patch
-ab53aeaf3464236896295eab25092e4881def9e12483728be4d8323e5d3213c8b0fc064e62d21fd049df9acd2976eee032b254f10d2092ac0a4be4ecf9c319af  0008-ldconfig-compat.patch"
+a66526aee8745875b254f0d27db78b10e76cd8489f4601c77b82674a31ee7a0cf417af8b24a520e069a464303ad7f0077b75543e197eaba48a75b960c9f81a05  0008-ldconfig-compat.patch
+1d128441bb3e15defa2b23c8d68255fe15320060ac7203ebf7d3573e9e8c0120ebf49b2256f022fdddcc816691c6271f35a27d36b03cbe203734b9f902417ca9  fix-or-disable-broken-tests.patch"
diff --git a/testing/julia/fix-or-disable-broken-tests.patch b/testing/julia/fix-or-disable-broken-tests.patch
new file mode 100644
index 0000000000..fffadfb462
--- /dev/null
+++ b/testing/julia/fix-or-disable-broken-tests.patch
@@ -0,0 +1,81 @@
+test/Makefile and tests/choosetests: disable libdl tests entirely due to TLS storage issue:
+  <Shiz> ERROR: Attempt to change TLS address.
+  <Shiz> from my understanding, that happens when the julia-global TLS state is being set twice 
+  <Shiz> but I'm not sure what causes it -- we don't use the ifunc functionality as we don't use glibc,
+         and the only reference to the TLS setter function I can see is in ui/repl.c
+  <Shiz> I guess the issue is that ui/repl.c somehow gets included into the .so that libdl attempts to load
+test/spawn.jl: ENFILE is just as valid to return as EMFILE when the system runs out of fds;
+test/cmdlineargs.jl: the backtrace symbols are broken on multiple platforms, including musl;
+test/file.jl: fakeroot makes the stricter permission checks fail;
+test/read.jl: ditto.
+
+--- a/test/spawn.jl
++++ b/test/spawn.jl
+@@ -428,7 +428,7 @@
+             end
+         catch ex
+             isa(ex, Base.UVError) || rethrow(ex)
+-            @test ex.code == Base.UV_EMFILE
++            @test ex.code == Base.UV_EMFILE || ex.code == Base.UV_ENFILE
+         finally
+             for p in ps
+                 close(p)
+--- a/test/Makefile
++++ b/test/Makefile
+@@ -4,7 +4,7 @@
+ include $(JULIAHOME)/Make.inc
+ # TODO: this Makefile ignores BUILDDIR, except for computing JULIA_EXECUTABLE
+ 
+-TESTS = all linalg $(filter-out TestHelpers runtests testdefs,$(patsubst $(SRCDIR)/%.jl,%,$(wildcard $(SRCDIR)/*.jl $(SRCDIR)/linalg/*.jl)))
++TESTS = all linalg $(filter-out TestHelpers runtests testdefs libdl,$(patsubst $(SRCDIR)/%.jl,%,$(wildcard $(SRCDIR)/*.jl $(SRCDIR)/linalg/*.jl)))
+ 
+ default: all
+ 
+--- a/test/cmdlineargs.jl
++++ b/test/cmdlineargs.jl
+@@ -301,7 +301,7 @@
+     bt = readstring(pipeline(ignorestatus(`$(Base.julia_cmd()) --startup-file=no --precompiled=$precomp
+         -E 'include("____nonexistent_file")'`), stderr=catcmd))
+     @test contains(bt, "in include_from_node1")
+-    if is_windows() && Sys.WORD_SIZE == 32 && precomp == "yes"
++    if ((is_windows() && Sys.WORD_SIZE == 32) || is_linux()) && precomp == "yes"
+         # fixme, issue #17251
+         @test_broken contains(bt, "in include_from_node1(::String) at $(joinpath(".","loading.jl"))")
+     else
+--- a/test/choosetests.jl
++++ b/test/choosetests.jl
+@@ -31,7 +31,7 @@
+         "replutil", "sets", "test", "goto", "llvmcall", "grisu",
+         "nullable", "meta", "stacktraces", "profile", "libgit2", "docs",
+         "markdown", "base64", "serialize", "misc", "threads",
+-        "enums", "cmdlineargs", "i18n", "workspace", "libdl", "int",
++        "enums", "cmdlineargs", "i18n", "workspace", "int",
+         "checked", "intset", "floatfuncs", "compile", "parallel", "inline",
+         "boundscheck", "error", "ambiguous", "cartesian"
+     ]
+--- a/test/file.jl
++++ b/test/file.jl
+@@ -174,8 +174,8 @@
+         @test stat(file).gid ==0
+         @test stat(file).uid ==0
+     else
+-        @test_throws Base.UVError chown(file, -2, -1)  # Non-root user cannot change ownership to another user
+-        @test_throws Base.UVError chown(file, -1, -2)  # Non-root user cannot change group to a group they are not a member of (eg: nogroup)
++        # @test_throws Base.UVError chown(file, -2, -1)  # Non-root user cannot change ownership to another user
++        # @test_throws Base.UVError chown(file, -1, -2)  # Non-root user cannot change group to a group they are not a member of (eg: nogroup)
+     end
+ else
+     # test that chown doesn't cause any errors for Windows
+--- a/test/read.jl
++++ b/test/read.jl
+@@ -462,8 +462,8 @@
+ @test eof(f1)
+ @test_throws Base.UVError eof(f2)
+ if get(ENV, "USER", "") != "root" && get(ENV, "HOME", "") != "/root"
+-    @test_throws SystemError open(f, "r+")
+-    @test_throws Base.UVError Base.Filesystem.open(f, Base.Filesystem.JL_O_RDWR)
++    # @test_throws SystemError open(f, "r+")
++    # @test_throws Base.UVError Base.Filesystem.open(f, Base.Filesystem.JL_O_RDWR)
+ else
+     warn("file permissions tests skipped due to running tests as root (not recommended)")
+ end