diff options
Diffstat (limited to 'testing/julia')
| -rw-r--r-- | testing/julia/0005-llvm-3.8.patch | 56 | ||||
| -rw-r--r-- | testing/julia/APKBUILD | 10 |
2 files changed, 4 insertions, 62 deletions
diff --git a/testing/julia/0005-llvm-3.8.patch b/testing/julia/0005-llvm-3.8.patch deleted file mode 100644 index c301f964c2..0000000000 --- a/testing/julia/0005-llvm-3.8.patch +++ /dev/null @@ -1,56 +0,0 @@ -Description: LLVM 3.8 compatibility - These fixes come straight from upstream's git. -Origin: Upstream, https://github.com/JuliaLang/julia/commit/b67609b988febe062e6709d8972c4f869c82cfc0 -Origin: Upstream, https://github.com/JuliaLang/julia/commit/3f6abadc9d12bb9d59ec775db4277b3841395d0b -Origin: Upstream, https://github.com/JuliaLang/julia/commit/caf3c74426696d43101d9607b1a2cd3a5e05bc0f -Author: Graham Inggs <ginggs@debian.org> -Last-Update: 2016-02-03 ---- a/src/cgutils.cpp -+++ b/src/cgutils.cpp -@@ -219,7 +219,11 @@ - } - } - -+#ifdef LLVM38 -+ virtual Value *materializeDeclFor(Value *V) -+#else - virtual Value *materializeValueFor (Value *V) -+#endif - { - Function *F = dyn_cast<Function>(V); - if (F) { -@@ -492,7 +496,11 @@ - - // now copy the module, since PM.run may modify it - ValueToValueMapTy VMap; -+#ifdef LLVM38 -+ Module *clone = CloneModule(shadow_module, VMap).release(); -+#else - Module *clone = CloneModule(shadow_module, VMap); -+#endif - #ifdef LLVM37 - // Reset the target triple to make sure it matches the new target machine - clone->setTargetTriple(TM->getTargetTriple().str()); ---- a/src/intrinsics.cpp -+++ b/src/intrinsics.cpp -@@ -780,12 +780,20 @@ - jl_options.fast_math == JL_OPTIONS_FAST_MATH_ON)) { - FastMathFlags fmf; - fmf.setUnsafeAlgebra(); -+#ifdef LLVM38 -+ builder.setFastMathFlags(fmf); -+#else - builder.SetFastMathFlags(fmf); -+#endif - } - } - IRBuilder<>& operator()() const { return builder; } - ~math_builder() { -+#ifdef LLVM38 -+ builder.setFastMathFlags(old_fmf); -+#else - builder.SetFastMathFlags(old_fmf); -+#endif - } - }; - diff --git a/testing/julia/APKBUILD b/testing/julia/APKBUILD index 554a9b286e..9d1c31fb54 100644 --- a/testing/julia/APKBUILD +++ b/testing/julia/APKBUILD @@ -6,7 +6,7 @@ pkgver=0.4.6 _libuv_ver=efb40768b7c7bd9f173a7868f74b92b1c5a61a0e # Keep in sync with deps/Versions.make. _rmathjulia_ver=0.1 -pkgrel=0 +pkgrel=1 pkgdesc="A high-level, high-performance dynamic language for technical computing" url="http://julialang.org" # x86: libunwind package is currently not built for x86 @@ -29,7 +29,7 @@ depends_dev="arpack-dev gmp-dev libgit2-dev libunwind-dev - llvm-dev>=3.7 + llvm3.7-dev mpfr-dev openblas-dev openlibm-dev @@ -57,7 +57,6 @@ source="https://github.com/JuliaLang/julia/releases/download/v$pkgver/$pkgname-$ 0002-verbose-build.patch 0003-no-clean-docs.patch 0004-remove-sysctl.h.patch - 0005-llvm-3.8.patch 0008-ldconfig-compat.patch " builddir="$srcdir/$pkgname-$pkgver" @@ -89,6 +88,8 @@ prepare() { LIBBLASNAME=libopenblas LIBLAPACK=-lopenblas LIBLAPACKNAME=libopenblas + LLVM_CONFIG=llvm-config-3.7 + LLVM_VER=3.7 USE_SYSTEM_LLVM=1 USE_SYSTEM_LIBUNWIND=1 USE_SYSTEM_PCRE=1 @@ -156,7 +157,6 @@ d529d078678c242b6ac61d65ad61e530 find-syslibs 2539b4abe49d669ae01a4239fb14243f 0002-verbose-build.patch 0fc44cc7b6a0167ee1e36310364e7049 0003-no-clean-docs.patch e5a50262e22a97d7f8108e6e8fc160d1 0004-remove-sysctl.h.patch -aa0a5c577ccd3d0c652d15b6a064594e 0005-llvm-3.8.patch 3cf5ef31fd586ffac9a29cc3eca00e8a 0008-ldconfig-compat.patch" sha256sums="e5d12b5a8ddff0131e460612ecf222ddf16014fc64c4fc3d8b021da7ebbd9a9f julia-0.4.6.tar.gz 872a96b616fc3517526812df11ed188500abff8dd73b75ae92377916b6efd3fe libuv-efb40768b7c7bd9f173a7868f74b92b1c5a61a0e.tar.gz @@ -166,7 +166,6 @@ b4bdd0dc307a76e51b40aa33de8856e9bd6e3d8be11b4c509d73f05d78a0cb79 find-syslibs 892b3e0b3a94ad53a06574851dd397da4293c371ad980a03daa816a0585cb0ee 0002-verbose-build.patch 8dc6aabe30ff02acfdae7aea3c6ef8fcf397481dfe2a3e2ad7c65bd8d1bbb09a 0003-no-clean-docs.patch 70b9f2957d818ccd93f64a61f87eb5c7476258905d235c8e34745ec9c9e9a649 0004-remove-sysctl.h.patch -2fa4fd8aef4a8805919cf66442f8b76f6a47886c1f6d31e7be525aad33c358c0 0005-llvm-3.8.patch 7895279378e08f394501af568b08fb59244c272735045b077de1d7ff67810787 0008-ldconfig-compat.patch" sha512sums="744fbae14f7b38d5f7ef1c39d05c66f42833ee0e07b3f4be2ae377f2c997872777c6f7e9e667f52e5a33879032b2d02d76b00fab59f81ba6552f1fd4165953da julia-0.4.6.tar.gz 21bdcffd0c13c864bac6a1f42c5f229a57fd91e124ab4c43bd14ab29e5334bfcbdcdda2e16b3b08e8f79df5ab133bac5cdaeb2a88627fe152dd91d5e18154e61 libuv-efb40768b7c7bd9f173a7868f74b92b1c5a61a0e.tar.gz @@ -176,5 +175,4 @@ sha512sums="744fbae14f7b38d5f7ef1c39d05c66f42833ee0e07b3f4be2ae377f2c997872777c6 266e0170c133e5be98f843adca948a4d13f3549a3a01b0c6220d495149ef26a9a837e9d7b0d9066eb7f8370a46ee5de042882a7dd585ddb245a1573882e32365 0002-verbose-build.patch 2eae3ea85a56b5deaef464d36f543d60afb2e6a65ee4b57b599dd508046a02179ca53c5efd91351c8d0cbd5a3585b236da9b316e82416f9bff249b8b74ded305 0003-no-clean-docs.patch 6c111ccdd12af5b00fdf0b7cc8fba11980fceccf7c246b40e791cd1be8e39cd75b8c290c65ebd9b4add60fc242261e17e94807736fce6a96733e9bf18182b489 0004-remove-sysctl.h.patch -8546ff6c762b2a3a9f15a898e8b95b6cb0dd50a014de8349ee8d94d9663ca5031f775ec4f00e136ae2aef4778a8bdb1074930d10e2e1c40a8ec8db55fb7dc4d8 0005-llvm-3.8.patch ab53aeaf3464236896295eab25092e4881def9e12483728be4d8323e5d3213c8b0fc064e62d21fd049df9acd2976eee032b254f10d2092ac0a4be4ecf9c319af 0008-ldconfig-compat.patch" |