commit: b620c2db81b11d3e63069512fbcc855b53cfb26a Author: Matthias Maier <tamiko <AT> gentoo <DOT> org> AuthorDate: Fri Sep 9 05:45:35 2016 +0000 Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org> CommitDate: Fri Sep 9 05:46:34 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b620c2db
dev-lang/julia: version bump to 0.4.6 Package-Manager: portage-2.2.28 dev-lang/julia/Manifest | 2 + dev-lang/julia/files/julia-0.4.6-llvm-3.8.patch | 56 +++++++ dev-lang/julia/julia-0.4.6.ebuild | 186 ++++++++++++++++++++++++ 3 files changed, 244 insertions(+) diff --git a/dev-lang/julia/Manifest b/dev-lang/julia/Manifest index 034069d..07327ed 100644 --- a/dev-lang/julia/Manifest +++ b/dev-lang/julia/Manifest @@ -1,2 +1,4 @@ DIST julia-0.4.3-bundled.tar.gz 2678787 SHA256 9451160add4c1fa537762627abcd3dd5fecca9ce44f71c4140d89a4bb6b23392 SHA512 919ca7b99a6eb17a651ce24fe07e5c12bfcee54ce86fac8f744765195002e8f3330df9059fadd5af3408c1f7e067e247ad4bb135879ae4ae43e1457245f90db9 WHIRLPOOL 94bb022d4f1586dfdc2f52286db423cb09898a3a5dff2f2086ca111b9117dca808758351dada23cea1056a8e5c3b33f6919410c34af96a92a4a9f8b0e0758783 DIST julia-0.4.3.tar.gz 5563437 SHA256 b2c12b267c0d8eb380f6628e7be48c7ec46d2cfb5c585ecb3ca4cc442650e4e0 SHA512 7d5180c69573452c00563c7b98514fc9e4f0f70762912cf4f90cbf632e4b23ec149295ff1955164833ab94efd1feab992067996e3d60f795850542cf2f18f67f WHIRLPOOL 75c3ebf8cb1af67158896872e098bf66a8073eba3daf6cf5903471d34201e1605458e59f14c19ff5177413daee5aac102ec69a0afe9a93a219698a4640acaf33 +DIST julia-0.4.6-bundled.tar.gz 2678787 SHA256 9451160add4c1fa537762627abcd3dd5fecca9ce44f71c4140d89a4bb6b23392 SHA512 919ca7b99a6eb17a651ce24fe07e5c12bfcee54ce86fac8f744765195002e8f3330df9059fadd5af3408c1f7e067e247ad4bb135879ae4ae43e1457245f90db9 WHIRLPOOL 94bb022d4f1586dfdc2f52286db423cb09898a3a5dff2f2086ca111b9117dca808758351dada23cea1056a8e5c3b33f6919410c34af96a92a4a9f8b0e0758783 +DIST julia-0.4.6.tar.gz 5548248 SHA256 e5d12b5a8ddff0131e460612ecf222ddf16014fc64c4fc3d8b021da7ebbd9a9f SHA512 744fbae14f7b38d5f7ef1c39d05c66f42833ee0e07b3f4be2ae377f2c997872777c6f7e9e667f52e5a33879032b2d02d76b00fab59f81ba6552f1fd4165953da WHIRLPOOL 3403364fc13bd8012da1ee333cc51fd0a957e94920bbd3f951fad4a689469f514e19a661bf2bdfdd29afbcadac1c9d6948638fd9d4201780a1aa7c0fd2995dee diff --git a/dev-lang/julia/files/julia-0.4.6-llvm-3.8.patch b/dev-lang/julia/files/julia-0.4.6-llvm-3.8.patch new file mode 100644 index 00000000..c301f96 --- /dev/null +++ b/dev-lang/julia/files/julia-0.4.6-llvm-3.8.patch @@ -0,0 +1,56 @@ +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 <gin...@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/dev-lang/julia/julia-0.4.6.ebuild b/dev-lang/julia/julia-0.4.6.ebuild new file mode 100644 index 00000000..6f10200 --- /dev/null +++ b/dev-lang/julia/julia-0.4.6.ebuild @@ -0,0 +1,186 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +RESTRICT="test" + +inherit elisp-common eutils multilib pax-utils toolchain-funcs + +DESCRIPTION="High-performance programming language for technical computing" +HOMEPAGE="http://julialang.org/"; +SRC_URI=" + https://github.com/JuliaLang/${PN}/releases/download/v${PV}/${P}.tar.gz + https://dev.gentoo.org/~tamiko/distfiles/${P}-bundled.tar.gz +" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" +IUSE="emacs" + +RDEPEND=" + dev-lang/R:0= + dev-libs/double-conversion:0= + dev-libs/gmp:0= + dev-libs/libgit2:0= + dev-libs/mpfr:0= + dev-libs/openspecfun + sci-libs/arpack:0= + sci-libs/camd:0= + sci-libs/cholmod:0= + sci-libs/fftw:3.0=[threads] + sci-libs/openlibm:0= + sci-libs/spqr:0= + sci-libs/umfpack:0= + sci-mathematics/glpk:0= + >=sys-devel/llvm-3.5:0= + >=sys-libs/libunwind-1.1:7= + sys-libs/readline:0= + sys-libs/zlib:0= + virtual/blas + virtual/lapack + emacs? ( app-emacs/ess )" + +DEPEND="${RDEPEND} + dev-util/patchelf + virtual/pkgconfig" + +PATCHES=( + "${FILESDIR}"/${PN}-0.4.3-fix_build_system.patch + "${FILESDIR}"/${P}-llvm-3.8.patch +) + +src_prepare() { + mv "${WORKDIR}"/bundled/dsfmt-2.2.3.tar.gz deps/ || die + mv "${WORKDIR}"/bundled/libuv-efb40768b7c7bd9f173a7868f74b92b1c5a61a0e.tar.gz deps/ || die + mv "${WORKDIR}"/bundled/pcre2-10.20.tar.bz2 deps/ || die + mv "${WORKDIR}"/bundled/Rmath-julia-0.1.tar.gz deps/ || die + mv "${WORKDIR}"/bundled/utf8proc-85789180158ac7fff85b9f008828d6ac44f072ea.tar.gz deps/ || die + rmdir "${WORKDIR}"/bundled || die + + epatch "${PATCHES[@]}" + + # Sledgehammer: + # - prevent fetching of bundled stuff in compile and install phase + # - respect CFLAGS + # - respect EPREFIX and Gentoo specific paths + # - fix BLAS and LAPACK link interface + + sed -i \ + -e 's|$(JLDOWNLOAD)|${EPREFIX}/bin/true|' \ + -e 's|git submodule|${EPREFIX}/bin/true|g' \ + -e "s|GENTOOCFLAGS|${CFLAGS}|g" \ + -e "s|/usr/include|${EPREFIX%/}/usr/include|g" \ + deps/Makefile || die + + local libblas="$($(tc-getPKG_CONFIG) --libs-only-l blas)" + libblas="${libblas%% *}" + libblas="lib${libblas#-l}" + local liblapack="$($(tc-getPKG_CONFIG) --libs-only-l lapack)" + liblapack="${liblapack%% *}" + liblapack="lib${liblapack#-l}" + + sed -i \ + -e "s|\(JULIA_EXECUTABLE = \)\(\$(JULIAHOME)/julia\)|\1 LD_LIBRARY_PATH=\$(BUILD)/$(get_libdir) \2|" \ + -e "s|GENTOOCFLAGS|${CFLAGS}|g" \ + -e "s|LIBDIR = lib|LIBDIR = $(get_libdir)|" \ + -e "s|/usr/lib|${EPREFIX}/usr/$(get_libdir)|" \ + -e "s|/usr/include|${EPREFIX}/usr/include|" \ + -e "s|\$(BUILD)/lib|\$(BUILD)/$(get_libdir)|" \ + -e "s|^JULIA_COMMIT = .*|JULIA_COMMIT = v${PV}|" \ + -e "s|-lblas|$($(tc-getPKG_CONFIG) --libs blas)|" \ + -e "s|= libblas|= ${libblas}|" \ + -e "s|-llapack|$($(tc-getPKG_CONFIG) --libs lapack)|" \ + -e "s|= liblapack|= ${liblapack}|" \ + Make.inc || die + + sed -i \ + -e "s|,lib)|,$(get_libdir))|g" \ + -e "s|\$(BUILD)/lib|\$(BUILD)/$(get_libdir)|g" \ + Makefile || die + + sed -i \ + -e "s|ar -rcs|$(tc-getAR) -rcs|g" \ + src/Makefile || die +} + +src_configure() { + # julia does not play well with the system versions of + # dsfmt, libuv, pcre2 and utf8proc + cat <<-EOF > Make.user + USE_SYSTEM_DSFMT=0 + USE_SYSTEM_LIBUV=0 + USE_SYSTEM_PCRE=0 + USE_SYSTEM_RMATH=0 + USE_SYSTEM_UTF8PROC=0 + USE_LLVM_SHLIB=1 + USE_SYSTEM_ARPACK=1 + USE_SYSTEM_BLAS=1 + USE_SYSTEM_FFTW=1 + USE_SYSTEM_GMP=1 + USE_SYSTEM_GRISU=1 + USE_SYSTEM_LAPACK=1 + USE_SYSTEM_LIBGIT2=1 + USE_SYSTEM_LIBM=1 + USE_SYSTEM_LIBUNWIND=1 + USE_SYSTEM_LLVM=1 + USE_SYSTEM_MPFR=1 + USE_SYSTEM_OPENLIBM=1 + USE_SYSTEM_OPENSPECFUN=1 + USE_SYSTEM_PATCHELF=1 + USE_SYSTEM_READLINE=1 + USE_SYSTEM_SUITESPARSE=1 + USE_SYSTEM_ZLIB=1 + VERBOSE=1 + EOF + +} + +src_compile() { + emake cleanall + emake julia-release \ + prefix="/usr" DESTDIR="${D}" CC="$(tc-getCC)" CXX="$(tc-getCXX)" + pax-mark m $(file usr/bin/julia-* | awk -F : '/ELF/ {print $1}') + emake + use emacs && elisp-compile contrib/julia-mode.el +} + +src_test() { + emake test +} + +src_install() { + emake install \ + prefix="/usr" DESTDIR="${D}" CC="$(tc-getCC)" CXX="$(tc-getCXX)" + cat > 99julia <<-EOF + LDPATH=${EROOT%/}/usr/$(get_libdir)/julia + EOF + doenvd 99julia + + if use emacs; then + elisp-install "${PN}" contrib/julia-mode.el + elisp-site-file-install "${FILESDIR}"/63julia-gentoo.el + fi + dodoc README.md + + mv "${ED}"/usr/etc/julia "${ED}"/etc || die + rmdir "${ED}"/usr/etc || die + rmdir "${ED}"/usr/libexec || die + mv "${ED}"/usr/share/doc/julia/{examples,html} \ + "${ED}"/usr/share/doc/${P} || die + rmdir "${ED}"/usr/share/doc/julia || die + if [[ $(get_libdir) != lib ]]; then + mkdir -p "${ED}"/usr/$(get_libdir) || die + mv "${ED}"/usr/lib/julia "${ED}"/usr/$(get_libdir)/julia || die + fi +} + +pkg_postinst() { + use emacs && elisp-site-regen +} + +pkg_postrm() { + use emacs && elisp-site-regen +}
