commit: c545f629a77bf34ddd9f2d357502f88d8064ed9d Author: Matthias Maier <tamiko <AT> gentoo <DOT> org> AuthorDate: Mon Jan 7 21:04:48 2019 +0000 Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org> CommitDate: Mon Jan 7 21:35:31 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c545f629
dev-lang/julia: version bump to 1.1.0-rc1 * give up and bundle llvm-6 Bug: https://bugs.gentoo.org/665192 Package-Manager: Portage-2.3.54, Repoman-2.3.12 Signed-off-by: Matthias Maier <tamiko <AT> gentoo.org> dev-lang/julia/Manifest | 3 + .../julia/files/julia-1.1.0-fix_build_system.patch | 53 ++++++ dev-lang/julia/julia-1.1.0_rc1.ebuild | 197 +++++++++++++++++++++ 3 files changed, 253 insertions(+) diff --git a/dev-lang/julia/Manifest b/dev-lang/julia/Manifest index 41854360be4..7ce323c26a2 100644 --- a/dev-lang/julia/Manifest +++ b/dev-lang/julia/Manifest @@ -1,5 +1,8 @@ DIST julia-1.0.3.tar.gz 7460268 BLAKE2B d9d42e0235f249fa8c1ced12c659091b97d338ec4a4662ea13ea6a107cb59e90d8385c51962199e47dae5f9770156be2db2d8bb2e3cc8f42aa7403b4f4ca7f04 SHA512 b61399c7b7ffae828264a6ec916b409b2cbc6b3b98d9a6d39b60b014a97a1f1ad75e1ed4860d9ab15d1e5ffec691c04d1b797c238953290770b7313790ae3f1d +DIST julia-1.1.0-rc1.tar.gz 7672785 BLAKE2B 3c49e189bec2da8d6d3f4c689600aa42e8092fe4343175981f8d998407bc6ef6c1bee20d579dc21594c2e9f9469898fc59d28807202b394cf64678b497037e0e SHA512 ceba088ef7abe103a34b1eb6f3b9660165bac038e62d4def22ba207c1c6fddb8a90625b3aa967c32dcad5c24dd83a8f25781347fc8b4078f40dcdffd07b554ce DIST julia-dsfmt-2.2.3.tar.gz 291773 BLAKE2B 6ffae90494d72527920c80fc0fb005da1c7b84f8a03a7ecb0789434c0fff97359e5098e85431896dffccc7d5148c414e847aaba5feef648b8788421a466ff65e SHA512 6d8ddcd01aab3f9039f4f0288a8af53e290cc2f293ed8c4a8c9f3b3f12398e7eedfce8016117b425766ba89c61c86c13b3e420035b5f9bf91315b8b814c03662 +DIST julia-libuv-2348256acf5759a544e5ca7935f638d2bc091d60.tar.gz 1555710 BLAKE2B 31ce57d23765c142799dd985a5511751d63238cf7e082fd1ad5574bf62201e9d6cb53b8da5dcc724765ccb4abd63da3ca6d6cbd45e078310c2ffa3859d09b8e4 SHA512 c8bf3c736a60feb0c6994aa7cd1b80e1a45bd6096aa66db320ddfc27b59a0797d303338ea75978619173e4f0a680254f3db29c9f6d1b84361030cc11c7729c98 DIST julia-libuv-ed3700c849289ed01fe04273a7bf865340b2bd7e.tar.gz 1492695 BLAKE2B ad03512dd1db2c7066b46b5a3a314645b925481d8ace09ac0a0ae23cf5b8a64338ad457f8df229aa82f1d45605b5366883f563f2e22756ce28bb6fb7607d7124 SHA512 1305035b1372bdf234e3c5e673ee4c8ab5bda83ff06bc27704786def52667c3143fe587fca8f6e0855ba0c8b6d4dd90b2faefd33736224173f459d751885683e DIST julia-libwhich-81e9723c0273d78493dc8c8ed570f68d9ce7e89e.tar.gz 4183 BLAKE2B c932e23b1b476d3fd16cf6f451efd5fc6d9c1ec2c53e8ac086340a100817d9b30dae3eff50b284a42c09b2bbae30b9e2fd38b2881f8cbf4974a89f3bd0c87599 SHA512 6fb77b715d70d9bc95a8546c3bf97bd3677c7ea344b88bb5bc3bbfac9dceabe8a8cde7a0f64dec884cde802e4a3000e30837d3f824b5a9242348c4fe061526a3 +DIST julia-llvm-6.0.1.src.tar.xz 25306628 BLAKE2B 60232d4d22f8096b565cc8d81fea0639f24f14e8fc4f66ade69fa15479181f07f655f26dff3fa24bf105762b495da316c5c9352db234bd0af6b9c3fff6d4d881 SHA512 cbbb00eb99cfeb4aff623ee1a5ba075e7b5a76fc00c5f9f539ff28c108598f5708a0369d5bd92683def5a20c2fe60cab7827b42d628dbfcc79b57e0e91b84dd9 DIST julia-utf8proc-97ef668b312b96382714dbb8eaac4affce0816e6.tar.gz 156361 BLAKE2B e5e1485b758e959ed78f7fde8b211376da2365e5835708042de57c091b10b59755e1203a9f88c0d761687bf3d166207410de6ec203d80fef4dbdf06a50404cd1 SHA512 1c80dc6e71fdad187b142d02e561dfe1880857baaec08d36240ecb2f275d1bc5467aace84eebe5a10fd3f4c40b0035e65a5db3ec2a9ee6940920b0aad6221c55 diff --git a/dev-lang/julia/files/julia-1.1.0-fix_build_system.patch b/dev-lang/julia/files/julia-1.1.0-fix_build_system.patch new file mode 100644 index 00000000000..394f5900a90 --- /dev/null +++ b/dev-lang/julia/files/julia-1.1.0-fix_build_system.patch @@ -0,0 +1,53 @@ +diff --git a/Make.inc b/Make.inc +index 81ff923..79e47f1 100644 +--- a/Make.inc ++++ b/Make.inc +@@ -185,7 +185,7 @@ USE_GPL_LIBS ?= 1 + # Directories where said libraries get installed to + prefix ?= $(BUILDROOT)/julia-$(JULIA_COMMIT) + bindir := $(prefix)/bin +-libdir := $(prefix)/lib ++libdir := $(prefix)/GENTOOLIBDIR + libexecdir := $(prefix)/libexec + datarootdir := $(prefix)/share + docdir := $(datarootdir)/doc/julia +@@ -417,7 +417,7 @@ ifneq ($(OS), WINNT) + JCXXFLAGS += -pedantic + endif + DEBUGFLAGS := -O0 -ggdb2 -DJL_DEBUG_BUILD -fstack-protector-all +-SHIPFLAGS := -O3 -ggdb2 -falign-functions ++SHIPFLAGS := GENTOOCFLAGS + endif + + ifeq ($(USECLANG),1) +@@ -428,7 +428,7 @@ JCFLAGS := -pipe $(fPIC) -fno-strict-aliasing -D_FILE_OFFSET_BITS=64 + JCPPFLAGS := -fasynchronous-unwind-tables + JCXXFLAGS := -pipe $(fPIC) -fno-rtti -pedantic + DEBUGFLAGS := -O0 -g -DJL_DEBUG_BUILD -fstack-protector-all +-SHIPFLAGS := -O3 -g ++SHIPFLAGS := GENTOOCFLAGS + ifeq ($(OS), Darwin) + ifeq ($(USE_LIBCPP), 1) + MACOSX_VERSION_MIN := 10.8 +@@ -457,7 +457,7 @@ JCFLAGS := -std=gnu11 -pipe $(fPIC) -fno-strict-aliasing -D_FILE_OFFSET_BITS=64 + JCPPFLAGS := + JCXXFLAGS := -pipe $(fPIC) -fno-rtti + DEBUGFLAGS := -O0 -g -DJL_DEBUG_BUILD -fstack-protector-all +-SHIPFLAGS := -O3 -g -falign-functions ++SHIPFLAGS := GENTOOCFLAGS + endif + + ifeq ($(USECCACHE), 1) +diff --git a/doc/Makefile b/doc/Makefile +index 99e60ee..2027fb5 100644 +--- a/doc/Makefile ++++ b/doc/Makefile +@@ -30,7 +30,7 @@ deps: UnicodeData.txt + $(JLCHECKSUM) UnicodeData.txt + + clean: +- -rm -rf _build/* deps/* docbuild.log UnicodeData.txt ++ @echo "Do not clean doc/_build/html. Just use it..." + + cleanall: clean + diff --git a/dev-lang/julia/julia-1.1.0_rc1.ebuild b/dev-lang/julia/julia-1.1.0_rc1.ebuild new file mode 100644 index 00000000000..36db882f1ed --- /dev/null +++ b/dev-lang/julia/julia-1.1.0_rc1.ebuild @@ -0,0 +1,197 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +RESTRICT="test" + +inherit pax-utils toolchain-funcs + +MY_PV="${PV//_rc/-rc}" +MY_LIBUV_V="2348256acf5759a544e5ca7935f638d2bc091d60" +MY_UTF8PROC_V="97ef668b312b96382714dbb8eaac4affce0816e6" +MY_LIBWHICH_V="81e9723c0273d78493dc8c8ed570f68d9ce7e89e" +MY_DSFMT_V="2.2.3" +MY_LLVM="6.0.1" + +DESCRIPTION="High-performance programming language for technical computing" +HOMEPAGE="https://julialang.org/"; +SRC_URI=" + https://github.com/JuliaLang/${PN}/releases/download/v${MY_PV}/${PN}-${MY_PV}.tar.gz + https://api.github.com/repos/JuliaLang/libuv/tarball/${MY_LIBUV_V} -> ${PN}-libuv-${MY_LIBUV_V}.tar.gz + https://api.github.com/repos/JuliaLang/utf8proc/tarball/${MY_UTF8PROC_V} -> ${PN}-utf8proc-${MY_UTF8PROC_V}.tar.gz + https://api.github.com/repos/vtjnash/libwhich/tarball/${MY_LIBWHICH_V} -> ${PN}-libwhich-${MY_LIBWHICH_V}.tar.gz + http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/SFMT/dSFMT-src-${MY_DSFMT_V}.tar.gz -> ${PN}-dsfmt-${MY_DSFMT_V}.tar.gz + http://releases.llvm.org/${MY_LLVM}/llvm-${MY_LLVM}.src.tar.xz -> ${PN}-llvm-${MY_LLVM}.src.tar.xz +" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="" +IUSE="" + +RDEPEND+=" + dev-libs/double-conversion:0= + dev-libs/gmp:0= + dev-libs/libgit2:0= + >=dev-libs/libpcre2-10.23:0=[jit] + dev-libs/mpfr:0= + dev-libs/openspecfun + 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/glpk:0= + >=sys-libs/libunwind-1.1:7= + sys-libs/readline:0= + sys-libs/zlib:0= + >=virtual/blas-3.6 + virtual/lapack" + +DEPEND="${RDEPEND} + dev-vcs/git + dev-util/patchelf + virtual/pkgconfig" + +PATCHES=( + "${FILESDIR}"/${PN}-1.1.0-fix_build_system.patch +) + +S="${WORKDIR}/${PN}-${MY_PV}" + +src_unpack() { + tounpack=(${A}) + # the main source tree, followed by deps + unpack "${A/%\ */}" + + 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 + # - fix BLAS and LAPACK link interface + + sed -i \ + -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|GENTOOCFLAGS|${CFLAGS}|g" \ + -e "s|GENTOOLIBDIR|$(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 + + # 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() { + # julia does not play well with the system versions of dsfmt, libuv, + # and utf8proc + + # USE_SYSTEM_LIBM=0 implies using external openlibm + cat <<-EOF > Make.user + USE_SYSTEM_ARPACK:=1 + USE_SYSTEM_BLAS:=1 + USE_SYSTEM_DSFMT:=0 + USE_SYSTEM_GMP:=1 + USE_SYSTEM_GRISU:=1 + USE_SYSTEM_LAPACK:=1 + USE_SYSTEM_LIBGIT2:=1 + USE_SYSTEM_LIBM:=0 + USE_SYSTEM_LIBUNWIND:=1 + USE_SYSTEM_LIBUV:=0 + USE_SYSTEM_LLVM:=0 + USE_SYSTEM_MPFR:=1 + USE_SYSTEM_OPENLIBM:=1 + USE_SYSTEM_OPENSPECFUN:=1 + USE_SYSTEM_PATCHELF:=1 + USE_SYSTEM_PCRE:=1 + USE_SYSTEM_READLINE:=1 + USE_SYSTEM_RMATH:=0 + USE_SYSTEM_SUITESPARSE:=1 + USE_SYSTEM_UTF8PROC:=0 + USE_SYSTEM_ZLIB=1 + VERBOSE=1 + libdir="${EROOT}/usr/$(get_libdir)" + EOF + +} + +src_compile() { + + # Julia accesses /proc/self/mem on Linux + addpredict /proc/self/mem + + emake cleanall + emake julia-release \ + prefix="${EPREFIX}/usr" DESTDIR="${D}" \ + CC="$(tc-getCC)" CXX="$(tc-getCXX)" + pax-mark m $(file usr/bin/julia-* | awk -F : '/ELF/ {print $1}') + emake +} + +src_test() { + emake test +} + +src_install() { + # Julia is special. It tries to find a valid git repository (that would + # normally be cloned during compilation/installation). Just make it + # happy... + git init && \ + git config --local user.email "[email protected]" && \ + git config --local user.name "Whyyyyyy" && \ + git commit -a --allow-empty -m "initial" || die "git failed" + + emake install \ + prefix="${EPREFIX}/usr" DESTDIR="${D}" \ + CC="$(tc-getCC)" CXX="$(tc-getCXX)" + cat > 99julia <<-EOF + LDPATH=${EROOT%/}/usr/$(get_libdir)/julia + EOF + doenvd 99julia + + 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 +}
