diff options
| -rw-r--r-- | dev-lang/julia/Manifest | 5 | ||||
| -rw-r--r-- | dev-lang/julia/files/julia-0.7.0-fix_build_system.patch | 86 | ||||
| -rw-r--r-- | dev-lang/julia/files/julia-1.0.0-fix_build_system.patch | 27 | ||||
| -rw-r--r-- | dev-lang/julia/julia-1.0.0.ebuild | 96 |
4 files changed, 157 insertions, 57 deletions
diff --git a/dev-lang/julia/Manifest b/dev-lang/julia/Manifest index 88b87cdcf4b0..04afe500355f 100644 --- a/dev-lang/julia/Manifest +++ b/dev-lang/julia/Manifest @@ -1,4 +1,7 @@ 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 +DIST julia-dsfmt-2.2.3.tar.gz 291773 BLAKE2B 6ffae90494d72527920c80fc0fb005da1c7b84f8a03a7ecb0789434c0fff97359e5098e85431896dffccc7d5148c414e847aaba5feef648b8788421a466ff65e SHA512 6d8ddcd01aab3f9039f4f0288a8af53e290cc2f293ed8c4a8c9f3b3f12398e7eedfce8016117b425766ba89c61c86c13b3e420035b5f9bf91315b8b814c03662 +DIST julia-libuv-ed3700c849289ed01fe04273a7bf865340b2bd7e.tar.gz 1492695 BLAKE2B ad03512dd1db2c7066b46b5a3a314645b925481d8ace09ac0a0ae23cf5b8a64338ad457f8df229aa82f1d45605b5366883f563f2e22756ce28bb6fb7607d7124 SHA512 1305035b1372bdf234e3c5e673ee4c8ab5bda83ff06bc27704786def52667c3143fe587fca8f6e0855ba0c8b6d4dd90b2faefd33736224173f459d751885683e +DIST julia-libwhich-81e9723c0273d78493dc8c8ed570f68d9ce7e89e.tar.gz 4183 BLAKE2B c932e23b1b476d3fd16cf6f451efd5fc6d9c1ec2c53e8ac086340a100817d9b30dae3eff50b284a42c09b2bbae30b9e2fd38b2881f8cbf4974a89f3bd0c87599 SHA512 6fb77b715d70d9bc95a8546c3bf97bd3677c7ea344b88bb5bc3bbfac9dceabe8a8cde7a0f64dec884cde802e4a3000e30837d3f824b5a9242348c4fe061526a3 +DIST julia-utf8proc-97ef668b312b96382714dbb8eaac4affce0816e6.tar.gz 156361 BLAKE2B e5e1485b758e959ed78f7fde8b211376da2365e5835708042de57c091b10b59755e1203a9f88c0d761687bf3d166207410de6ec203d80fef4dbdf06a50404cd1 SHA512 1c80dc6e71fdad187b142d02e561dfe1880857baaec08d36240ecb2f275d1bc5467aace84eebe5a10fd3f4c40b0035e65a5db3ec2a9ee6940920b0aad6221c55 diff --git a/dev-lang/julia/files/julia-0.7.0-fix_build_system.patch b/dev-lang/julia/files/julia-0.7.0-fix_build_system.patch new file mode 100644 index 000000000000..028a2f7e08cc --- /dev/null +++ b/dev-lang/julia/files/julia-0.7.0-fix_build_system.patch @@ -0,0 +1,86 @@ +diff --git a/Make.inc b/Make.inc +index 8cb2c1014..d3be9de8e 100644 +--- a/Make.inc ++++ b/Make.inc +@@ -178,7 +178,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 +@@ -410,7 +410,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) +@@ -421,7 +421,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 +@@ -450,7 +450,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 89b79880d..c3125fde1 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 257152d24..240a4a350 100644 +--- a/src/Makefile ++++ b/src/Makefile +@@ -85,16 +85,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) + +--- a/base/Makefile 2018-08-10 23:56:13.825429621 -0400 ++++ b/base/Makefile 2018-08-10 23:43:29.461769645 -0400 +@@ -207,7 +207,6 @@ + ln -sf "$$REALPATH" "$@" + ifneq ($(USE_SYSTEM_LLVM),0) + ifneq ($(USE_LLVM_SHLIB),0) +-SYMLINK_SYSTEM_LIBRARIES += symlink_libLLVM + endif + endif + 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 index 1ed19d6e06e8..028a2f7e08cc 100644 --- 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 @@ -1,8 +1,8 @@ diff --git a/Make.inc b/Make.inc -index 8e0df61..5747a1c 100644 +index 8cb2c1014..d3be9de8e 100644 --- a/Make.inc +++ b/Make.inc -@@ -181,7 +181,7 @@ USE_GPL_LIBS ?= 1 +@@ -178,7 +178,7 @@ USE_GPL_LIBS ?= 1 # Directories where said libraries get installed to prefix ?= $(BUILDROOT)/julia-$(JULIA_COMMIT) bindir := $(prefix)/bin @@ -11,7 +11,7 @@ index 8e0df61..5747a1c 100644 libexecdir := $(prefix)/libexec datarootdir := $(prefix)/share docdir := $(datarootdir)/doc/julia -@@ -413,7 +413,7 @@ ifneq ($(OS), WINNT) +@@ -410,7 +410,7 @@ ifneq ($(OS), WINNT) JCXXFLAGS += -pedantic endif DEBUGFLAGS := -O0 -ggdb2 -DJL_DEBUG_BUILD -fstack-protector-all @@ -20,7 +20,7 @@ index 8e0df61..5747a1c 100644 endif ifeq ($(USECLANG),1) -@@ -424,7 +424,7 @@ JCFLAGS := -pipe $(fPIC) -fno-strict-aliasing -D_FILE_OFFSET_BITS=64 +@@ -421,7 +421,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 @@ -29,7 +29,7 @@ index 8e0df61..5747a1c 100644 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 +@@ -450,7 +450,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 @@ -39,7 +39,7 @@ index 8e0df61..5747a1c 100644 ifeq ($(USECCACHE), 1) diff --git a/doc/Makefile b/doc/Makefile -index 89b7988..c3125fd 100644 +index 89b79880d..c3125fde1 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -29,7 +29,7 @@ deps: UnicodeData.txt @@ -52,10 +52,10 @@ index 89b7988..c3125fd 100644 cleanall: clean diff --git a/src/Makefile b/src/Makefile -index 20da34d..84eae21 100644 +index 257152d24..240a4a350 100644 --- a/src/Makefile +++ b/src/Makefile -@@ -88,16 +88,7 @@ UV_HEADERS += uv/*.h +@@ -85,16 +85,7 @@ UV_HEADERS += uv/*.h endif PUBLIC_HEADER_TARGETS := $(addprefix $(build_includedir)/julia/,$(notdir $(PUBLIC_HEADERS)) $(UV_HEADERS)) @@ -73,3 +73,14 @@ index 20da34d..84eae21 100644 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) + +--- a/base/Makefile 2018-08-10 23:56:13.825429621 -0400 ++++ b/base/Makefile 2018-08-10 23:43:29.461769645 -0400 +@@ -207,7 +207,6 @@ + ln -sf "$$REALPATH" "$@" + ifneq ($(USE_SYSTEM_LLVM),0) + ifneq ($(USE_LLVM_SHLIB),0) +-SYMLINK_SYSTEM_LIBRARIES += symlink_libLLVM + endif + endif + diff --git a/dev-lang/julia/julia-1.0.0.ebuild b/dev-lang/julia/julia-1.0.0.ebuild index 7d03d2d0b874..f7b451ce750c 100644 --- a/dev-lang/julia/julia-1.0.0.ebuild +++ b/dev-lang/julia/julia-1.0.0.ebuild @@ -7,24 +7,33 @@ RESTRICT="test" inherit llvm pax-utils toolchain-funcs +MY_LIBUV_V="ed3700c849289ed01fe04273a7bf865340b2bd7e" +MY_UTF8PROC_V="97ef668b312b96382714dbb8eaac4affce0816e6" +MY_LIBWHICH_V="81e9723c0273d78493dc8c8ed570f68d9ce7e89e" +MY_DSFMT_V="2.2.3" + 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 + 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 " -S="${WORKDIR}/julia" +S="${WORKDIR}/${PN}" LICENSE="MIT" SLOT="0" KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" IUSE="" +# julia 0.7* needs a patched llvm-6 RDEPEND=" - >=sys-devel/llvm-4.0.0:= - >=sys-devel/clang-4.0.0:=" -LLVM_MAX_SLOT=5 + =sys-devel/llvm-6*:= + =sys-devel/clang-6*:=" +LLVM_MAX_SLOT=6 RDEPEND+=" dev-libs/double-conversion:0= @@ -59,12 +68,18 @@ 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 +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: @@ -115,28 +130,27 @@ src_configure() { # 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_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:=1 + USE_LLVM_SHLIB:=1 + 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)" @@ -150,20 +164,7 @@ src_compile() { 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 \ + 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}') @@ -195,7 +196,6 @@ src_install() { 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 + mv "${ED}"/usr/share/doc/julia/html "${ED}"/usr/share/doc/${PF} || die rmdir "${ED}"/usr/share/doc/julia || die } |