1 |
commit: 922bc6021790baf5ca6cb2fd649167d58ba0cbda |
2 |
Author: Matthias Maier <tamiko <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Feb 24 02:07:29 2019 +0000 |
4 |
Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Feb 24 03:11:42 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=922bc602 |
7 |
|
8 |
dev-lang/julia: version bump to 1.1.0 |
9 |
|
10 |
Closes: https://bugs.gentoo.org/677524 |
11 |
Package-Manager: Portage-2.3.61, Repoman-2.3.12 |
12 |
Signed-off-by: Matthias Maier <tamiko <AT> gentoo.org> |
13 |
|
14 |
dev-lang/julia/Manifest | 2 +- |
15 |
dev-lang/julia/files/julia-1.1.0-fix_llvm_install.patch | 15 +++++++++++++++ |
16 |
.../julia/{julia-1.1.0_rc1.ebuild => julia-1.1.0.ebuild} | 3 ++- |
17 |
3 files changed, 18 insertions(+), 2 deletions(-) |
18 |
|
19 |
diff --git a/dev-lang/julia/Manifest b/dev-lang/julia/Manifest |
20 |
index 7ce323c26a2..f102e3c0a1e 100644 |
21 |
--- a/dev-lang/julia/Manifest |
22 |
+++ b/dev-lang/julia/Manifest |
23 |
@@ -1,5 +1,5 @@ |
24 |
DIST julia-1.0.3.tar.gz 7460268 BLAKE2B d9d42e0235f249fa8c1ced12c659091b97d338ec4a4662ea13ea6a107cb59e90d8385c51962199e47dae5f9770156be2db2d8bb2e3cc8f42aa7403b4f4ca7f04 SHA512 b61399c7b7ffae828264a6ec916b409b2cbc6b3b98d9a6d39b60b014a97a1f1ad75e1ed4860d9ab15d1e5ffec691c04d1b797c238953290770b7313790ae3f1d |
25 |
-DIST julia-1.1.0-rc1.tar.gz 7672785 BLAKE2B 3c49e189bec2da8d6d3f4c689600aa42e8092fe4343175981f8d998407bc6ef6c1bee20d579dc21594c2e9f9469898fc59d28807202b394cf64678b497037e0e SHA512 ceba088ef7abe103a34b1eb6f3b9660165bac038e62d4def22ba207c1c6fddb8a90625b3aa967c32dcad5c24dd83a8f25781347fc8b4078f40dcdffd07b554ce |
26 |
+DIST julia-1.1.0.tar.gz 7681396 BLAKE2B 2038901132bab1ae5ea634e15de2e18771e250c77e967228858f078a6e44e3f1900c1ea464b5db762842f65c4ad8590b70ba6b0b267bf955e86fa7f16a812696 SHA512 da546430df5a9207926faa3fe7b1d2c193a1223a379ce1ff25219c6f4f2d650497d1b0e9091f1cd542fa19bfcf7bf1ee74a52f7d45a06fd8ab4441a5ac4d4a46 |
27 |
DIST julia-dsfmt-2.2.3.tar.gz 291773 BLAKE2B 6ffae90494d72527920c80fc0fb005da1c7b84f8a03a7ecb0789434c0fff97359e5098e85431896dffccc7d5148c414e847aaba5feef648b8788421a466ff65e SHA512 6d8ddcd01aab3f9039f4f0288a8af53e290cc2f293ed8c4a8c9f3b3f12398e7eedfce8016117b425766ba89c61c86c13b3e420035b5f9bf91315b8b814c03662 |
28 |
DIST julia-libuv-2348256acf5759a544e5ca7935f638d2bc091d60.tar.gz 1555710 BLAKE2B 31ce57d23765c142799dd985a5511751d63238cf7e082fd1ad5574bf62201e9d6cb53b8da5dcc724765ccb4abd63da3ca6d6cbd45e078310c2ffa3859d09b8e4 SHA512 c8bf3c736a60feb0c6994aa7cd1b80e1a45bd6096aa66db320ddfc27b59a0797d303338ea75978619173e4f0a680254f3db29c9f6d1b84361030cc11c7729c98 |
29 |
DIST julia-libuv-ed3700c849289ed01fe04273a7bf865340b2bd7e.tar.gz 1492695 BLAKE2B ad03512dd1db2c7066b46b5a3a314645b925481d8ace09ac0a0ae23cf5b8a64338ad457f8df229aa82f1d45605b5366883f563f2e22756ce28bb6fb7607d7124 SHA512 1305035b1372bdf234e3c5e673ee4c8ab5bda83ff06bc27704786def52667c3143fe587fca8f6e0855ba0c8b6d4dd90b2faefd33736224173f459d751885683e |
30 |
|
31 |
diff --git a/dev-lang/julia/files/julia-1.1.0-fix_llvm_install.patch b/dev-lang/julia/files/julia-1.1.0-fix_llvm_install.patch |
32 |
new file mode 100644 |
33 |
index 00000000000..9cb75188b96 |
34 |
--- /dev/null |
35 |
+++ b/dev-lang/julia/files/julia-1.1.0-fix_llvm_install.patch |
36 |
@@ -0,0 +1,15 @@ |
37 |
+--- a/deps/llvm.mk 2019-02-09 10:09:30.102927517 +0300 |
38 |
++++ b/deps/llvm.mk 2019-02-09 10:10:51.479924878 +0300 |
39 |
+@@ -464,10 +464,11 @@ |
40 |
+ |
41 |
+ $(build_prefix)/manifest/llvm: | $(llvm_python_workaround) |
42 |
+ |
43 |
++# unset DESTDIR to fix https://github.com/JuliaLang/julia/issues/23462 |
44 |
+ LLVM_INSTALL = \ |
45 |
+ cd $1 && mkdir -p $2$$(build_depsbindir) && \ |
46 |
+ cp -r $$(LLVM_SRC_DIR)/utils/lit $2$$(build_depsbindir)/ && \ |
47 |
+- $$(CMAKE) -DCMAKE_INSTALL_PREFIX="$2$$(build_prefix)" -P cmake_install.cmake |
48 |
++ DESTDIR="" $$(CMAKE) -DCMAKE_INSTALL_PREFIX="$2$$(build_prefix)" -P cmake_install.cmake |
49 |
+ ifeq ($(OS), WINNT) |
50 |
+ LLVM_INSTALL += && cp $2$$(build_shlibdir)/LLVM.dll $2$$(build_depsbindir) |
51 |
+ endif |
52 |
|
53 |
diff --git a/dev-lang/julia/julia-1.1.0_rc1.ebuild b/dev-lang/julia/julia-1.1.0.ebuild |
54 |
similarity index 98% |
55 |
rename from dev-lang/julia/julia-1.1.0_rc1.ebuild |
56 |
rename to dev-lang/julia/julia-1.1.0.ebuild |
57 |
index 36db882f1ed..02a71cbbd68 100644 |
58 |
--- a/dev-lang/julia/julia-1.1.0_rc1.ebuild |
59 |
+++ b/dev-lang/julia/julia-1.1.0.ebuild |
60 |
@@ -27,7 +27,7 @@ SRC_URI=" |
61 |
|
62 |
LICENSE="MIT" |
63 |
SLOT="0" |
64 |
-KEYWORDS="" |
65 |
+KEYWORDS="~amd64 ~x86" |
66 |
IUSE="" |
67 |
|
68 |
RDEPEND+=" |
69 |
@@ -61,6 +61,7 @@ DEPEND="${RDEPEND} |
70 |
|
71 |
PATCHES=( |
72 |
"${FILESDIR}"/${PN}-1.1.0-fix_build_system.patch |
73 |
+ "${FILESDIR}"/${PN}-1.1.0-fix_llvm_install.patch |
74 |
) |
75 |
|
76 |
S="${WORKDIR}/${PN}-${MY_PV}" |