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/files/, dev-lang/julia/
Date: Mon, 07 Jan 2019 21:39:00
Message-Id: 1546896931.c545f629a77bf34ddd9f2d357502f88d8064ed9d.tamiko@gentoo
1 commit: c545f629a77bf34ddd9f2d357502f88d8064ed9d
2 Author: Matthias Maier <tamiko <AT> gentoo <DOT> org>
3 AuthorDate: Mon Jan 7 21:04:48 2019 +0000
4 Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org>
5 CommitDate: Mon Jan 7 21:35:31 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c545f629
7
8 dev-lang/julia: version bump to 1.1.0-rc1
9
10 * give up and bundle llvm-6
11
12 Bug: https://bugs.gentoo.org/665192
13 Package-Manager: Portage-2.3.54, Repoman-2.3.12
14 Signed-off-by: Matthias Maier <tamiko <AT> gentoo.org>
15
16 dev-lang/julia/Manifest | 3 +
17 .../julia/files/julia-1.1.0-fix_build_system.patch | 53 ++++++
18 dev-lang/julia/julia-1.1.0_rc1.ebuild | 197 +++++++++++++++++++++
19 3 files changed, 253 insertions(+)
20
21 diff --git a/dev-lang/julia/Manifest b/dev-lang/julia/Manifest
22 index 41854360be4..7ce323c26a2 100644
23 --- a/dev-lang/julia/Manifest
24 +++ b/dev-lang/julia/Manifest
25 @@ -1,5 +1,8 @@
26 DIST julia-1.0.3.tar.gz 7460268 BLAKE2B d9d42e0235f249fa8c1ced12c659091b97d338ec4a4662ea13ea6a107cb59e90d8385c51962199e47dae5f9770156be2db2d8bb2e3cc8f42aa7403b4f4ca7f04 SHA512 b61399c7b7ffae828264a6ec916b409b2cbc6b3b98d9a6d39b60b014a97a1f1ad75e1ed4860d9ab15d1e5ffec691c04d1b797c238953290770b7313790ae3f1d
27 +DIST julia-1.1.0-rc1.tar.gz 7672785 BLAKE2B 3c49e189bec2da8d6d3f4c689600aa42e8092fe4343175981f8d998407bc6ef6c1bee20d579dc21594c2e9f9469898fc59d28807202b394cf64678b497037e0e SHA512 ceba088ef7abe103a34b1eb6f3b9660165bac038e62d4def22ba207c1c6fddb8a90625b3aa967c32dcad5c24dd83a8f25781347fc8b4078f40dcdffd07b554ce
28 DIST julia-dsfmt-2.2.3.tar.gz 291773 BLAKE2B 6ffae90494d72527920c80fc0fb005da1c7b84f8a03a7ecb0789434c0fff97359e5098e85431896dffccc7d5148c414e847aaba5feef648b8788421a466ff65e SHA512 6d8ddcd01aab3f9039f4f0288a8af53e290cc2f293ed8c4a8c9f3b3f12398e7eedfce8016117b425766ba89c61c86c13b3e420035b5f9bf91315b8b814c03662
29 +DIST julia-libuv-2348256acf5759a544e5ca7935f638d2bc091d60.tar.gz 1555710 BLAKE2B 31ce57d23765c142799dd985a5511751d63238cf7e082fd1ad5574bf62201e9d6cb53b8da5dcc724765ccb4abd63da3ca6d6cbd45e078310c2ffa3859d09b8e4 SHA512 c8bf3c736a60feb0c6994aa7cd1b80e1a45bd6096aa66db320ddfc27b59a0797d303338ea75978619173e4f0a680254f3db29c9f6d1b84361030cc11c7729c98
30 DIST julia-libuv-ed3700c849289ed01fe04273a7bf865340b2bd7e.tar.gz 1492695 BLAKE2B ad03512dd1db2c7066b46b5a3a314645b925481d8ace09ac0a0ae23cf5b8a64338ad457f8df229aa82f1d45605b5366883f563f2e22756ce28bb6fb7607d7124 SHA512 1305035b1372bdf234e3c5e673ee4c8ab5bda83ff06bc27704786def52667c3143fe587fca8f6e0855ba0c8b6d4dd90b2faefd33736224173f459d751885683e
31 DIST julia-libwhich-81e9723c0273d78493dc8c8ed570f68d9ce7e89e.tar.gz 4183 BLAKE2B c932e23b1b476d3fd16cf6f451efd5fc6d9c1ec2c53e8ac086340a100817d9b30dae3eff50b284a42c09b2bbae30b9e2fd38b2881f8cbf4974a89f3bd0c87599 SHA512 6fb77b715d70d9bc95a8546c3bf97bd3677c7ea344b88bb5bc3bbfac9dceabe8a8cde7a0f64dec884cde802e4a3000e30837d3f824b5a9242348c4fe061526a3
32 +DIST julia-llvm-6.0.1.src.tar.xz 25306628 BLAKE2B 60232d4d22f8096b565cc8d81fea0639f24f14e8fc4f66ade69fa15479181f07f655f26dff3fa24bf105762b495da316c5c9352db234bd0af6b9c3fff6d4d881 SHA512 cbbb00eb99cfeb4aff623ee1a5ba075e7b5a76fc00c5f9f539ff28c108598f5708a0369d5bd92683def5a20c2fe60cab7827b42d628dbfcc79b57e0e91b84dd9
33 DIST julia-utf8proc-97ef668b312b96382714dbb8eaac4affce0816e6.tar.gz 156361 BLAKE2B e5e1485b758e959ed78f7fde8b211376da2365e5835708042de57c091b10b59755e1203a9f88c0d761687bf3d166207410de6ec203d80fef4dbdf06a50404cd1 SHA512 1c80dc6e71fdad187b142d02e561dfe1880857baaec08d36240ecb2f275d1bc5467aace84eebe5a10fd3f4c40b0035e65a5db3ec2a9ee6940920b0aad6221c55
34
35 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
36 new file mode 100644
37 index 00000000000..394f5900a90
38 --- /dev/null
39 +++ b/dev-lang/julia/files/julia-1.1.0-fix_build_system.patch
40 @@ -0,0 +1,53 @@
41 +diff --git a/Make.inc b/Make.inc
42 +index 81ff923..79e47f1 100644
43 +--- a/Make.inc
44 ++++ b/Make.inc
45 +@@ -185,7 +185,7 @@ USE_GPL_LIBS ?= 1
46 + # Directories where said libraries get installed to
47 + prefix ?= $(BUILDROOT)/julia-$(JULIA_COMMIT)
48 + bindir := $(prefix)/bin
49 +-libdir := $(prefix)/lib
50 ++libdir := $(prefix)/GENTOOLIBDIR
51 + libexecdir := $(prefix)/libexec
52 + datarootdir := $(prefix)/share
53 + docdir := $(datarootdir)/doc/julia
54 +@@ -417,7 +417,7 @@ ifneq ($(OS), WINNT)
55 + JCXXFLAGS += -pedantic
56 + endif
57 + DEBUGFLAGS := -O0 -ggdb2 -DJL_DEBUG_BUILD -fstack-protector-all
58 +-SHIPFLAGS := -O3 -ggdb2 -falign-functions
59 ++SHIPFLAGS := GENTOOCFLAGS
60 + endif
61 +
62 + ifeq ($(USECLANG),1)
63 +@@ -428,7 +428,7 @@ JCFLAGS := -pipe $(fPIC) -fno-strict-aliasing -D_FILE_OFFSET_BITS=64
64 + JCPPFLAGS := -fasynchronous-unwind-tables
65 + JCXXFLAGS := -pipe $(fPIC) -fno-rtti -pedantic
66 + DEBUGFLAGS := -O0 -g -DJL_DEBUG_BUILD -fstack-protector-all
67 +-SHIPFLAGS := -O3 -g
68 ++SHIPFLAGS := GENTOOCFLAGS
69 + ifeq ($(OS), Darwin)
70 + ifeq ($(USE_LIBCPP), 1)
71 + MACOSX_VERSION_MIN := 10.8
72 +@@ -457,7 +457,7 @@ JCFLAGS := -std=gnu11 -pipe $(fPIC) -fno-strict-aliasing -D_FILE_OFFSET_BITS=64
73 + JCPPFLAGS :=
74 + JCXXFLAGS := -pipe $(fPIC) -fno-rtti
75 + DEBUGFLAGS := -O0 -g -DJL_DEBUG_BUILD -fstack-protector-all
76 +-SHIPFLAGS := -O3 -g -falign-functions
77 ++SHIPFLAGS := GENTOOCFLAGS
78 + endif
79 +
80 + ifeq ($(USECCACHE), 1)
81 +diff --git a/doc/Makefile b/doc/Makefile
82 +index 99e60ee..2027fb5 100644
83 +--- a/doc/Makefile
84 ++++ b/doc/Makefile
85 +@@ -30,7 +30,7 @@ deps: UnicodeData.txt
86 + $(JLCHECKSUM) UnicodeData.txt
87 +
88 + clean:
89 +- -rm -rf _build/* deps/* docbuild.log UnicodeData.txt
90 ++ @echo "Do not clean doc/_build/html. Just use it..."
91 +
92 + cleanall: clean
93 +
94
95 diff --git a/dev-lang/julia/julia-1.1.0_rc1.ebuild b/dev-lang/julia/julia-1.1.0_rc1.ebuild
96 new file mode 100644
97 index 00000000000..36db882f1ed
98 --- /dev/null
99 +++ b/dev-lang/julia/julia-1.1.0_rc1.ebuild
100 @@ -0,0 +1,197 @@
101 +# Copyright 1999-2019 Gentoo Authors
102 +# Distributed under the terms of the GNU General Public License v2
103 +
104 +EAPI=6
105 +
106 +RESTRICT="test"
107 +
108 +inherit pax-utils toolchain-funcs
109 +
110 +MY_PV="${PV//_rc/-rc}"
111 +MY_LIBUV_V="2348256acf5759a544e5ca7935f638d2bc091d60"
112 +MY_UTF8PROC_V="97ef668b312b96382714dbb8eaac4affce0816e6"
113 +MY_LIBWHICH_V="81e9723c0273d78493dc8c8ed570f68d9ce7e89e"
114 +MY_DSFMT_V="2.2.3"
115 +MY_LLVM="6.0.1"
116 +
117 +DESCRIPTION="High-performance programming language for technical computing"
118 +HOMEPAGE="https://julialang.org/"
119 +SRC_URI="
120 + https://github.com/JuliaLang/${PN}/releases/download/v${MY_PV}/${PN}-${MY_PV}.tar.gz
121 + https://api.github.com/repos/JuliaLang/libuv/tarball/${MY_LIBUV_V} -> ${PN}-libuv-${MY_LIBUV_V}.tar.gz
122 + https://api.github.com/repos/JuliaLang/utf8proc/tarball/${MY_UTF8PROC_V} -> ${PN}-utf8proc-${MY_UTF8PROC_V}.tar.gz
123 + https://api.github.com/repos/vtjnash/libwhich/tarball/${MY_LIBWHICH_V} -> ${PN}-libwhich-${MY_LIBWHICH_V}.tar.gz
124 + 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
125 + http://releases.llvm.org/${MY_LLVM}/llvm-${MY_LLVM}.src.tar.xz -> ${PN}-llvm-${MY_LLVM}.src.tar.xz
126 +"
127 +
128 +LICENSE="MIT"
129 +SLOT="0"
130 +KEYWORDS=""
131 +IUSE=""
132 +
133 +RDEPEND+="
134 + dev-libs/double-conversion:0=
135 + dev-libs/gmp:0=
136 + dev-libs/libgit2:0=
137 + >=dev-libs/libpcre2-10.23:0=[jit]
138 + dev-libs/mpfr:0=
139 + dev-libs/openspecfun
140 + sci-libs/amd:0=
141 + sci-libs/arpack:0=
142 + sci-libs/camd:0=
143 + sci-libs/ccolamd:0=
144 + sci-libs/cholmod:0=
145 + sci-libs/colamd:0=
146 + sci-libs/fftw:3.0=[threads]
147 + sci-libs/openlibm:0=
148 + sci-libs/spqr:0=
149 + sci-libs/umfpack:0=
150 + sci-mathematics/glpk:0=
151 + >=sys-libs/libunwind-1.1:7=
152 + sys-libs/readline:0=
153 + sys-libs/zlib:0=
154 + >=virtual/blas-3.6
155 + virtual/lapack"
156 +
157 +DEPEND="${RDEPEND}
158 + dev-vcs/git
159 + dev-util/patchelf
160 + virtual/pkgconfig"
161 +
162 +PATCHES=(
163 + "${FILESDIR}"/${PN}-1.1.0-fix_build_system.patch
164 +)
165 +
166 +S="${WORKDIR}/${PN}-${MY_PV}"
167 +
168 +src_unpack() {
169 + tounpack=(${A})
170 + # the main source tree, followed by deps
171 + unpack "${A/%\ */}"
172 +
173 + mkdir -p "${S}/deps/srccache/"
174 + for i in "${tounpack[@]:1}"; do
175 + cp "${DISTDIR}/${i}" "${S}/deps/srccache/${i#julia-}" || die
176 + done
177 +}
178 +
179 +src_prepare() {
180 + default
181 +
182 + # Sledgehammer:
183 + # - prevent fetching of bundled stuff in compile and install phase
184 + # - respect CFLAGS
185 + # - respect EPREFIX and Gentoo specific paths
186 + # - fix BLAS and LAPACK link interface
187 +
188 + sed -i \
189 + -e 's|git submodule|${EPREFIX}/bin/true|g' \
190 + -e "s|GENTOOCFLAGS|${CFLAGS}|g" \
191 + -e "s|/usr/include|${EPREFIX%/}/usr/include|g" \
192 + deps/Makefile || die
193 +
194 + local libblas="$($(tc-getPKG_CONFIG) --libs-only-l blas)"
195 + libblas="${libblas%% *}"
196 + libblas="lib${libblas#-l}"
197 + local liblapack="$($(tc-getPKG_CONFIG) --libs-only-l lapack)"
198 + liblapack="${liblapack%% *}"
199 + liblapack="lib${liblapack#-l}"
200 +
201 + sed -i \
202 + -e "s|GENTOOCFLAGS|${CFLAGS}|g" \
203 + -e "s|GENTOOLIBDIR|$(get_libdir)|" \
204 + -e "s|^JULIA_COMMIT = .*|JULIA_COMMIT = v${PV}|" \
205 + -e "s|-lblas|$($(tc-getPKG_CONFIG) --libs blas)|" \
206 + -e "s|= libblas|= ${libblas}|" \
207 + -e "s|-llapack|$($(tc-getPKG_CONFIG) --libs lapack)|" \
208 + -e "s|= liblapack|= ${liblapack}|" \
209 + Make.inc || die
210 +
211 + sed -i \
212 + -e "s|,lib)|,$(get_libdir))|g" \
213 + -e "s|\$(BUILD)/lib|\$(BUILD)/$(get_libdir)|g" \
214 + Makefile || die
215 +
216 + sed -i \
217 + -e "s|ar -rcs|$(tc-getAR) -rcs|g" \
218 + src/Makefile || die
219 +
220 + # disable doc install starting git fetching
221 + sed -i -e 's~install: $(build_depsbindir)/stringreplace $(BUILDROOT)/doc/_build/html/en/index.html~install: $(build_depsbindir)/stringreplace~' Makefile || die
222 +}
223 +
224 +src_configure() {
225 + # julia does not play well with the system versions of dsfmt, libuv,
226 + # and utf8proc
227 +
228 + # USE_SYSTEM_LIBM=0 implies using external openlibm
229 + cat <<-EOF > Make.user
230 + USE_SYSTEM_ARPACK:=1
231 + USE_SYSTEM_BLAS:=1
232 + USE_SYSTEM_DSFMT:=0
233 + USE_SYSTEM_GMP:=1
234 + USE_SYSTEM_GRISU:=1
235 + USE_SYSTEM_LAPACK:=1
236 + USE_SYSTEM_LIBGIT2:=1
237 + USE_SYSTEM_LIBM:=0
238 + USE_SYSTEM_LIBUNWIND:=1
239 + USE_SYSTEM_LIBUV:=0
240 + USE_SYSTEM_LLVM:=0
241 + USE_SYSTEM_MPFR:=1
242 + USE_SYSTEM_OPENLIBM:=1
243 + USE_SYSTEM_OPENSPECFUN:=1
244 + USE_SYSTEM_PATCHELF:=1
245 + USE_SYSTEM_PCRE:=1
246 + USE_SYSTEM_READLINE:=1
247 + USE_SYSTEM_RMATH:=0
248 + USE_SYSTEM_SUITESPARSE:=1
249 + USE_SYSTEM_UTF8PROC:=0
250 + USE_SYSTEM_ZLIB=1
251 + VERBOSE=1
252 + libdir="${EROOT}/usr/$(get_libdir)"
253 + EOF
254 +
255 +}
256 +
257 +src_compile() {
258 +
259 + # Julia accesses /proc/self/mem on Linux
260 + addpredict /proc/self/mem
261 +
262 + emake cleanall
263 + emake julia-release \
264 + prefix="${EPREFIX}/usr" DESTDIR="${D}" \
265 + CC="$(tc-getCC)" CXX="$(tc-getCXX)"
266 + pax-mark m $(file usr/bin/julia-* | awk -F : '/ELF/ {print $1}')
267 + emake
268 +}
269 +
270 +src_test() {
271 + emake test
272 +}
273 +
274 +src_install() {
275 + # Julia is special. It tries to find a valid git repository (that would
276 + # normally be cloned during compilation/installation). Just make it
277 + # happy...
278 + git init && \
279 + git config --local user.email "whatyoudoing@×××××××.com" && \
280 + git config --local user.name "Whyyyyyy" && \
281 + git commit -a --allow-empty -m "initial" || die "git failed"
282 +
283 + emake install \
284 + prefix="${EPREFIX}/usr" DESTDIR="${D}" \
285 + CC="$(tc-getCC)" CXX="$(tc-getCXX)"
286 + cat > 99julia <<-EOF
287 + LDPATH=${EROOT%/}/usr/$(get_libdir)/julia
288 + EOF
289 + doenvd 99julia
290 +
291 + dodoc README.md
292 +
293 + mv "${ED}"/usr/etc/julia "${ED}"/etc || die
294 + rmdir "${ED}"/usr/etc || die
295 + mv "${ED}"/usr/share/doc/julia/html "${ED}"/usr/share/doc/${PF} || die
296 + rmdir "${ED}"/usr/share/doc/julia || die
297 +}