commit: 207238d237a0374f91066b624077076a37d9ec4d Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Fri Oct 28 10:41:51 2022 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Fri Oct 28 10:41:51 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=207238d2
dev-lang/julia: drop 1.7.1-r4, 1.7.3 Signed-off-by: Sam James <sam <AT> gentoo.org> dev-lang/julia/Manifest | 19 -- .../julia/files/julia-1.4.0-no_symlink_llvm.patch | 10 -- dev-lang/julia/files/julia-1.6.5-libgit-1.2.patch | 17 -- dev-lang/julia/files/julia-1.6.5-libgit-1.4.patch | 43 ----- .../files/julia-1.6.5-llvm_13_compat_part_1.patch | 172 ------------------ .../files/julia-1.6.5-llvm_13_compat_part_2.patch | 80 --------- .../files/julia-1.6.5-make-install-no-build.patch | 17 -- .../julia/files/julia-1.7.1-do_not_set_rpath.patch | 11 -- .../julia/files/julia-1.7.1-hardcoded-libs.patch | 72 -------- dev-lang/julia/julia-1.7.1-r4.ebuild | 186 ------------------- dev-lang/julia/julia-1.7.3.ebuild | 199 --------------------- 11 files changed, 826 deletions(-) diff --git a/dev-lang/julia/Manifest b/dev-lang/julia/Manifest index e2912fffc6ed..418faba58f13 100644 --- a/dev-lang/julia/Manifest +++ b/dev-lang/julia/Manifest @@ -1,15 +1,3 @@ -DIST julia-1.7.1-full.tar.gz 255682275 BLAKE2B 923cd1ed735f1ff5537ff8655ba5b63cc8d27a9b36ba05f3942447bea67034ad771ca8f69192ca7718ab3aace5d12c0e08961eafead9aedb9af35e2d212e8e97 SHA512 df6c9d33ed69c1b53a7f77f95954d4ed5fadb176ebf9f490e7721bc036109edfaa5873ce9041620af1d5c3731db7acc5af932b4173ce54bcc7ae3d7c9c393638 -DIST julia-1.7.1-llvm_13_compat_part_3.patch 28006 BLAKE2B b1909fd6df1ac51e7e2d16279ff5ed2febe27967832ddbb9517372dcb41597f7ba9fa6013d65fdbdaf345b5c32fdf90f60c086afcdf6b793172061fe63263b0f SHA512 d251d5fbc088aa03e2c423926fa9f82a8a29a995e20150f27bf01ea9209008259f97daf27c333686b62412190fa4077cca178ce39bb6c7bd4e3e8b4f2affa22f -DIST julia-1.7.1-llvm_13_compat_part_4.patch 11421 BLAKE2B ca4f3e2c6b60462f7f04f609be07f95b81fe076350167de3354cf5c0fb98d3f1b5a5b2d275da8074a077be3edbb8544a3403a080dc1ca0dbe827dde96c61f5f2 SHA512 5cd709b24a6e00f67998efcc21d77b710399f1bf96e7656b3c90a2cc564bcf05e2e1012b788751d48ff7964fb6be2af710d850c34e83532976addecae4db1969 -DIST julia-1.7.1-llvm_13_compat_part_5.patch 27094 BLAKE2B b70a96c4f897349dce04246335bc38a6726e02a43cd5a28bc31bfcb9190f5361e2e4d16a9fb5c1b3c0e53d2e59f5380b161350968f9479cdb765b4681b9f5743 SHA512 efd1029d0030417082b7d640b2e4b7bb35818d555c808bceb9a31e5d93b2f27a8ca11b9228cf4129b5bee411e1fe9e4ce4e7515226ceab905532d1875e260f7c -DIST julia-1.7.3-full.tar.gz 256584516 BLAKE2B d9520de2a85566cfe02ac471061b6cc255e1ab67039387d4ebda3438b67990cbd0e9e1a17865995f48e537b21fc63be6ff376f3989ff50396ab339df0021a074 SHA512 0286a3f8ecb469eb09690a7723aac267a7655247648a3099115e0dc0531d2f779f2aac6e829d9781f462887de281a78c29d99a986b3c3db8c0b0d565ee31f0df -DIST julia-1.7.3-llvm_13_compat_part_1.patch 6741 BLAKE2B fd61ed4990128150221f2d348bd5cdf953f1b83ddad8a3920dce44249265471854eda513f3cb5a9f641bac201eec70d08c071d31c56d60592dffd8d17b94ddfe SHA512 d8872bbc123e16daa360cbc7f586f2f610bb0d928d9390b41c4f68d9dbba8a945693756b44dd8e960c8feae22ba0f5b50a7ce33157e1e82d8e1a8f2c999e7141 -DIST julia-1.7.3-llvm_13_compat_part_2.patch 2673 BLAKE2B 14d292029ca8312ae2d6729b2c5697b2b0ec065e43475b0939961586455988aec573ece8685f8150b0e27a388b39c6ed05e822a1c931a8192d4651958de86b05 SHA512 98643ac351a45c6bb1c2f945fb1e46db98c8658625731048e7cfc76684db8b1c219b53c6c230ca1da8dc07139fb1db1602f756b94e91655c6248541510d0c2ee -DIST julia-1.7.3-llvm_13_compat_part_3.patch 28024 BLAKE2B bffa797f92425eb22f64861e13c2ac9d311434b3727acc8268247bf131e7654c154fd3cc6f7966b3fabc86d56ed0f65b46ea178a2e87cd47f56675af739ee01a SHA512 45231605f4c89ad7faab5564f0c9ea67ebb86ff32d8adffd68ba632668b8adb4185e15351a5714de07495908e059731b702e3c202e043cb9cac252285cd21a0b -DIST julia-1.7.3-llvm_13_compat_part_4.patch 2425 BLAKE2B 9440296aa9669c44f23757f24f5e098353171e2747c24220a3ab6f5fdd9bd3915975dc24e7e19a3441a17555858cff7cfbc678a8a6d7e0894a604e7d699cb6cb SHA512 7e5a5fcd5b18086fbd638cdf98c13d8954bb8716e60ed6ae613b072e4ec8e406abe5a7ba29db488c34a97ecdd2932ddb2e827949191407aead202221bacf736f -DIST julia-1.7.3-llvm_13_compat_part_5.patch 11421 BLAKE2B ca4f3e2c6b60462f7f04f609be07f95b81fe076350167de3354cf5c0fb98d3f1b5a5b2d275da8074a077be3edbb8544a3403a080dc1ca0dbe827dde96c61f5f2 SHA512 5cd709b24a6e00f67998efcc21d77b710399f1bf96e7656b3c90a2cc564bcf05e2e1012b788751d48ff7964fb6be2af710d850c34e83532976addecae4db1969 -DIST julia-1.7.3-llvm_13_compat_part_6.patch 27063 BLAKE2B 3878cba37be6f270a1ba240b22bea65c2c0efe77b0d415cc47370f234c8d26f01c66bec4b01824472926ba231a8881deadb21006efe6fa6c5bf6fd6250933a0b SHA512 7c27b4b49465a4fbe206c1e9ba6c48d74264124a866fb414bb698cab151a9e1fb7180c7e07c0bc843d4817e9e99cbd70b35c2906384503d44ab7051ebb1948fe -DIST julia-1.7.3_Downloads.jl_1.5.3.tar.gz 23484 BLAKE2B cebdc572a10faadf4aa673da2c9cd364ddc76b6299c3d0eaaa54014e199f9c0002188d6281dc4935c2be1f32ffcddc6b98f19f07ea488466fa7ae66db55fa23a SHA512 ec895ebe2b96d8590f34c152d3b4963531250b254c96fadffeee8b2cec132c20ce42d585839a2304dc1a30b13b1cbebcfa88b021b3646a77162a1476ec1d8f16 DIST julia-1.8.0-074d761f.patch 2198 BLAKE2B 7d4b147e290defceaad1b5b6d0c2c9a323b47d685bb1865b23c84aa68135c00104e653a5046d276aa540415ee4c95426f1a4538df3ba0ae4c348966a2f2b1742 SHA512 ff1e23746851b1b7a4480df75815abb35ccc8006f622acb5fb3928e20832cf55022c96650590c8dfea9b39185a3284a0d1310dee3f439429c91e00af567b66f1 DIST julia-1.8.0-ed9851b0.patch 6957 BLAKE2B f40a56bf3b00cc8d0a764ce7d9ef75b6e5dbab70aa13aad810e7288c4b1b0609ee61b1c6661a4d34423c5f25b19c56b326fa0ae520f1310c673d2c0921e4dabb SHA512 a4b6ee8b80639e74185ddaf8567b81eaee18efef02003e254b5e31268f730e022dcb1a53d8595a82570303b5f57ea885ca86374ca5eb7c0b2b270a5c104b79b5 DIST julia-1.8.0-julia-hardcoded-libs.patch 2411 BLAKE2B d71683c68c350c16c61c13e0378072a7689cb6e07ab7d4b940a5049f37ec58d8f4061b94ba5ba3d2dcf73a403b34d5fbe92bb723a0c5a2c318f9c3bd3631f143 SHA512 0256c5af1713b3551b39e0d89168eafb235e6337a9f07efd24a2e271a11bf724295d0a46761bf1a4d3ed14c4539ef1ef56adcf5580879cac268867aac3e2c20e @@ -18,10 +6,3 @@ DIST julia-1.8.0-julia-llvm-14.patch 882 BLAKE2B f46f02554a6fc997763d368b813298d DIST julia-1.8.0-julia-system-cblas.patch 4078 BLAKE2B 58aac552ea63859a03fe24fed69c02f9968aa7924abe2ffdf9e33e965d64877206216f1604f28fc67739cada4b5ce7b508feaad18080e3a5e78d89447d0f2a05 SHA512 d4b437da35672aa0b9f371da66a8675ca5be28276886edafb3566c3ea0d0ed8ed2bac192b43a0d292ee4f2754b596b7b79de76f136cfcada9916ff94a544b372 DIST julia-1.8.0-make-install-no-build.patch 555 BLAKE2B 36a86c3dd281a85f1b1fd68ac9796e70b06bb6afe3140fed97b5c7cd4b24987dc75709c4b1b192d5663c4d704cfb9818ec8d895c293b9b0bd741a3a61c860e47 SHA512 97687d24a3aa0a39994a691026981a91496cd2a82112e9acf9a8edd0f7c2a50d946944e8af495a3b1703f397c7a0e620be76dc28f3bbe14357ee8c4a68a5a3bc DIST julia-1.8.2-full.tar.gz 275255487 BLAKE2B dd4cb035c3ec3b37fd08215baa76764c2a447ec50f0afbec5e6c02b047e62188015ba1492704fbc31081465f3837d6b8e02b31cfe10239ddd31e80e4bd7121e8 SHA512 0660911bbd9b0e0df9e6c2af851e7119b6067b08c845422e44101b9a92a1cbc069e52838f503b06f64db5b282cde1b533aafd9c6f47d349ae7d2beb48cf7d7a6 -DIST julia-hardcoded-libs.patch 2411 BLAKE2B 54eb1d0bbf15bbeea723c32c8ddbb42d3e3fbd22c6d8e2fa4c660d857bc8b6b131f442065689fd1a70c09563ef5c9efa7cb8ff9493ea6b3ed9ec7b05a9cc042e SHA512 4a35a80592c64c8e8924d381b9405283c3c5447ea201715acdcb4e7f6be0560655b0f816fa05127b7df6f9154a74224960aba57b291bd3a8431174eb13c7610e -DIST julia-libblastrampoline-4.patch 856 BLAKE2B 5efe1602022eaaadb5f6ed06edd5f9e30e19978c5c469f1619efbcc4604efa3f0cd42bb80ba7cf903a89edbabeefca06bf7f5efe78510b6feea5e188655ad456 SHA512 62097e29865a0d4a633974a3ca4ea35623a6de08d8c63316896cdd95844a394302ad892121ec85d8b2a9ca305dff3123cd01e4b7a27b97beb5da36cbe4cd3fa3 -DIST julia-libgit-1.2.patch 17322 BLAKE2B 163ca3dc12e6e654962afc781ef7ae57ea0a74a13d72e40a2944ac6b9ad688467fea2df603f0b5509bd882406c81742ae168a80ae312dea5e7188a3c96996772 SHA512 59688c5f6437fd745e3a37bc8387678a18e7d4ed223907456a426a55f1daaa747b70e2b7907975e4e1af4c32b535d91f1e2685416c4d811aed2f4b6ce5f3bc36 -DIST julia-libgit-1.4.patch 1631 BLAKE2B 0f13c696c9a5067dabf38e65a2c315a0f8bb7e9dfc4ed9f0267b2a0161296aae4b10be833d6d6da2e0ee2c3917b5cf79e438f96232a5c93b15358a984b23ee4a SHA512 044b1fdc31a767c36b8df1f0582f64051450903be4a4ab668d8b7a8c666be800a51250825d807a4503594b73bb5c2e4e9eef4c61363a1484f328138a1871ff60 -DIST julia-libunwind-1.6.patch 778 BLAKE2B 26fcac25c3a906ecbb29e54354fad919c12e2cbd7f8b2a2fc696a495050de1f47ed83ccee2ae8a92c82f51e57319dfc4e8a672a3e6af8e32af6bc2d056bd6813 SHA512 e43119ea9fded88e9ed1c85c3d47dfd62771884d29e409f91779b6db9557f6f1af840b719ee879eda8929cfd53fd9e9b34eb0cac7e9ab6a3f3032edf3e50ca3a -DIST julia-system-cblas.patch 4816 BLAKE2B f5f56cf6a5c4919f002da4865e51022e738fabaf50a537c9e79771c6f3bbfe46333eafa224172008812500169370cdcf8b39464483c8cf7a5c5e8b00257ea162 SHA512 2c5a1818cad8eb5e7ae5d112bbd2f1f3c74fc12ac2ae0325be9e4d2baa016c7a64e02c937014e7b043be3efdb5eac2188919f4aaf58f0f88abc44a455ec9bcc3 -DIST make-install-no-build.patch 555 BLAKE2B b49576a9b4fa49ba46f871e774a72f1b78ed37a4cb9be47655617b30e251ce2ef7b4236b045c271be3f3c00b9bd2b907281040658a2068ca986f84a80f5fc141 SHA512 8cb54dc9aac12450cc9d5041b1c4ea9a2b7ddb3c73533d58ce5e78e0547f36ac77f04576e28e15769d73ed02fcdfcd90a9036816fa8a669b2210332f972ee15f diff --git a/dev-lang/julia/files/julia-1.4.0-no_symlink_llvm.patch b/dev-lang/julia/files/julia-1.4.0-no_symlink_llvm.patch deleted file mode 100644 index 1b6371b120d9..000000000000 --- a/dev-lang/julia/files/julia-1.4.0-no_symlink_llvm.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/base/Makefile 2019-11-17 14:07:20.000000000 -0500 -+++ b/base/Makefile 2020-03-28 20:38:40.041571679 -0400 -@@ -223,7 +223,7 @@ - ln -sf "$$REALPATH" "$@" - ifneq ($(USE_SYSTEM_LLVM),0) - ifneq ($(USE_LLVM_SHLIB),0) --SYMLINK_SYSTEM_LIBRARIES += symlink_libLLVM -+#SYMLINK_SYSTEM_LIBRARIES += symlink_libLLVM - endif - endif diff --git a/dev-lang/julia/files/julia-1.6.5-libgit-1.2.patch b/dev-lang/julia/files/julia-1.6.5-libgit-1.2.patch deleted file mode 100644 index f0abc7b8f60d..000000000000 --- a/dev-lang/julia/files/julia-1.6.5-libgit-1.2.patch +++ /dev/null @@ -1,17 +0,0 @@ -This patch comes from - https://raw.githubusercontent.com/archlinux/svntogit-community/packages/julia/trunk/julia-libgit-1.2.patch - -diff --git a/stdlib/LibGit2/src/types.jl b/stdlib/LibGit2/src/types.jl -index 9ffcaa3646..5f571e7b26 100644 ---- a/stdlib/LibGit2/src/types.jl -+++ b/stdlib/LibGit2/src/types.jl -@@ -230,6 +230,9 @@ Matches the [`git_remote_callbacks`](https://libgit2.org/libgit2/#HEAD/type/git_ - push_update_reference::Ptr{Cvoid} = C_NULL - push_negotiation::Ptr{Cvoid} = C_NULL - transport::Ptr{Cvoid} = C_NULL -+ @static if LibGit2.VERSION >= v"1.2.0" -+ remote_ready::Ptr{Cvoid} = C_NULL -+ end - payload::Any = nothing - @static if LibGit2.VERSION >= v"0.99.0" - resolve_url::Ptr{Cvoid} = C_NULL diff --git a/dev-lang/julia/files/julia-1.6.5-libgit-1.4.patch b/dev-lang/julia/files/julia-1.6.5-libgit-1.4.patch deleted file mode 100644 index fe753c0cd0e4..000000000000 --- a/dev-lang/julia/files/julia-1.6.5-libgit-1.4.patch +++ /dev/null @@ -1,43 +0,0 @@ -This patch comes from: - https://github.com/archlinux/svntogit-community/blob/packages/julia/trunk/julia-libgit-1.4.patch - -diff --git a/stdlib/LibGit2/src/consts.jl b/stdlib/LibGit2/src/consts.jl -index 2bc9edaf89..55887ebe2a 100644 ---- a/stdlib/LibGit2/src/consts.jl -+++ b/stdlib/LibGit2/src/consts.jl -@@ -247,6 +247,11 @@ const RESET_HARD = Cint(3) # MIXED plus changes in working tree discarded - REBASE_OPERATION_FIXUP = Cint(4), - REBASE_OPERATION_EXEC = Cint(5)) - -+# git_remote_redirect_t -+const GIT_REMOTE_REDIRECT_NONE = Cint(0) -+const GIT_REMOTE_REDIRECT_INITIAL = Cint(1) -+const GIT_REMOTE_REDIRECT_ALL = Cint(2) -+ - # fetch_prune - const FETCH_PRUNE_UNSPECIFIED = Cint(0) - const FETCH_PRUNE = Cint(1) -diff --git a/stdlib/LibGit2/src/types.jl b/stdlib/LibGit2/src/types.jl -index 9ffcaa3646..98d938df65 100644 ---- a/stdlib/LibGit2/src/types.jl -+++ b/stdlib/LibGit2/src/types.jl -@@ -343,6 +343,9 @@ The fields represent: - @static if LibGit2.VERSION >= v"0.25.0" - proxy_opts::ProxyOptions = ProxyOptions() - end -+ @static if LibGit2.VERSION >= v"1.4.0" -+ follow_redirects::Cint = Consts.GIT_REMOTE_REDIRECT_INITIAL -+ end - @static if LibGit2.VERSION >= v"0.24.0" - custom_headers::StrArrayStruct = StrArrayStruct() - end -@@ -674,6 +677,9 @@ The fields represent: - @static if LibGit2.VERSION >= v"0.25.0" - proxy_opts::ProxyOptions = ProxyOptions() - end -+ @static if LibGit2.VERSION >= v"1.4.0" -+ follow_redirects::Cint = Consts.GIT_REMOTE_REDIRECT_INITIAL -+ end - @static if LibGit2.VERSION >= v"0.24.0" - custom_headers::StrArrayStruct = StrArrayStruct() - end diff --git a/dev-lang/julia/files/julia-1.6.5-llvm_13_compat_part_1.patch b/dev-lang/julia/files/julia-1.6.5-llvm_13_compat_part_1.patch deleted file mode 100644 index 1398be7ec873..000000000000 --- a/dev-lang/julia/files/julia-1.6.5-llvm_13_compat_part_1.patch +++ /dev/null @@ -1,172 +0,0 @@ -This patch is from the julialang repository: - https://github.com/JuliaLang/julia/commit/677ce6d3.patch -but reference comes form ARCH Linux juia package - https://github.com/archlinux/svntogit-community/tree/packages/julia/trunk - -From 677ce6d3adc2f70886f72795b0e5c739e75730ee Mon Sep 17 00:00:00 2001 -From: Valentin Churavy <[email protected]> -Date: Sat, 28 Aug 2021 16:48:32 +0200 -Subject: [PATCH] [LLVM] Adapt to LLVM 13 changes - ---- - src/cgutils.cpp | 8 +++++++- - src/codegen.cpp | 2 +- - src/disasm.cpp | 8 ++++++++ - src/jitlayers.cpp | 7 +++++++ - src/llvm-late-gc-lowering.cpp | 5 +++-- - src/llvm-multiversioning.cpp | 5 +++++ - src/llvm-remove-addrspaces.cpp | 8 ++++++++ - 7 files changed, 39 insertions(+), 4 deletions(-) - -diff --git a/src/cgutils.cpp b/src/cgutils.cpp -index 4e9917b6b078..928e1a07b2f1 100644 ---- a/src/cgutils.cpp -+++ b/src/cgutils.cpp -@@ -2757,8 +2757,14 @@ static jl_value_t *static_constant_instance(Constant *constant, jl_value_t *jt) - size_t nargs; - if (const auto *CC = dyn_cast<ConstantAggregate>(constant)) - nargs = CC->getNumOperands(); -- else if (const auto *CAZ = dyn_cast<ConstantAggregateZero>(constant)) -+ else if (const auto *CAZ = dyn_cast<ConstantAggregateZero>(constant)) { -+#if JL_LLVM_VERSION >= 130000 -+ // SVE: Elsewhere we use `getMinKownValue` -+ nargs = CAZ->getElementCount().getFixedValue(); -+#else - nargs = CAZ->getNumElements(); -+#endif -+ } - else if (const auto *CDS = dyn_cast<ConstantDataSequential>(constant)) - nargs = CDS->getNumElements(); - else -diff --git a/src/codegen.cpp b/src/codegen.cpp -index 5cc9f66ffaef..9000513151fe 100644 ---- a/src/codegen.cpp -+++ b/src/codegen.cpp -@@ -7394,7 +7394,7 @@ static std::pair<std::unique_ptr<Module>, jl_llvm_functions_t> - #endif - continue; - } -- assert(find(pred_begin(PhiBB), pred_end(PhiBB), FromBB) != pred_end(PhiBB)); // consistency check -+ assert(std::find(pred_begin(PhiBB), pred_end(PhiBB), FromBB) != pred_end(PhiBB)); // consistency check - TerminatorInst *terminator = FromBB->getTerminator(); - if (!terminator->getParent()->getUniqueSuccessor()) { - // Can't use `llvm::SplitCriticalEdge` here because -diff --git a/src/disasm.cpp b/src/disasm.cpp -index 6157873ad71c..589f618396ea 100644 ---- a/src/disasm.cpp -+++ b/src/disasm.cpp -@@ -857,8 +857,16 @@ static void jl_dump_asm_internal( - assert(MRI && "Unable to create target register info!"); - - std::unique_ptr<MCObjectFileInfo> MOFI(new MCObjectFileInfo()); -+#if JL_LLVM_VERSION >= 130000 -+ MCSubtargetInfo *MSTI = TheTarget->createMCSubtargetInfo(TheTriple.str(), cpu, features); -+ assert(MSTI && "Unable to create subtarget info!"); -+ -+ MCContext Ctx(TheTriple, MAI.get(), MRI.get(), MSTI, &SrcMgr); -+ MOFI->initMCObjectFileInfo(Ctx, /* PIC */ false, /* LargeCodeModel */ false); -+#else - MCContext Ctx(MAI.get(), MRI.get(), MOFI.get(), &SrcMgr); - MOFI->InitMCObjectFileInfo(TheTriple, /* PIC */ false, Ctx); -+#endif - - // Set up Subtarget and Disassembler - std::unique_ptr<MCSubtargetInfo> -diff --git a/src/jitlayers.cpp b/src/jitlayers.cpp -index 60b1903aaa80..12497cadf491 100644 ---- a/src/jitlayers.cpp -+++ b/src/jitlayers.cpp -@@ -10,6 +10,9 @@ - #include <llvm/Analysis/TargetTransformInfo.h> - #include <llvm/ExecutionEngine/Orc/CompileUtils.h> - #include <llvm/ExecutionEngine/Orc/ExecutionUtils.h> -+#if JL_LLVM_VERSION >= 130000 -+#include <llvm/ExecutionEngine/Orc/ExecutorProcessControl.h> -+#endif - #include <llvm/Support/DynamicLibrary.h> - #include <llvm/Support/FormattedStream.h> - #include <llvm/Support/SmallVectorMemoryBuffer.h> -@@ -654,7 +657,11 @@ JuliaOJIT::JuliaOJIT(TargetMachine &TM, LLVMContext *LLVMCtx) - MemMgr(createRTDyldMemoryManager()), - JuliaListener(CreateJuliaJITEventListener()), - TSCtx(std::unique_ptr<LLVMContext>(LLVMCtx)), -+#if JL_LLVM_VERSION >= 130000 -+ ES(cantFail(orc::SelfExecutorProcessControl::Create())), -+#else - ES(), -+#endif - GlobalJD(ES.createBareJITDylib("JuliaGlobals")), - JD(ES.createBareJITDylib("JuliaOJIT")), - ObjectLayer( -diff --git a/src/llvm-late-gc-lowering.cpp b/src/llvm-late-gc-lowering.cpp -index 0aac7638be0d..db8b19bacea5 100644 ---- a/src/llvm-late-gc-lowering.cpp -+++ b/src/llvm-late-gc-lowering.cpp -@@ -709,7 +709,7 @@ void LateLowerGCFrame::LiftSelect(State &S, SelectInst *SI) { - else - Numbers[i] = Number; - } -- if (auto VTy = dyn_cast<VectorType>(SI->getType())) { -+ if (auto VTy = dyn_cast<FixedVectorType>(SI->getType())) { - if (NumRoots != Numbers.size()) { - // broadcast the scalar root number to fill the vector - assert(NumRoots == 1); -@@ -736,11 +736,12 @@ void LateLowerGCFrame::LiftPhi(State &S, PHINode *Phi) { - SmallVector<PHINode *, 2> lifted; - std::vector<int> Numbers; - unsigned NumRoots = 1; -- if (auto VTy = dyn_cast<VectorType>(Phi->getType())) { -+ if (auto VTy = dyn_cast<FixedVectorType>(Phi->getType())) { - NumRoots = VTy->getNumElements(); - Numbers.resize(NumRoots); - } - else { -+ // TODO: SVE - assert(isa<PointerType>(Phi->getType()) && "unimplemented"); - } - for (unsigned i = 0; i < NumRoots; ++i) { -diff --git a/src/llvm-multiversioning.cpp b/src/llvm-multiversioning.cpp -index 68081eb53d3a..a82600162fa9 100644 ---- a/src/llvm-multiversioning.cpp -+++ b/src/llvm-multiversioning.cpp -@@ -403,7 +403,12 @@ void CloneCtx::clone_function(Function *F, Function *new_f, ValueToValueMapTy &v - vmap[&*J] = &*DestI++; - } - SmallVector<ReturnInst*,8> Returns; -+#if JL_LLVM_VERSION >= 130000 -+ // We are cloning into the same module -+ CloneFunctionInto(new_f, F, vmap, CloneFunctionChangeType::GlobalChanges, Returns); -+#else - CloneFunctionInto(new_f, F, vmap, true, Returns); -+#endif - } - - // Clone all clone_all targets. Makes sure that the base targets are all available. -diff --git a/src/llvm-remove-addrspaces.cpp b/src/llvm-remove-addrspaces.cpp -index ada10c8d5f1f..7c6ef093fbce 100644 ---- a/src/llvm-remove-addrspaces.cpp -+++ b/src/llvm-remove-addrspaces.cpp -@@ -345,7 +345,11 @@ bool RemoveAddrspacesPass::runOnModule(Module &M) - for (auto MD : MDs) - NGV->addMetadata( - MD.first, -+#if JL_LLVM_VERSION >= 130000 -+ *MapMetadata(MD.second, VMap)); -+#else - *MapMetadata(MD.second, VMap, RF_MoveDistinctMDs)); -+#endif - - copyComdat(NGV, GV); - -@@ -372,7 +376,11 @@ bool RemoveAddrspacesPass::runOnModule(Module &M) - NF, - F, - VMap, -+#if JL_LLVM_VERSION >= 130000 -+ CloneFunctionChangeType::GlobalChanges, -+#else - /*ModuleLevelChanges=*/true, -+#endif - Returns, - "", - nullptr, diff --git a/dev-lang/julia/files/julia-1.6.5-llvm_13_compat_part_2.patch b/dev-lang/julia/files/julia-1.6.5-llvm_13_compat_part_2.patch deleted file mode 100644 index 5a8c2cde93d5..000000000000 --- a/dev-lang/julia/files/julia-1.6.5-llvm_13_compat_part_2.patch +++ /dev/null @@ -1,80 +0,0 @@ -This patch is from julialang repository: - https://github.com/JuliaLang/julia/commit/47f9139e.patch -but reference comes form ARCH Linux juia package - https://github.com/archlinux/svntogit-community/tree/packages/julia/trunk - -From 47f9139e88917813cb7beee5e690c48c2ac65de4 Mon Sep 17 00:00:00 2001 -From: Xuanda Yang <[email protected]> -Date: Wed, 9 Jun 2021 22:35:14 +0800 -Subject: [PATCH] codegen: replace deprecated llvm::VectorType::getNumElements - with new APIs (#41144) - ---- - src/llvm-late-gc-lowering.cpp | 29 ++++++++++++++++++++++++++--- - 1 file changed, 26 insertions(+), 3 deletions(-) - -diff --git a/src/llvm-late-gc-lowering.cpp b/src/llvm-late-gc-lowering.cpp -index 50015045151b..4df303462d96 100644 ---- a/src/llvm-late-gc-lowering.cpp -+++ b/src/llvm-late-gc-lowering.cpp -@@ -396,8 +396,14 @@ CountTrackedPointers::CountTrackedPointers(Type *T) { - } - if (isa<ArrayType>(T)) - count *= cast<ArrayType>(T)->getNumElements(); -- else if (isa<VectorType>(T)) -+ else if (isa<VectorType>(T)) { -+#if JL_LLVM_VERSION >= 120000 -+ ElementCount EC = cast<VectorType>(T)->getElementCount(); -+ count *= EC.getKnownMinValue(); -+#else - count *= cast<VectorType>(T)->getNumElements(); -+#endif -+ } - } - if (count == 0) - all = false; -@@ -408,8 +414,14 @@ unsigned getCompositeNumElements(Type *T) { - return ST->getNumElements(); - else if (auto *AT = dyn_cast<ArrayType>(T)) - return AT->getNumElements(); -- else -+ else { -+#if JL_LLVM_VERSION >= 120000 -+ ElementCount EC = cast<VectorType>(T)->getElementCount(); -+ return EC.getKnownMinValue(); -+#else - return cast<VectorType>(T)->getNumElements(); -+#endif -+ } - } - - // Walk through a Type, and record the element path to every tracked value inside -@@ -625,8 +637,14 @@ void LateLowerGCFrame::LiftSelect(State &S, SelectInst *SI) { - } - std::vector<int> Numbers; - unsigned NumRoots = 1; -- if (auto VTy = dyn_cast<VectorType>(SI->getType())) -+ if (auto VTy = dyn_cast<VectorType>(SI->getType())) { -+#if JL_LLVM_VERSION >= 120000 -+ ElementCount EC = VTy->getElementCount(); -+ Numbers.resize(EC.getKnownMinValue(), -1); -+#else - Numbers.resize(VTy->getNumElements(), -1); -+#endif -+ } - else - assert(isa<PointerType>(SI->getType()) && "unimplemented"); - assert(!isTrackedValue(SI)); -@@ -686,7 +704,12 @@ void LateLowerGCFrame::LiftSelect(State &S, SelectInst *SI) { - assert(NumRoots == 1); - int Number = Numbers[0]; - Numbers.resize(0); -+#if JL_LLVM_VERSION >= 120000 -+ ElementCount EC = VTy->getElementCount(); -+ Numbers.resize(EC.getKnownMinValue(), Number); -+#else - Numbers.resize(VTy->getNumElements(), Number); -+#endif - } - } - if (!isa<PointerType>(SI->getType())) diff --git a/dev-lang/julia/files/julia-1.6.5-make-install-no-build.patch b/dev-lang/julia/files/julia-1.6.5-make-install-no-build.patch deleted file mode 100644 index 0632a6e726f7..000000000000 --- a/dev-lang/julia/files/julia-1.6.5-make-install-no-build.patch +++ /dev/null @@ -1,17 +0,0 @@ -This pacth comes from - https://raw.githubusercontent.com/archlinux/svntogit-community/packages/julia/trunk/make-install-no-build.patch - ---- julia-1.3.0/Makefile.orig 2019-12-06 12:54:23.879790955 +0000 -+++ julia-1.3.0/Makefile 2019-12-06 12:54:36.329952953 +0000 -@@ -277,11 +277,6 @@ - - - install: $(build_depsbindir)/stringreplace $(BUILDROOT)/doc/_build/html/en/index.html --ifeq ($(BUNDLE_DEBUG_LIBS),1) -- @$(MAKE) $(QUIET_MAKE) all --else -- @$(MAKE) $(QUIET_MAKE) release --endif - @for subdir in $(bindir) $(datarootdir)/julia/stdlib/$(VERSDIR) $(docdir) $(man1dir) $(includedir)/julia $(libdir) $(private_libdir) $(sysconfdir) $(libexecdir); do \ - mkdir -p $(DESTDIR)$$subdir; \ - done diff --git a/dev-lang/julia/files/julia-1.7.1-do_not_set_rpath.patch b/dev-lang/julia/files/julia-1.7.1-do_not_set_rpath.patch deleted file mode 100644 index 7b8c3c7ba51b..000000000000 --- a/dev-lang/julia/files/julia-1.7.1-do_not_set_rpath.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/Makefile 2021-12-21 09:38:26.782829864 +0100 -+++ b/Makefile 2021-12-21 10:52:40.760565902 +0100 -@@ -365,7 +365,7 @@ - endif - - # Set rpath for LLVM.so which is `$ORIGIN/../lib` moving from `../lib` to `../lib/julia`. We only need to do this for Linux/FreeBSD --ifneq (,$(findstring $(OS),Linux FreeBSD)) -+ifneq (,$(findstring $(OS),FreeBSD)) - $(PATCHELF) --set-rpath '$$ORIGIN:$$ORIGIN/$(reverse_private_libdir_rel)' $(DESTDIR)$(private_libdir)/libLLVM.$(SHLIB_EXT) - endif - diff --git a/dev-lang/julia/files/julia-1.7.1-hardcoded-libs.patch b/dev-lang/julia/files/julia-1.7.1-hardcoded-libs.patch deleted file mode 100644 index be7d20368f6d..000000000000 --- a/dev-lang/julia/files/julia-1.7.1-hardcoded-libs.patch +++ /dev/null @@ -1,72 +0,0 @@ -This pacth comes from: - https://raw.githubusercontent.com/archlinux/svntogit-community/packages/julia/trunk/julia-hardcoded-libs.patch - -diff --git a/stdlib/MbedTLS_jll/src/MbedTLS_jll.jl b/stdlib/MbedTLS_jll/src/MbedTLS_jll.jl -index a7ca666b23..b84a42f4e7 100644 ---- a/stdlib/MbedTLS_jll/src/MbedTLS_jll.jl -+++ b/stdlib/MbedTLS_jll/src/MbedTLS_jll.jl -@@ -31,9 +31,9 @@ elseif Sys.isapple() - const libmbedtls = "@rpath/libmbedtls.13.dylib" - const libmbedx509 = "@rpath/libmbedx509.1.dylib" - else -- const libmbedcrypto = "libmbedcrypto.so.5" -- const libmbedtls = "libmbedtls.so.13" -- const libmbedx509 = "libmbedx509.so.1" -+ const libmbedcrypto = "libmbedcrypto.so" -+ const libmbedtls = "libmbedtls.so" -+ const libmbedx509 = "libmbedx509.so" - end - - function __init__() -diff --git a/stdlib/libLLVM_jll/src/libLLVM_jll.jl b/stdlib/libLLVM_jll/src/libLLVM_jll.jl -index fa45e754e5..b51812e3a8 100644 ---- a/stdlib/libLLVM_jll/src/libLLVM_jll.jl -+++ b/stdlib/libLLVM_jll/src/libLLVM_jll.jl -@@ -23,7 +23,7 @@ if Sys.iswindows() - elseif Sys.isapple() - const libLLVM = "@rpath/libLLVM.dylib" - else -- const libLLVM = "libLLVM-12jl.so" -+ const libLLVM = "libLLVM.so" - end - - function __init__() -diff --git a/stdlib/nghttp2_jll/src/nghttp2_jll.jl b/stdlib/nghttp2_jll/src/nghttp2_jll.jl -index 8b98c76ac5..77ad9e3800 100644 ---- a/stdlib/nghttp2_jll/src/nghttp2_jll.jl -+++ b/stdlib/nghttp2_jll/src/nghttp2_jll.jl -@@ -22,7 +22,7 @@ if Sys.iswindows() - elseif Sys.isapple() - const libnghttp2 = "@rpath/libnghttp2.14.dylib" - else -- const libnghttp2 = "libnghttp2.so.14" -+ const libnghttp2 = "libnghttp2.so" - end - - function __init__() -diff --git a/stdlib/LibGit2_jll/src/LibGit2_jll.jl b/stdlib/LibGit2_jll/src/LibGit2_jll.jl -index f0d4b5dda6..2ed3017b51 100644 ---- a/stdlib/LibGit2_jll/src/LibGit2_jll.jl -+++ b/stdlib/LibGit2_jll/src/LibGit2_jll.jl -@@ -23,7 +23,7 @@ if Sys.iswindows() - elseif Sys.isapple() - const libgit2 = "@rpath/libgit2.1.1.dylib" - else -- const libgit2 = "libgit2.so.1.1" -+ const libgit2 = "libgit2.so" - end - - function __init__() -diff --git a/stdlib/OpenLibm_jll/src/OpenLibm_jll.jl b/stdlib/OpenLibm_jll/src/OpenLibm_jll.jl -index 215de8aed6..918d1ffdc2 100644 ---- a/stdlib/OpenLibm_jll/src/OpenLibm_jll.jl -+++ b/stdlib/OpenLibm_jll/src/OpenLibm_jll.jl -@@ -22,7 +22,7 @@ if Sys.iswindows() - elseif Sys.isapple() - const libopenlibm = "@rpath/libopenlibm.3.dylib" - else -- const libopenlibm = "libopenlibm.so.3" -+ const libopenlibm = "libopenlibm.so" - end - - function __init__() diff --git a/dev-lang/julia/julia-1.7.1-r4.ebuild b/dev-lang/julia/julia-1.7.1-r4.ebuild deleted file mode 100644 index 1ddfaf72dbc2..000000000000 --- a/dev-lang/julia/julia-1.7.1-r4.ebuild +++ /dev/null @@ -1,186 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit flag-o-matic llvm pax-utils toolchain-funcs - -# correct versions for stdlibs are in deps/checksums -# for everything else, run with network-sandbox and wait for the crash - -MY_LLVM_V="13.0.0" - -DESCRIPTION="High-performance programming language for technical computing" -HOMEPAGE="https://julialang.org/"; - -SRC_URI=" - https://github.com/JuliaLang/julia/releases/download/v${PV}/${P}-full.tar.gz - https://github.com/JuliaLang/julia/commit/1eb063f1.patch -> ${PN}-1.7.1-llvm_13_compat_part_3.patch - https://raw.githubusercontent.com/archlinux/svntogit-community/packages/julia/trunk/f8c918b0.patch -> ${PN}-1.7.1-llvm_13_compat_part_4.patch - https://raw.githubusercontent.com/archlinux/svntogit-community/packages/julia/trunk/63303980.patch -> ${PN}-1.7.1-llvm_13_compat_part_5.patch -" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="+system-llvm" - -RDEPEND=" - system-llvm? ( sys-devel/llvm:13=[llvm_targets_NVPTX(-)] ) -" -LLVM_MAX_SLOT=13 - -RDEPEND+=" - app-arch/p7zip - dev-libs/gmp:0= - dev-libs/libgit2:0 - >=dev-libs/libpcre2-10.23:0=[jit,unicode] - dev-libs/mpfr:0= - >=dev-libs/libutf8proc-2.6.1:0=[-cjk] - >=dev-util/patchelf-0.13 - >=net-libs/mbedtls-2.2 - <net-misc/curl-7.81.0[http2,ssh] - sci-libs/amd:0= - sci-libs/arpack:0= - sci-libs/camd:0= - sci-libs/ccolamd:0= - sci-libs/cholmod:0= - sci-libs/colamd:0= - sci-libs/fftw:3.0=[threads] - sci-libs/openlibm:0= - sci-libs/spqr:0= - sci-libs/umfpack:0= - >=sci-mathematics/dsfmt-2.2.4 - >=sys-libs/libunwind-1.1:0= - sys-libs/zlib:0= - >=virtual/blas-3.6 - virtual/lapack" - -DEPEND="${RDEPEND} - virtual/pkgconfig - !system-llvm? ( dev-util/cmake )" - -PATCHES=( - "${FILESDIR}/${PN}"-1.4.0-no_symlink_llvm.patch - "${FILESDIR}/${PN}"-1.6.5-llvm_13_compat_part_1.patch - "${FILESDIR}/${PN}"-1.6.5-llvm_13_compat_part_2.patch - "${DISTDIR}/${PN}"-1.7.1-llvm_13_compat_part_3.patch - "${DISTDIR}/${PN}"-1.7.1-llvm_13_compat_part_4.patch - "${DISTDIR}/${PN}"-1.7.1-llvm_13_compat_part_5.patch - "${FILESDIR}/${PN}"-1.6.5-libgit-1.2.patch - "${FILESDIR}/${PN}"-1.6.5-libgit-1.4.patch - "${FILESDIR}/${PN}"-1.6.5-make-install-no-build.patch - "${FILESDIR}/${PN}"-1.7.1-hardcoded-libs.patch - "${FILESDIR}/${PN}"-1.7.1-do_not_set_rpath.patch -) - -pkg_setup() { - use system-llvm && llvm_pkg_setup -} - -src_unpack() { - local tounpack=(${A}) - # the main source tree, followed by deps - unpack "${tounpack[0]}" - - mkdir -p "${S}/deps/srccache/" - for i in "${tounpack[@]:1}"; do - cp "${DISTDIR}/${i}" "${S}/deps/srccache/${i#julia-}" || die - done -} - -src_prepare() { - default - - # Sledgehammer: - # - prevent fetching of bundled stuff in compile and install phase - # - respect CFLAGS - # - respect EPREFIX and Gentoo specific paths - - sed -i \ - -e "\|SHIPFLAGS :=|c\\SHIPFLAGS := ${CFLAGS}" \ - Make.inc || die - - sed -i \ - -e "s|ar -rcs|$(tc-getAR) -rcs|g" \ - src/Makefile || die - - # disable doc install starting git fetching - sed -i -e 's~install: $(build_depsbindir)/stringreplace $(BUILDROOT)/doc/_build/html/en/index.html~install: $(build_depsbindir)/stringreplace~' Makefile || die -} - -src_configure() { - # bug #855602 - filter-lto - - use system-llvm && ewarn "You have enabled system-llvm. This is unsupported by upstream and may not work." - - # julia does not play well with the system versions of libuv - # USE_SYSTEM_LIBM=0 implies using external openlibm - cat <<-EOF > Make.user - LOCALBASE:="${EPREFIX}/usr" - override prefix:="${EPREFIX}/usr" - override libdir:="\$(prefix)/$(get_libdir)" - override CC:=$(tc-getCC) - override CXX:=$(tc-getCXX) - override AR:=$(tc-getAR) - - BUNDLE_DEBUG_LIBS:=0 - USE_BINARYBUILDER:=0 - USE_SYSTEM_CSL:=1 - USE_SYSTEM_LLVM:=$(usex system-llvm 1 0) - USE_SYSTEM_LIBUNWIND:=1 - USE_SYSTEM_PCRE:=1 - USE_SYSTEM_LIBM:=0 - USE_SYSTEM_OPENLIBM:=1 - USE_SYSTEM_DSFMT:=1 - USE_SYSTEM_BLAS:=1 - USE_SYSTEM_LAPACK:=1 - USE_SYSTEM_LIBBLASTRAMPOLINE:=0 - USE_SYSTEM_GMP:=1 - USE_SYSTEM_MPFR:=1 - USE_SYSTEM_LIBSUITESPARSE:=1 - USE_SYSTEM_LIBUV:=0 - USE_SYSTEM_UTF8PROC:=1 - USE_SYSTEM_MBEDTLS:=1 - USE_SYSTEM_LIBSSH2:=1 - USE_SYSTEM_NGHTTP2:=1 - USE_SYSTEM_CURL:=1 - USE_SYSTEM_LIBGIT2:=1 - USE_SYSTEM_PATCHELF:=1 - USE_SYSTEM_ZLIB:=1 - USE_SYSTEM_P7ZIP:=1 - VERBOSE:=1 - EOF -} - -src_compile() { - # Julia accesses /proc/self/mem on Linux - addpredict /proc/self/mem - - default - pax-mark m "$(file usr/bin/julia-* | awk -F : '/ELF/ {print $1}')" -} - -src_install() { - emake install DESTDIR="${D}" - - if ! use system-llvm ; then - local llvmslot=$(ver_cut 1 ${MY_LLVM_V}) - cp "${S}/usr/lib/libLLVM-${llvmslot}jl.so" "${ED}/usr/$(get_libdir)/julia/" || die - fi - - dodoc README.md - - mv "${ED}"/usr/etc/julia "${ED}"/etc || die - rmdir "${ED}"/usr/etc || die - mv "${ED}"/usr/share/doc/julia/html "${ED}"/usr/share/doc/"${PF}" || die - rmdir "${ED}"/usr/share/doc/julia || die - - # The appdata directory is deprecated. - mv "${ED}"/usr/share/{appdata,metainfo}/ || die -} - -pkg_postinst() { - elog "To use Plots, you will need to install sci-visualization/gr." -} diff --git a/dev-lang/julia/julia-1.7.3.ebuild b/dev-lang/julia/julia-1.7.3.ebuild deleted file mode 100644 index 1b2d16111014..000000000000 --- a/dev-lang/julia/julia-1.7.3.ebuild +++ /dev/null @@ -1,199 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit flag-o-matic llvm pax-utils toolchain-funcs - -# correct versions for stdlibs are in deps/checksums -# for everything else, run with network-sandbox and wait for the crash - -MY_LLVM_V="13.0.0" - -DESCRIPTION="High-performance programming language for technical computing" -HOMEPAGE="https://julialang.org/"; - -SRC_URI=" - https://github.com/JuliaLang/julia/releases/download/v${PV}/${P}-full.tar.gz - https://github.com/JuliaLang/julia/commit/677ce6d3.patch -> ${PN}-1.7.3-llvm_13_compat_part_1.patch - https://github.com/JuliaLang/julia/commit/47f9139e.patch -> ${PN}-1.7.3-llvm_13_compat_part_2.patch - https://github.com/JuliaLang/julia/commit/1eb063f1.patch -> ${PN}-1.7.3-llvm_13_compat_part_3.patch - https://github.com/JuliaLang/julia/commit/99d4e655.patch -> ${PN}-1.7.3-llvm_13_compat_part_4.patch - https://raw.githubusercontent.com/archlinux/svntogit-community/packages/julia/trunk/f8c918b0.patch -> ${PN}-1.7.3-llvm_13_compat_part_5.patch - https://raw.githubusercontent.com/archlinux/svntogit-community/packages/julia/trunk/63303980.patch -> ${PN}-1.7.3-llvm_13_compat_part_6.patch - https://raw.githubusercontent.com/archlinux/svntogit-community/packages/julia/trunk/julia-libgit-1.2.patch - https://raw.githubusercontent.com/archlinux/svntogit-community/packages/julia/trunk/julia-libgit-1.4.patch - https://raw.githubusercontent.com/archlinux/svntogit-community/packages/julia/trunk/julia-system-cblas.patch - https://raw.githubusercontent.com/archlinux/svntogit-community/packages/julia/trunk/julia-hardcoded-libs.patch - https://raw.githubusercontent.com/archlinux/svntogit-community/packages/julia/trunk/make-install-no-build.patch - https://raw.githubusercontent.com/archlinux/svntogit-community/packages/julia/trunk/julia-libunwind-1.6.patch - https://raw.githubusercontent.com/archlinux/svntogit-community/packages/julia/trunk/julia-libblastrampoline-4.patch - https://github.com/JuliaLang/Downloads.jl/archive/refs/tags/v1.5.3.tar.gz -> ${P}_Downloads.jl_1.5.3.tar.gz -" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="+system-llvm" - -RDEPEND=" - system-llvm? ( sys-devel/llvm:13=[llvm_targets_NVPTX(-)] ) -" -LLVM_MAX_SLOT=13 - -RDEPEND+=" - app-arch/p7zip - dev-libs/gmp:0= - dev-libs/libgit2:0 - >=dev-libs/libpcre2-10.23:0=[jit,unicode] - dev-libs/mpfr:0= - >=dev-libs/libutf8proc-2.6.1:0=[-cjk] - >=dev-util/patchelf-0.13 - >=net-libs/mbedtls-2.2 - net-misc/curl[http2,ssh] - sci-libs/amd:0= - sci-libs/arpack:0= - sci-libs/camd:0= - sci-libs/ccolamd:0= - sci-libs/cholmod:0= - sci-libs/colamd:0= - sci-libs/fftw:3.0=[threads] - sci-libs/openlibm:0= - sci-libs/spqr:0= - sci-libs/umfpack:0= - >=sci-mathematics/dsfmt-2.2.4 - >=sys-libs/libunwind-1.1:0= - sys-libs/zlib:0= - >=virtual/blas-3.6 - virtual/lapack" - -DEPEND="${RDEPEND} - virtual/pkgconfig - !system-llvm? ( dev-util/cmake )" - -PATCHES=( - "${DISTDIR}/${PN}"-1.7.3-llvm_13_compat_part_1.patch - "${DISTDIR}/${PN}"-1.7.3-llvm_13_compat_part_2.patch - "${DISTDIR}/${PN}"-1.7.3-llvm_13_compat_part_3.patch - "${DISTDIR}/${PN}"-1.7.3-llvm_13_compat_part_4.patch - "${DISTDIR}/${PN}"-1.7.3-llvm_13_compat_part_5.patch - "${DISTDIR}/${PN}"-1.7.3-llvm_13_compat_part_6.patch - "${DISTDIR}"/julia-libgit-1.2.patch - "${DISTDIR}"/julia-libgit-1.4.patch - "${DISTDIR}"/julia-libunwind-1.6.patch - "${DISTDIR}"/julia-system-cblas.patch - "${DISTDIR}"/julia-hardcoded-libs.patch - "${DISTDIR}"/make-install-no-build.patch - "${DISTDIR}"/julia-libblastrampoline-4.patch -) - -pkg_setup() { - use system-llvm && llvm_pkg_setup -} - -src_unpack() { - local tounpack=(${A}) - # the main source tree, followed by deps - unpack "${tounpack[0]}" - - mkdir -p "${S}/deps/srccache/" - for i in "${tounpack[@]:1}"; do - cp "${DISTDIR}/${i}" "${S}/deps/srccache/${i#julia-}" || die - done -} - -src_prepare() { - default - - # Sledgehammer: - # - prevent fetching of bundled stuff in compile and install phase - # - respect CFLAGS - # - respect EPREFIX and Gentoo specific paths - - sed -i \ - -e "\|SHIPFLAGS :=|c\\SHIPFLAGS := ${CFLAGS}" \ - Make.inc || die - - sed -i \ - -e "s|ar -rcs|$(tc-getAR) -rcs|g" \ - src/Makefile || die - - # disable doc install starting git fetching - sed -i -e 's~install: $(build_depsbindir)/stringreplace $(BUILDROOT)/doc/_build/html/en/index.html~install: $(build_depsbindir)/stringreplace~' Makefile || die -} - -src_configure() { - # bug #855602 - filter-lto - - use system-llvm && ewarn "You have enabled system-llvm. This is unsupported by upstream and may not work." - - # julia does not play well with the system versions of libuv - # USE_SYSTEM_LIBM=0 implies using external openlibm - cat <<-EOF > Make.user - LOCALBASE:="${EPREFIX}/usr" - override prefix:="${EPREFIX}/usr" - override libdir:="\$(prefix)/$(get_libdir)" - override CC:=$(tc-getCC) - override CXX:=$(tc-getCXX) - override AR:=$(tc-getAR) - - BUNDLE_DEBUG_LIBS:=0 - USE_BINARYBUILDER:=0 - USE_SYSTEM_CSL:=1 - USE_SYSTEM_LLVM:=$(usex system-llvm 1 0) - USE_SYSTEM_LIBUNWIND:=1 - USE_SYSTEM_PCRE:=1 - USE_SYSTEM_LIBM:=0 - USE_SYSTEM_OPENLIBM:=1 - USE_SYSTEM_DSFMT:=1 - USE_SYSTEM_BLAS:=1 - USE_SYSTEM_LAPACK:=1 - USE_SYSTEM_LIBBLASTRAMPOLINE:=0 - USE_SYSTEM_GMP:=1 - USE_SYSTEM_MPFR:=1 - USE_SYSTEM_LIBSUITESPARSE:=1 - USE_SYSTEM_LIBUV:=0 - USE_SYSTEM_UTF8PROC:=1 - USE_SYSTEM_MBEDTLS:=1 - USE_SYSTEM_LIBSSH2:=1 - USE_SYSTEM_NGHTTP2:=1 - USE_SYSTEM_CURL:=1 - USE_SYSTEM_LIBGIT2:=1 - USE_SYSTEM_PATCHELF:=1 - USE_SYSTEM_ZLIB:=1 - USE_SYSTEM_P7ZIP:=1 - VERBOSE:=1 - EOF -} - -src_compile() { - # Julia accesses /proc/self/mem on Linux - addpredict /proc/self/mem - - default - pax-mark m "$(file usr/bin/julia-* | awk -F : '/ELF/ {print $1}')" -} - -src_install() { - emake install DESTDIR="${D}" - - if ! use system-llvm ; then - local llvmslot=$(ver_cut 1 ${MY_LLVM_V}) - cp "${S}/usr/lib/libLLVM-${llvmslot}jl.so" "${ED}/usr/$(get_libdir)/julia/" || die - fi - - dodoc README.md - - mv "${ED}"/usr/etc/julia "${ED}"/etc || die - rmdir "${ED}"/usr/etc || die - mv "${ED}"/usr/share/doc/julia/html "${ED}"/usr/share/doc/"${PF}" || die - rmdir "${ED}"/usr/share/doc/julia || die - - # The appdata directory is deprecated. - mv "${ED}"/usr/share/{appdata,metainfo}/ || die -} - -pkg_postinst() { - elog "To use Plots, you will need to install sci-visualization/gr." -}
