The package rpms/julia.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/julia.git/commit/?id=ff60616584ab....
Change:
+ExcludeArch: s390x ppc64le
Thanks.
Full change:
============
commit ff60616584abc5d3d3a22ec3d7d06b9c19e7eceb
Author: Milan Bouchet-Valat <nalimilan(a)club.fr>
Date: Wed Jan 23 15:53:51 2019 +0100
Exclude PPC64le
This architecture isn't supported upstream and fails to build
in the latest release.
diff --git a/julia.spec b/julia.spec
index 7b79ffa..58d6f6d 100644
--- a/julia.spec
+++ b/julia.spec
@@ -74,7 +74,8 @@ BuildRequires: utf8proc-devel >= 2.1
BuildRequires: zlib-devel
Requires: julia-common = %{version}-%{release}
#
https://bugzilla.redhat.com/show_bug.cgi?id=1158026
-ExcludeArch: s390x
+#
https://github.com/JuliaLang/julia/issues/30087
+ExcludeArch: s390x ppc64le
%description
Julia is a high-level, high-performance dynamic programming language
commit da79329e8b1ad8e57d1d25f65511fddf731ad74f
Author: Milan Bouchet-Valat <nalimilan(a)club.fr>
Date: Wed Jan 23 09:38:16 2019 +0100
New upstream release 1.1.0
diff --git a/.gitignore b/.gitignore
index a38f9b3..ccef211 100644
--- a/.gitignore
+++ b/.gitignore
@@ -45,3 +45,7 @@
/julia-1.0.2.tar.gz
/Pkg-d305e82fd353cb67e8a064800b9972ee1cb7b5e0.tar.gz
/julia-1.0.3.tar.gz
+/julia-1.1.0.tar.gz
+/libuv-2348256acf5759a544e5ca7935f638d2bc091d60.tar.gz
+/llvm-6.0.1.src.tar.xz
+/Pkg-853b3f1fd9895db32b402d89e9dee153b66b2316.tar.gz
diff --git a/julia.spec b/julia.spec
index c50d75e..7b79ffa 100644
--- a/julia.spec
+++ b/julia.spec
@@ -1,7 +1,7 @@
-%global uvcommit ed3700c849289ed01fe04273a7bf865340b2bd7e
-%global uvversion 1.9.0
+%global uvcommit 2348256acf5759a544e5ca7935f638d2bc091d60
+%global uvversion 2.0.0
-%global llvmversion 6.0.0
+%global llvmversion 6.0.1
%global mpfrversion 4.0.1
@@ -12,7 +12,7 @@
%global libwhichcommit 81e9723c0273d78493dc8c8ed570f68d9ce7e89e
-%global pkgcommit d305e82fd353cb67e8a064800b9972ee1cb7b5e0
+%global pkgcommit 853b3f1fd9895db32b402d89e9dee153b66b2316
%global __provides_exclude_from ^%{_libdir}/%{name}/.*\\.so$
# List all bundled libraries here
@@ -21,7 +21,7 @@
%global __requires_exclude ^(%{_privatelibs})$
Name: julia
-Version: 1.0.3
+Version: 1.1.0
Release: 1%{?dist}
Summary: High-level, high-performance dynamic language for technical computing
Group: Development/Languages
@@ -40,7 +40,6 @@ Source6:
http://faculty.cse.tamu.edu/davis/SuiteSparse/SuiteSparse-%{suit
Source7:
https://api.github.com/repos/JuliaLang/Pkg.jl/tarball/%{pkgcommit}#/Pkg-%...
Patch0: julia_unwind_version.patch
Patch1: llvm-julia-installdirs-64.patch
-Patch2: julia-suitesparse.patch
Provides: bundled(libuv) = %{uvversion}
Provides: bundled(llvm) = %{llvmversion}
Provides: bundled(mpfr) = %{mpfrversion}
@@ -128,7 +127,6 @@ Julia into external programs or debugging Julia itself.
%if 0%{?__isa_bits} == 64
patch -p1 < %PATCH1
- patch -p1 < %PATCH2
%endif
mkdir -p deps/srccache stdlib/srccache
@@ -234,14 +232,6 @@ make %{commonopts} test
%install
make %{commonopts} DESTDIR=%{buildroot} install
-# Julia creates links for all needed libraries, but openlibm is missing
-#
https://github.com/JuliaLang/julia/pull/24796/#discussion_r214538236
-pushd %{buildroot}%{_libdir}/julia
- ln -s %{_libdir}/libopen$(readelf -d %{_libdir}/libopenlibm.so | sed -n
'/SONAME/s/.*\(lib[^ ]*\.so\.[0-9]*\).*/\1/p') libopenlibm.so
- # Raise an error in case of failure
- realpath -e libopenlibm.so
-popd
-
cp -p CONTRIBUTING.md LICENSE.md NEWS.md README.md %{buildroot}%{_docdir}/julia/
pushd %{buildroot}%{_prefix}/share/man/man1/
@@ -327,6 +317,9 @@ exit 0
/usr/bin/gtk-update-icon-cache %{_datarootdir}/icons/hicolor &>/dev/null || :
%changelog
+* Tue Jan 22 2019 Milan Bouchet-Valat <nalimilan(a)club.fr> - 1.1.0-1
+- New upstream release.
+
* Wed Dec 19 2018 Milan Bouchet-Valat <nalimilan(a)club.fr> - 1.0.3-1
- New upstream release.
diff --git a/julia_unwind_version.patch b/julia_unwind_version.patch
index ba91eaa..af78c76 100644
--- a/julia_unwind_version.patch
+++ b/julia_unwind_version.patch
@@ -1,13 +1,13 @@
diff --git a/src/julia_internal.h b/src/julia_internal.h
-index 186b5d7b2b..2d08a358b4 100644
+index af463a86fc..a811965b41 100644
--- a/src/julia_internal.h
+++ b/src/julia_internal.h
-@@ -623,12 +623,7 @@ extern volatile int jl_in_stackwalk;
+@@ -619,12 +619,7 @@ extern volatile int jl_in_stackwalk;
# include <libunwind.h>
typedef unw_context_t bt_context_t;
typedef unw_cursor_t bt_cursor_t;
-# if (!defined(SYSTEM_LIBUNWIND) || UNW_VERSION_MAJOR > 1 || \
-- (UNW_VERSION_MAJOR == 1 && UNW_VERSION_MINOR > 1))
+- (UNW_VERSION_MAJOR == 1 && UNW_VERSION_MINOR != 0 &&
UNW_VERSION_MINOR != 1))
-// Enable our memory manager only for libunwind with our patch or
-// on a newer release
-# define JL_UNW_HAS_FORMAT_IP 1
@@ -16,4 +16,3 @@ index 186b5d7b2b..2d08a358b4 100644
#else
// Unwinding is disabled
typedef int bt_context_t;
-
diff --git a/llvm-julia-installdirs-64.patch b/llvm-julia-installdirs-64.patch
index aabdf5b..92d578e 100644
--- a/llvm-julia-installdirs-64.patch
+++ b/llvm-julia-installdirs-64.patch
@@ -1,12 +1,12 @@
diff --git a/deps/llvm.mk b/deps/llvm.mk
-index 4f350aa443..3449605f1f 100644
+index c516b577f6..3ebb5024da 100644
--- a/deps/llvm.mk
+++ b/deps/llvm.mk
-@@ -70,6 +70,7 @@ ifeq ($(USE_POLLY_ACC),1)
- LLVM_CMAKE += -DPOLLY_ENABLE_GPGPU_CODEGEN=ON
+@@ -72,6 +72,7 @@ LLVM_CMAKE += -DPOLLY_ENABLE_GPGPU_CODEGEN=ON
endif
LLVM_CMAKE += -DLLVM_TOOLS_INSTALL_DIR=$(shell $(JULIAHOME)/contrib/relative_path.sh
$(build_prefix) $(build_depsbindir))
+ LLVM_CMAKE += -DLLVM_UTILS_INSTALL_DIR=$(shell $(JULIAHOME)/contrib/relative_path.sh
$(build_prefix) $(build_depsbindir))
+LLVM_CMAKE += -DLLVM_LIBDIR_SUFFIX=64
+ LLVM_CMAKE += -DLLVM_INCLUDE_UTILS=ON -DLLVM_INSTALL_UTILS=ON
LLVM_CMAKE += -DLLVM_BINDINGS_LIST="" -DLLVM_INCLUDE_DOCS=Off
-DLLVM_ENABLE_TERMINFO=Off -DHAVE_HISTEDIT_H=Off -DHAVE_LIBEDIT=Off
ifeq ($(LLVM_ASSERTIONS), 1)
- LLVM_CMAKE += -DLLVM_ENABLE_ASSERTIONS:BOOL=ON
diff --git a/sources b/sources
index c822122..dbe0b7d 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 (libuv-2348256acf5759a544e5ca7935f638d2bc091d60.tar.gz) =
c8bf3c736a60feb0c6994aa7cd1b80e1a45bd6096aa66db320ddfc27b59a0797d303338ea75978619173e4f0a680254f3db29c9f6d1b84361030cc11c7729c98
+SHA512 (llvm-6.0.1.src.tar.xz) =
cbbb00eb99cfeb4aff623ee1a5ba075e7b5a76fc00c5f9f539ff28c108598f5708a0369d5bd92683def5a20c2fe60cab7827b42d628dbfcc79b57e0e91b84dd9
SHA512 (mpfr-4.0.1.tar.bz2) =
c1674fc0a5edcde188bdf7d6d14063cfb4f1259b9eaf39d0081f7176e9921ca0af1b12b7aba1a9560d9f2d5f37329d22bc7b82f13421d91d83114b439bc60dcc
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 (Pkg-853b3f1fd9895db32b402d89e9dee153b66b2316.tar.gz) =
f81ef6ec68b190d18a28562c4d2507b393b5f9d09d900fa682ab876564908c7700c282343e568fed66703ddc9a12ab0a425f70e5fe705002b2da6397274b30f8
+SHA512 (julia-1.1.0.tar.gz) =
da546430df5a9207926faa3fe7b1d2c193a1223a379ce1ff25219c6f4f2d650497d1b0e9091f1cd542fa19bfcf7bf1ee74a52f7d45a06fd8ab4441a5ac4d4a46