diff --git a/.gitignore b/.gitignore index a38f9b3..b7d5285 100644 --- a/.gitignore +++ b/.gitignore @@ -45,3 +45,5 @@ /julia-1.0.2.tar.gz /Pkg-d305e82fd353cb67e8a064800b9972ee1cb7b5e0.tar.gz /julia-1.0.3.tar.gz +/julia-1.0.4.tar.gz +/mpfr-4.0.2.tar.bz2 diff --git a/julia.spec b/julia.spec index c50d75e..23f5ebb 100644 --- a/julia.spec +++ b/julia.spec @@ -3,7 +3,7 @@ %global llvmversion 6.0.0 -%global mpfrversion 4.0.1 +%global mpfrversion 4.0.2 %global unwindversion 1.1-julia2 @@ -21,7 +21,7 @@ %global __requires_exclude ^(%{_privatelibs})$ Name: julia -Version: 1.0.3 +Version: 1.0.4 Release: 1%{?dist} Summary: High-level, high-performance dynamic language for technical computing Group: Development/Languages @@ -41,6 +41,7 @@ Source7: https://api.github.com/repos/JuliaLang/Pkg.jl/tarball/%{pkgcommi Patch0: julia_unwind_version.patch Patch1: llvm-julia-installdirs-64.patch Patch2: julia-suitesparse.patch +Patch3: julia_relax-some-Diagonal-tests.patch Provides: bundled(libuv) = %{uvversion} Provides: bundled(llvm) = %{llvmversion} Provides: bundled(mpfr) = %{mpfrversion} @@ -125,6 +126,7 @@ Julia into external programs or debugging Julia itself. %setup -q %patch0 -p1 +%patch3 -p1 %if 0%{?__isa_bits} == 64 patch -p1 < %PATCH1 @@ -154,6 +156,7 @@ popd # Without specifying MARCH, the Julia system image would only work on native CPU # CPU targets reflect those used upstream at # https://github.com/JuliaCI/julia-buildbot/blob/master/master/inventory.py +# About BUILD_MACHINE, see https://github.com/JuliaLang/julia/pull/30554#discussion_r286675943 %ifarch %{ix86} %global march MARCH=pentium4 %global cpu_target JULIA_CPU_TARGET="pentium4;sandybridge,-xsaveopt,clone_all" @@ -168,7 +171,7 @@ popd %global cpu_target JULIA_CPU_TARGET="generic" %endif %ifarch armv7hl -%global march MARCH=$(echo %optflags | grep -Po 'march=\\K[^ ]*') +%global march MARCH=$(echo %optflags | grep -Po 'march=\\K[^ ]*') BUILD_MACHINE=armv7l-redhat-linux-gnueabihf %global cpu_target JULIA_CPU_TARGET="armv7-a;armv7-a,neon;armv7-a,neon,vfp4" %endif %ifarch aarch64 @@ -177,7 +180,7 @@ popd %endif %ifarch ppc64le %global march %{nil} -%global cpu_target JULIA_CPU_TARGET="pwr8" +%global cpu_target JULIA_CPU_TARGET="pwr8" BUILD_MACHINE=powerpc64le-redhat-linux-gnu %endif %if 0%{?__isa_bits} == 64 @@ -187,6 +190,7 @@ popd %endif # About build, build_libdir and build_bindir, see https://github.com/JuliaLang/julia/issues/5063#issuecomment-32628111 + %global julia_builddir %{_builddir}/%{name}/build %global commonopts USE_SYSTEM_LLVM=0 USE_SYSTEM_LIBUNWIND=0 USE_SYSTEM_PCRE=1 USE_SYSTEM_BLAS=1 USE_SYSTEM_LAPACK=1 USE_SYSTEM_GMP=1 USE_SYSTEM_MPFR=0 USE_SYSTEM_SUITESPARSE=0 USE_SYSTEM_DSFMT=1 USE_SYSTEM_LIBUV=0 USE_SYSTEM_UTF8PROC=1 USE_SYSTEM_LIBGIT2=1 USE_SYSTEM_LIBSSH2=1 USE_SYSTEM_MBEDTLS=1 USE_SYSTEM_CURL=1 USE_SYSTEM_PATCHELF=1 USE_SYSTEM_LIBM=0 USE_SYSTEM_OPENLIBM=1 BUNDLE_DEBUG_LIBS=1 JULIA_SPLITDEBUG=1 TAGGED_RELEASE_BANNER="Fedora %{fedora} build" VERBOSE=1 %{march} %{cpu_target} %{blas} prefix=%{_prefix} bindir=%{_bindir} libdir=%{_libdir} libexecdir=%{_libexecdir} datarootdir=%{_datarootdir} includedir=%{_includedir} sysconfdir=%{_sysconfdir} build_prefix=%{julia_builddir}%{_prefix} build_bindir=%{julia_builddir}%{_bindir} build_libdir=%{julia_builddir}%{_libdir} build_private_libdir=%{julia_builddir}%{_libdir}/julia build_libexecdir=%{julia_builddir}%{_libexecdir} build_datarootdir=%{julia_builddir}%{_datarootdir} build_includedir=%{julia_builddir}%{_includedir} build_sysconfdir=%{julia_builddir}%{_sysconfdir} JULIA_CPU_THREADS=$(echo %{?_smp_mflags} | sed s/-j//) @@ -327,6 +331,9 @@ exit 0 /usr/bin/gtk-update-icon-cache %{_datarootdir}/icons/hicolor &>/dev/null || : %changelog +* Sun Jun 9 2019 Milan Bouchet-Valat - 1.0.4-1 +- New upstream release. + * Wed Dec 19 2018 Milan Bouchet-Valat - 1.0.3-1 - New upstream release. diff --git a/julia_relax-some-Diagonal-tests.patch b/julia_relax-some-Diagonal-tests.patch new file mode 100644 index 0000000..4dd0150 --- /dev/null +++ b/julia_relax-some-Diagonal-tests.patch @@ -0,0 +1,31 @@ +From 1833a127820e0319b66ab2aece71ab001349c376 Mon Sep 17 00:00:00 2001 +From: Daniel Karrasch +Date: Thu, 6 Jun 2019 20:56:25 +0200 +Subject: [PATCH] relax some Diagonal tests from #31443 (#32162) + +--- + stdlib/LinearAlgebra/test/diagonal.jl | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/stdlib/LinearAlgebra/test/diagonal.jl b/stdlib/LinearAlgebra/test/diagonal.jl +index 6a1ca14841..4341adfe2c 100644 +--- a/stdlib/LinearAlgebra/test/diagonal.jl ++++ b/stdlib/LinearAlgebra/test/diagonal.jl +@@ -491,10 +491,10 @@ end + M = randn(T, 5, 5) + MM = [randn(T, 2, 2) for _ in 1:2, _ in 1:2] + for transform in (identity, adjoint, transpose, Adjoint, Transpose) +- @test lmul!(transform(D), copy(M)) == *(transform(Matrix(D)), M) +- @test rmul!(copy(M), transform(D)) == *(M, transform(Matrix(D))) +- @test lmul!(transform(DD), copy(MM)) == *(transform(fullDD), MM) +- @test rmul!(copy(MM), transform(DD)) == *(MM, transform(fullDD)) ++ @test lmul!(transform(D), copy(M)) ≈ *(transform(Matrix(D)), M) ++ @test rmul!(copy(M), transform(D)) ≈ *(M, transform(Matrix(D))) ++ @test lmul!(transform(DD), copy(MM)) ≈ *(transform(fullDD), MM) ++ @test rmul!(copy(MM), transform(DD)) ≈ *(MM, transform(fullDD)) + end + end + end +-- +2.20.1 + diff --git a/sources b/sources index c822122..89c113d 100644 --- a/sources +++ b/sources @@ -1,8 +1,8 @@ SHA512 (libuv-ed3700c849289ed01fe04273a7bf865340b2bd7e.tar.gz) = 1305035b1372bdf234e3c5e673ee4c8ab5bda83ff06bc27704786def52667c3143fe587fca8f6e0855ba0c8b6d4dd90b2faefd33736224173f459d751885683e SHA512 (llvm-6.0.0.src.tar.xz) = a71fdd5ddc46f01327ad891cfcc198febdbe10769c57f14d8a4fb7d514621ee4080e1a641200d3353c16a16731d390270499ec6cd3dc98fadc570f3eb6b52b8c -SHA512 (mpfr-4.0.1.tar.bz2) = c1674fc0a5edcde188bdf7d6d14063cfb4f1259b9eaf39d0081f7176e9921ca0af1b12b7aba1a9560d9f2d5f37329d22bc7b82f13421d91d83114b439bc60dcc +SHA512 (mpfr-4.0.2.tar.bz2) = 18bb3a87123d02b7537bc298d41bdbb33e58b8c196cc4040578e3b470e86c6c89e1bd8ab8b3919d106fe5b86922ef8999dc1aba7c521ee90a69f690be288a30d SHA512 (libwhich-81e9723c0273d78493dc8c8ed570f68d9ce7e89e.tar.gz) = 6fb77b715d70d9bc95a8546c3bf97bd3677c7ea344b88bb5bc3bbfac9dceabe8a8cde7a0f64dec884cde802e4a3000e30837d3f824b5a9242348c4fe061526a3 SHA512 (libunwind-1.1-julia2.tar.gz) = 5047890e727069c6ed74ca84bbe999ba6bc5c41d8d3914d6fbce19d18ff8a5944a7276d805ef5f67a857598852ae996a671c264d34a19123bb04d4daf6316f9a SHA512 (SuiteSparse-4.4.5.tar.gz) = 7f9c19c3c58f61e7d82cd2de25eeeec910ad3d6a5c7c79c62a23cbb7dc880cddeca6efa9860a87b3b3c05e74385c8c67bf61d44149b700ac094898237915a6d9 SHA512 (Pkg-d305e82fd353cb67e8a064800b9972ee1cb7b5e0.tar.gz) = 9a16e4932017d0d159bcf65750eeeda1a637a51b6a1a4ebff957a81bc31fadc6db4be69426d6e99118129db9607e8b4d77df894c5df4fa55f88c45ebbb12d7b1 -SHA512 (julia-1.0.3.tar.gz) = b61399c7b7ffae828264a6ec916b409b2cbc6b3b98d9a6d39b60b014a97a1f1ad75e1ed4860d9ab15d1e5ffec691c04d1b797c238953290770b7313790ae3f1d +SHA512 (julia-1.0.4.tar.gz) = 30e534bf8481978516824ceb081cdfe5dc20ae1791e5909f8975b07163cca7ba10900af23c3a5030c16ac661b97fbcf39a1f1b74463244c70ef79ebe5ab3f4f3