commit: 3040b1578a07c14d7f9c2d64ba09b062b789c11c Author: Matthias Maier <tamiko <AT> gentoo <DOT> org> AuthorDate: Thu Aug 30 02:11:21 2018 +0000 Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org> CommitDate: Fri Aug 31 02:31:08 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3040b157
dev-lang/julia: version bump to 1.0.0 Closes: https://bugs.gentoo.org/663266 Package-Manager: Portage-2.3.48, Repoman-2.3.10 dev-lang/julia/Manifest | 2 + .../julia/files/julia-1.0.0-fix_build_system.patch | 75 ++++++++ dev-lang/julia/julia-1.0.0.ebuild | 202 +++++++++++++++++++++ 3 files changed, 279 insertions(+) diff --git a/dev-lang/julia/Manifest b/dev-lang/julia/Manifest index 0124be31939..88b87cdcf4b 100644 --- a/dev-lang/julia/Manifest +++ b/dev-lang/julia/Manifest @@ -1,2 +1,4 @@ DIST julia-0.6.3-bundled.tar.gz 2099258 BLAKE2B dea1f5d37477e0a612e3901d7d568e8c4b350496f9d2b344cd7e2c2043ae30b4dd26b567803a2cb96d1ec4dbe2ba514fb08b925c695589746691887334330dd2 SHA512 d04cd55ba0dde08f253db3a388cf5ebe87cec8ae321a5af4c1c92f2680aa6e6ef2ebfa771ec74f8f1ff96409e2c0645476acf577859e8718eac4a581f097639d DIST julia-0.6.3.tar.gz 5542642 BLAKE2B cccd1ee2eb4d9f59382a0d1f6466e77c84b0542456c405c05b718bc8a39ff537a09760a523ee572fc9eee6797158aa00010fc4c931a80deac645fb1e45061c87 SHA512 f529bb30a17989234061cf4c3d87aecc6da720eb494efaca7be4ec1ed5eda60d440896fb76a45b6cb30205030256e7de765e8944f873b31d96f7c9ecac542db8 +DIST julia-1.0.0-bundled.tar.gz 3740215 BLAKE2B 1d230d9f2ba47a1ee3221d1a4c94648bd02a80c30205dd9d438f78261e005ab7ed2173a3c7673489b17ee50050a4cbc0563ce90f16202b8cea65e4c65155cf2c SHA512 be89442366e0ebc789c16485b790368ef8702375bc1c1520d33bda152c8eda988a87f0a389d9b060f51b00ad0c249a95149468ab296811cd7050e110368d256a +DIST julia-1.0.0.tar.gz 7378753 BLAKE2B 1fcf3a63b00b6a49a86ca69b6ee809a28c828287c739405ae180e96645d565de0941b049d319f82f60e1ee63ee89629be213ecb22ab1ea901b306d1e149fa861 SHA512 5a53b16a1ab57cdffa5dadf11e78c413ed9f18af23ae90b64dee8323c2fc9bd6e6918b341f48accbcb7a6eab559811c80d72ac3ac0576c7cf6c9c9057356f6ba diff --git a/dev-lang/julia/files/julia-1.0.0-fix_build_system.patch b/dev-lang/julia/files/julia-1.0.0-fix_build_system.patch new file mode 100644 index 00000000000..1ed19d6e06e --- /dev/null +++ b/dev-lang/julia/files/julia-1.0.0-fix_build_system.patch @@ -0,0 +1,75 @@ +diff --git a/Make.inc b/Make.inc +index 8e0df61..5747a1c 100644 +--- a/Make.inc ++++ b/Make.inc +@@ -181,7 +181,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 +@@ -413,7 +413,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) +@@ -424,7 +424,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 +@@ -453,7 +453,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 89b7988..c3125fd 100644 +--- a/doc/Makefile ++++ b/doc/Makefile +@@ -29,7 +29,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/src/Makefile b/src/Makefile +index 20da34d..84eae21 100644 +--- a/src/Makefile ++++ b/src/Makefile +@@ -88,16 +88,7 @@ UV_HEADERS += uv/*.h + endif + PUBLIC_HEADER_TARGETS := $(addprefix $(build_includedir)/julia/,$(notdir $(PUBLIC_HEADERS)) $(UV_HEADERS)) + +-ifeq ($(JULIACODEGEN),LLVM) +-# In LLVM < 3.4, --ldflags includes both options and libraries, so use it both before and after --libs +-# In LLVM >= 3.4, --ldflags has only options, and --system-libs has the libraries. +-ifneq ($(USE_LLVM_SHLIB),1) +-LLVMLINK += $(shell $(LLVM_CONFIG_HOST) --ldflags) $(shell $(LLVM_CONFIG_HOST) --libs $(LLVM_LIBS)) $(shell $(LLVM_CONFIG_HOST) --ldflags) $(shell $(LLVM_CONFIG_HOST) --system-libs 2> /dev/null) +-else +-LLVMLINK += $(shell $(LLVM_CONFIG_HOST) --ldflags) -lLLVM +-FLAGS += -DLLVM_SHLIB +-endif # USE_LLVM_SHLIB == 1 +-endif ++LLVMLINK = $(call exec,$(LLVM_CONFIG) --ldflags) $(call exec,$(LLVM_CONFIG) --libs) $(call exec,$(LLVM_CONFIG) --ldflags) $(call exec,$(LLVM_CONFIG) --system-libs) + + COMMON_LIBS := -L$(build_shlibdir) -L$(build_libdir) $(LIBUV) $(LIBUTF8PROC) $(NO_WHOLE_ARCHIVE) $(LLVMLINK) $(OSLIBS) + DEBUG_LIBS := $(WHOLE_ARCHIVE) $(BUILDDIR)/flisp/libflisp-debug.a $(WHOLE_ARCHIVE) $(BUILDDIR)/support/libsupport-debug.a $(COMMON_LIBS) diff --git a/dev-lang/julia/julia-1.0.0.ebuild b/dev-lang/julia/julia-1.0.0.ebuild new file mode 100644 index 00000000000..a9701eaddef --- /dev/null +++ b/dev-lang/julia/julia-1.0.0.ebuild @@ -0,0 +1,202 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +RESTRICT="test" + +inherit llvm pax-utils toolchain-funcs + +DESCRIPTION="High-performance programming language for technical computing" +HOMEPAGE="https://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 +" + +S="${WORKDIR}/julia" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" +IUSE="" + +RDEPEND=" + >=sys-devel/llvm-4.0.0:= + >=sys-devel/clang-4.0.0:=" +LLVM_MAX_SLOT=5 + +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.0.0-fix_build_system.patch +) + +src_prepare() { + mv "${WORKDIR}"/bundled/UnicodeData.txt doc || die + mkdir deps/srccache || die + mv "${WORKDIR}"/bundled/* deps/srccache || die + rmdir "${WORKDIR}"/bundled || die + + 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_DSFMT=0 + USE_SYSTEM_LIBUV=0 + USE_SYSTEM_PCRE=1 + USE_SYSTEM_RMATH=0 + USE_SYSTEM_UTF8PROC=0 + USE_LLVM_SHLIB=0 + 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=0 + 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 + libdir="${EROOT}/usr/$(get_libdir)" + EOF + +} + +src_compile() { + + # Julia accesses /proc/self/mem on Linux + addpredict /proc/self/mem + + emake cleanall + + # Create symlinks... + 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}" + mkdir -p "${S}"/usr/lib/julia || die "mkdir failed" + for i in ${libblas}.so ${liblapack}.so libumfpack.so libspqr.so; do + ln -s "${EROOT}/usr/$(get_libdir)/${i}" "${S}"/usr/lib/julia/ || die "ln failed" + done + + emake VERBOSE=1 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 "whatyoudo...@example.com" && \ + 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/{examples,html} \ + "${ED}"/usr/share/doc/${PF} || die + rmdir "${ED}"/usr/share/doc/julia || die +}
