Gentoo Archives: gentoo-commits

From: Matthias Maier <tamiko@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-lang/julia/, dev-lang/julia/files/
Date: Mon, 07 Jan 2019 21:38:57
Message-Id: 1546896927.d1a0caaf5939890c733588263a110ece7a2900ac.tamiko@gentoo
1 commit: d1a0caaf5939890c733588263a110ece7a2900ac
2 Author: Matthias Maier <tamiko <AT> gentoo <DOT> org>
3 AuthorDate: Mon Jan 7 20:32:01 2019 +0000
4 Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org>
5 CommitDate: Mon Jan 7 21:35:27 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d1a0caaf
7
8 dev-lang/julia: version bump to 1.0.3
9
10 Package-Manager: Portage-2.3.54, Repoman-2.3.12
11 Signed-off-by: Matthias Maier <tamiko <AT> gentoo.org>
12
13 dev-lang/julia/Manifest | 1 +
14 .../julia/files/julia-1.0.3-fix_build_system.patch | 87 +++++++++
15 dev-lang/julia/julia-1.0.3.ebuild | 199 +++++++++++++++++++++
16 3 files changed, 287 insertions(+)
17
18 diff --git a/dev-lang/julia/Manifest b/dev-lang/julia/Manifest
19 index 504424eb73b..b0c5dfe9bbf 100644
20 --- a/dev-lang/julia/Manifest
21 +++ b/dev-lang/julia/Manifest
22 @@ -2,6 +2,7 @@ DIST julia-0.6.3-bundled.tar.gz 2099258 BLAKE2B dea1f5d37477e0a612e3901d7d568e8c
23 DIST julia-0.6.3.tar.gz 5542642 BLAKE2B cccd1ee2eb4d9f59382a0d1f6466e77c84b0542456c405c05b718bc8a39ff537a09760a523ee572fc9eee6797158aa00010fc4c931a80deac645fb1e45061c87 SHA512 f529bb30a17989234061cf4c3d87aecc6da720eb494efaca7be4ec1ed5eda60d440896fb76a45b6cb30205030256e7de765e8944f873b31d96f7c9ecac542db8
24 DIST julia-0.7.0.tar.gz 7547849 BLAKE2B 6721e980a5fd84f1a28838a91acdd95e8562dd971903e30776dfb90a6cc0ac1ffbedd22c2bfee45bd2fa616adead82680ebe30f9b86a1d968db2353233b32bc2 SHA512 296dbc71fe5238b0cbdc5c67f7002fbf05abea85dc4298784d74fbfef1c96890ab9cc1bbe874337c01f39ca08a6022f6abcde3a5e2ff1cdc25f2f7493ead1804
25 DIST julia-1.0.1.tar.gz 7382328 BLAKE2B 61ff64298f3740fb50a2cb9c5561e1d4594eea8edbecc4fde9771807be22f753b6c606a530eea9bf569aaccbb4c4a39664ba5d08793d8e127d0988cf7b0244f8 SHA512 41ca8c0280c4914e43f5a37ed09ce47174f991e3079703a705081265509d22cd6cb66a928dc1c41d473a3d8cc59bb6f74e25e3a960e828d6e469d85a8db58c18
26 +DIST julia-1.0.3.tar.gz 7460268 BLAKE2B d9d42e0235f249fa8c1ced12c659091b97d338ec4a4662ea13ea6a107cb59e90d8385c51962199e47dae5f9770156be2db2d8bb2e3cc8f42aa7403b4f4ca7f04 SHA512 b61399c7b7ffae828264a6ec916b409b2cbc6b3b98d9a6d39b60b014a97a1f1ad75e1ed4860d9ab15d1e5ffec691c04d1b797c238953290770b7313790ae3f1d
27 DIST julia-dsfmt-2.2.3.tar.gz 291773 BLAKE2B 6ffae90494d72527920c80fc0fb005da1c7b84f8a03a7ecb0789434c0fff97359e5098e85431896dffccc7d5148c414e847aaba5feef648b8788421a466ff65e SHA512 6d8ddcd01aab3f9039f4f0288a8af53e290cc2f293ed8c4a8c9f3b3f12398e7eedfce8016117b425766ba89c61c86c13b3e420035b5f9bf91315b8b814c03662
28 DIST julia-libuv-ed3700c849289ed01fe04273a7bf865340b2bd7e.tar.gz 1492695 BLAKE2B ad03512dd1db2c7066b46b5a3a314645b925481d8ace09ac0a0ae23cf5b8a64338ad457f8df229aa82f1d45605b5366883f563f2e22756ce28bb6fb7607d7124 SHA512 1305035b1372bdf234e3c5e673ee4c8ab5bda83ff06bc27704786def52667c3143fe587fca8f6e0855ba0c8b6d4dd90b2faefd33736224173f459d751885683e
29 DIST julia-libwhich-81e9723c0273d78493dc8c8ed570f68d9ce7e89e.tar.gz 4183 BLAKE2B c932e23b1b476d3fd16cf6f451efd5fc6d9c1ec2c53e8ac086340a100817d9b30dae3eff50b284a42c09b2bbae30b9e2fd38b2881f8cbf4974a89f3bd0c87599 SHA512 6fb77b715d70d9bc95a8546c3bf97bd3677c7ea344b88bb5bc3bbfac9dceabe8a8cde7a0f64dec884cde802e4a3000e30837d3f824b5a9242348c4fe061526a3
30
31 diff --git a/dev-lang/julia/files/julia-1.0.3-fix_build_system.patch b/dev-lang/julia/files/julia-1.0.3-fix_build_system.patch
32 new file mode 100644
33 index 00000000000..98f4fc5c754
34 --- /dev/null
35 +++ b/dev-lang/julia/files/julia-1.0.3-fix_build_system.patch
36 @@ -0,0 +1,87 @@
37 +diff --git a/Make.inc b/Make.inc
38 +index e5c102f..c4c6640 100644
39 +--- a/Make.inc
40 ++++ b/Make.inc
41 +@@ -181,7 +181,7 @@ USE_GPL_LIBS ?= 1
42 + # Directories where said libraries get installed to
43 + prefix ?= $(BUILDROOT)/julia-$(JULIA_COMMIT)
44 + bindir := $(prefix)/bin
45 +-libdir := $(prefix)/lib
46 ++libdir := $(prefix)/GENTOOLIBDIR
47 + libexecdir := $(prefix)/libexec
48 + datarootdir := $(prefix)/share
49 + docdir := $(datarootdir)/doc/julia
50 +@@ -413,7 +413,7 @@ ifneq ($(OS), WINNT)
51 + JCXXFLAGS += -pedantic
52 + endif
53 + DEBUGFLAGS := -O0 -ggdb2 -DJL_DEBUG_BUILD -fstack-protector-all
54 +-SHIPFLAGS := -O3 -ggdb2 -falign-functions
55 ++SHIPFLAGS := GENTOOCFLAGS
56 + endif
57 +
58 + ifeq ($(USECLANG),1)
59 +@@ -424,7 +424,7 @@ JCFLAGS := -pipe $(fPIC) -fno-strict-aliasing -D_FILE_OFFSET_BITS=64
60 + JCPPFLAGS := -fasynchronous-unwind-tables
61 + JCXXFLAGS := -pipe $(fPIC) -fno-rtti -pedantic
62 + DEBUGFLAGS := -O0 -g -DJL_DEBUG_BUILD -fstack-protector-all
63 +-SHIPFLAGS := -O3 -g
64 ++SHIPFLAGS := GENTOOCFLAGS
65 + ifeq ($(OS), Darwin)
66 + ifeq ($(USE_LIBCPP), 1)
67 + MACOSX_VERSION_MIN := 10.8
68 +@@ -453,7 +453,7 @@ JCFLAGS := -std=gnu11 -pipe $(fPIC) -fno-strict-aliasing -D_FILE_OFFSET_BITS=64
69 + JCPPFLAGS :=
70 + JCXXFLAGS := -pipe $(fPIC) -fno-rtti
71 + DEBUGFLAGS := -O0 -g -DJL_DEBUG_BUILD -fstack-protector-all
72 +-SHIPFLAGS := -O3 -g -falign-functions
73 ++SHIPFLAGS := GENTOOCFLAGS
74 + endif
75 +
76 + ifeq ($(USECCACHE), 1)
77 +diff --git a/base/Makefile b/base/Makefile
78 +index 21c7ad4..737e40d 100644
79 +--- a/base/Makefile
80 ++++ b/base/Makefile
81 +@@ -207,7 +207,6 @@ $(build_private_libdir)/libLLVM.dylib:
82 + ln -sf "$$REALPATH" "$@"
83 + ifneq ($(USE_SYSTEM_LLVM),0)
84 + ifneq ($(USE_LLVM_SHLIB),0)
85 +-SYMLINK_SYSTEM_LIBRARIES += symlink_libLLVM
86 + endif
87 + endif
88 +
89 +diff --git a/doc/Makefile b/doc/Makefile
90 +index 3d07733..8bd3bc0 100644
91 +--- a/doc/Makefile
92 ++++ b/doc/Makefile
93 +@@ -29,7 +29,7 @@ deps: UnicodeData.txt
94 + $(JLCHECKSUM) UnicodeData.txt
95 +
96 + clean:
97 +- -rm -rf _build/* deps/* docbuild.log UnicodeData.txt
98 ++ @echo "Do not clean doc/_build/html. Just use it..."
99 +
100 + cleanall: clean
101 +
102 +diff --git a/src/Makefile b/src/Makefile
103 +index 20da34d..84eae21 100644
104 +--- a/src/Makefile
105 ++++ b/src/Makefile
106 +@@ -88,16 +88,7 @@ UV_HEADERS += uv/*.h
107 + endif
108 + PUBLIC_HEADER_TARGETS := $(addprefix $(build_includedir)/julia/,$(notdir $(PUBLIC_HEADERS)) $(UV_HEADERS))
109 +
110 +-ifeq ($(JULIACODEGEN),LLVM)
111 +-# In LLVM < 3.4, --ldflags includes both options and libraries, so use it both before and after --libs
112 +-# In LLVM >= 3.4, --ldflags has only options, and --system-libs has the libraries.
113 +-ifneq ($(USE_LLVM_SHLIB),1)
114 +-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)
115 +-else
116 +-LLVMLINK += $(shell $(LLVM_CONFIG_HOST) --ldflags) -lLLVM
117 +-FLAGS += -DLLVM_SHLIB
118 +-endif # USE_LLVM_SHLIB == 1
119 +-endif
120 ++LLVMLINK = $(call exec,$(LLVM_CONFIG) --ldflags) $(call exec,$(LLVM_CONFIG) --libs) $(call exec,$(LLVM_CONFIG) --ldflags) $(call exec,$(LLVM_CONFIG) --system-libs)
121 +
122 + COMMON_LIBS := -L$(build_shlibdir) -L$(build_libdir) $(LIBUV) $(LIBUTF8PROC) $(NO_WHOLE_ARCHIVE) $(LLVMLINK) $(OSLIBS)
123 + DEBUG_LIBS := $(WHOLE_ARCHIVE) $(BUILDDIR)/flisp/libflisp-debug.a $(WHOLE_ARCHIVE) $(BUILDDIR)/support/libsupport-debug.a $(COMMON_LIBS)
124
125 diff --git a/dev-lang/julia/julia-1.0.3.ebuild b/dev-lang/julia/julia-1.0.3.ebuild
126 new file mode 100644
127 index 00000000000..1194c900964
128 --- /dev/null
129 +++ b/dev-lang/julia/julia-1.0.3.ebuild
130 @@ -0,0 +1,199 @@
131 +# Copyright 1999-2019 Gentoo Authors
132 +# Distributed under the terms of the GNU General Public License v2
133 +
134 +EAPI=6
135 +
136 +RESTRICT="test"
137 +
138 +inherit llvm pax-utils toolchain-funcs
139 +
140 +MY_LIBUV_V="ed3700c849289ed01fe04273a7bf865340b2bd7e"
141 +MY_UTF8PROC_V="97ef668b312b96382714dbb8eaac4affce0816e6"
142 +MY_LIBWHICH_V="81e9723c0273d78493dc8c8ed570f68d9ce7e89e"
143 +MY_DSFMT_V="2.2.3"
144 +
145 +DESCRIPTION="High-performance programming language for technical computing"
146 +HOMEPAGE="https://julialang.org/"
147 +SRC_URI="
148 + https://github.com/JuliaLang/${PN}/releases/download/v${PV}/${P}.tar.gz
149 + https://api.github.com/repos/JuliaLang/libuv/tarball/${MY_LIBUV_V} -> ${PN}-libuv-${MY_LIBUV_V}.tar.gz
150 + https://api.github.com/repos/JuliaLang/utf8proc/tarball/${MY_UTF8PROC_V} -> ${PN}-utf8proc-${MY_UTF8PROC_V}.tar.gz
151 + https://api.github.com/repos/vtjnash/libwhich/tarball/${MY_LIBWHICH_V} -> ${PN}-libwhich-${MY_LIBWHICH_V}.tar.gz
152 + 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
153 +"
154 +
155 +LICENSE="MIT"
156 +SLOT="0"
157 +KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
158 +IUSE=""
159 +
160 +# julia 0.7* needs a patched llvm-6
161 +RDEPEND="
162 + =sys-devel/llvm-6*:=
163 + =sys-devel/clang-6*:="
164 +LLVM_MAX_SLOT=6
165 +
166 +RDEPEND+="
167 + dev-libs/double-conversion:0=
168 + dev-libs/gmp:0=
169 + dev-libs/libgit2:0=
170 + >=dev-libs/libpcre2-10.23:0=[jit]
171 + dev-libs/mpfr:0=
172 + dev-libs/openspecfun
173 + sci-libs/amd:0=
174 + sci-libs/arpack:0=
175 + sci-libs/camd:0=
176 + sci-libs/ccolamd:0=
177 + sci-libs/cholmod:0=
178 + sci-libs/colamd:0=
179 + sci-libs/fftw:3.0=[threads]
180 + sci-libs/openlibm:0=
181 + sci-libs/spqr:0=
182 + sci-libs/umfpack:0=
183 + sci-mathematics/glpk:0=
184 + >=sys-libs/libunwind-1.1:7=
185 + sys-libs/readline:0=
186 + sys-libs/zlib:0=
187 + >=virtual/blas-3.6
188 + virtual/lapack"
189 +
190 +DEPEND="${RDEPEND}
191 + dev-vcs/git
192 + dev-util/patchelf
193 + virtual/pkgconfig"
194 +
195 +PATCHES=(
196 + "${FILESDIR}"/${PN}-1.0.3-fix_build_system.patch
197 +)
198 +
199 +src_unpack() {
200 + tounpack=(${A})
201 + # the main source tree, followed by deps
202 + unpack "${A/%\ */}"
203 +
204 + mkdir -p "${S}/deps/srccache/"
205 + for i in "${tounpack[@]:1}"; do
206 + cp "${DISTDIR}/${i}" "${S}/deps/srccache/${i#julia-}" || die
207 + done
208 +}
209 +
210 +src_prepare() {
211 + default
212 +
213 + # Sledgehammer:
214 + # - prevent fetching of bundled stuff in compile and install phase
215 + # - respect CFLAGS
216 + # - respect EPREFIX and Gentoo specific paths
217 + # - fix BLAS and LAPACK link interface
218 +
219 + sed -i \
220 + -e 's|git submodule|${EPREFIX}/bin/true|g' \
221 + -e "s|GENTOOCFLAGS|${CFLAGS}|g" \
222 + -e "s|/usr/include|${EPREFIX%/}/usr/include|g" \
223 + deps/Makefile || die
224 +
225 + local libblas="$($(tc-getPKG_CONFIG) --libs-only-l blas)"
226 + libblas="${libblas%% *}"
227 + libblas="lib${libblas#-l}"
228 + local liblapack="$($(tc-getPKG_CONFIG) --libs-only-l lapack)"
229 + liblapack="${liblapack%% *}"
230 + liblapack="lib${liblapack#-l}"
231 +
232 + sed -i \
233 + -e "s|GENTOOCFLAGS|${CFLAGS}|g" \
234 + -e "s|GENTOOLIBDIR|$(get_libdir)|" \
235 + -e "s|^JULIA_COMMIT = .*|JULIA_COMMIT = v${PV}|" \
236 + -e "s|-lblas|$($(tc-getPKG_CONFIG) --libs blas)|" \
237 + -e "s|= libblas|= ${libblas}|" \
238 + -e "s|-llapack|$($(tc-getPKG_CONFIG) --libs lapack)|" \
239 + -e "s|= liblapack|= ${liblapack}|" \
240 + Make.inc || die
241 +
242 + sed -i \
243 + -e "s|,lib)|,$(get_libdir))|g" \
244 + -e "s|\$(BUILD)/lib|\$(BUILD)/$(get_libdir)|g" \
245 + Makefile || die
246 +
247 + sed -i \
248 + -e "s|ar -rcs|$(tc-getAR) -rcs|g" \
249 + src/Makefile || die
250 +
251 + # disable doc install starting git fetching
252 + sed -i -e 's~install: $(build_depsbindir)/stringreplace $(BUILDROOT)/doc/_build/html/en/index.html~install: $(build_depsbindir)/stringreplace~' Makefile || die
253 +}
254 +
255 +src_configure() {
256 + # julia does not play well with the system versions of dsfmt, libuv,
257 + # and utf8proc
258 +
259 + # USE_SYSTEM_LIBM=0 implies using external openlibm
260 + cat <<-EOF > Make.user
261 + USE_SYSTEM_ARPACK:=1
262 + USE_SYSTEM_BLAS:=1
263 + USE_SYSTEM_DSFMT:=0
264 + USE_SYSTEM_GMP:=1
265 + USE_SYSTEM_GRISU:=1
266 + USE_SYSTEM_LAPACK:=1
267 + USE_SYSTEM_LIBGIT2:=1
268 + USE_SYSTEM_LIBM:=0
269 + USE_SYSTEM_LIBUNWIND:=1
270 + USE_SYSTEM_LIBUV:=0
271 + USE_SYSTEM_LLVM:=1
272 + USE_LLVM_SHLIB:=1
273 + USE_SYSTEM_MPFR:=1
274 + USE_SYSTEM_OPENLIBM:=1
275 + USE_SYSTEM_OPENSPECFUN:=1
276 + USE_SYSTEM_PATCHELF:=1
277 + USE_SYSTEM_PCRE:=1
278 + USE_SYSTEM_READLINE:=1
279 + USE_SYSTEM_RMATH:=0
280 + USE_SYSTEM_SUITESPARSE:=1
281 + USE_SYSTEM_UTF8PROC:=0
282 + USE_SYSTEM_ZLIB=1
283 + VERBOSE=1
284 + libdir="${EROOT}/usr/$(get_libdir)"
285 + EOF
286 +
287 +}
288 +
289 +src_compile() {
290 +
291 + # Julia accesses /proc/self/mem on Linux
292 + addpredict /proc/self/mem
293 +
294 + emake cleanall
295 + emake julia-release \
296 + prefix="${EPREFIX}/usr" DESTDIR="${D}" \
297 + CC="$(tc-getCC)" CXX="$(tc-getCXX)"
298 + pax-mark m $(file usr/bin/julia-* | awk -F : '/ELF/ {print $1}')
299 + emake
300 +}
301 +
302 +src_test() {
303 + emake test
304 +}
305 +
306 +src_install() {
307 + # Julia is special. It tries to find a valid git repository (that would
308 + # normally be cloned during compilation/installation). Just make it
309 + # happy...
310 + git init && \
311 + git config --local user.email "whatyoudoing@×××××××.com" && \
312 + git config --local user.name "Whyyyyyy" && \
313 + git commit -a --allow-empty -m "initial" || die "git failed"
314 +
315 + emake install \
316 + prefix="${EPREFIX}/usr" DESTDIR="${D}" \
317 + CC="$(tc-getCC)" CXX="$(tc-getCXX)"
318 + cat > 99julia <<-EOF
319 + LDPATH=${EROOT%/}/usr/$(get_libdir)/julia
320 + EOF
321 + doenvd 99julia
322 +
323 + dodoc README.md
324 +
325 + mv "${ED}"/usr/etc/julia "${ED}"/etc || die
326 + rmdir "${ED}"/usr/etc || die
327 + mv "${ED}"/usr/share/doc/julia/html "${ED}"/usr/share/doc/${PF} || die
328 + rmdir "${ED}"/usr/share/doc/julia || die
329 +}