* [gentoo-commits] repo/gentoo:master commit in: dev-lang/julia/, dev-lang/julia/files/
@ 2019-01-07 21:38 Matthias Maier
0 siblings, 0 replies; 24+ messages in thread
From: Matthias Maier @ 2019-01-07 21:38 UTC (permalink / raw
To: gentoo-commits
commit: d1a0caaf5939890c733588263a110ece7a2900ac
Author: Matthias Maier <tamiko <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 7 20:32:01 2019 +0000
Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org>
CommitDate: Mon Jan 7 21:35:27 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d1a0caaf
dev-lang/julia: version bump to 1.0.3
Package-Manager: Portage-2.3.54, Repoman-2.3.12
Signed-off-by: Matthias Maier <tamiko <AT> gentoo.org>
dev-lang/julia/Manifest | 1 +
.../julia/files/julia-1.0.3-fix_build_system.patch | 87 +++++++++
dev-lang/julia/julia-1.0.3.ebuild | 199 +++++++++++++++++++++
3 files changed, 287 insertions(+)
diff --git a/dev-lang/julia/Manifest b/dev-lang/julia/Manifest
index 504424eb73b..b0c5dfe9bbf 100644
--- a/dev-lang/julia/Manifest
+++ b/dev-lang/julia/Manifest
@@ -2,6 +2,7 @@ DIST julia-0.6.3-bundled.tar.gz 2099258 BLAKE2B dea1f5d37477e0a612e3901d7d568e8c
DIST julia-0.6.3.tar.gz 5542642 BLAKE2B cccd1ee2eb4d9f59382a0d1f6466e77c84b0542456c405c05b718bc8a39ff537a09760a523ee572fc9eee6797158aa00010fc4c931a80deac645fb1e45061c87 SHA512 f529bb30a17989234061cf4c3d87aecc6da720eb494efaca7be4ec1ed5eda60d440896fb76a45b6cb30205030256e7de765e8944f873b31d96f7c9ecac542db8
DIST julia-0.7.0.tar.gz 7547849 BLAKE2B 6721e980a5fd84f1a28838a91acdd95e8562dd971903e30776dfb90a6cc0ac1ffbedd22c2bfee45bd2fa616adead82680ebe30f9b86a1d968db2353233b32bc2 SHA512 296dbc71fe5238b0cbdc5c67f7002fbf05abea85dc4298784d74fbfef1c96890ab9cc1bbe874337c01f39ca08a6022f6abcde3a5e2ff1cdc25f2f7493ead1804
DIST julia-1.0.1.tar.gz 7382328 BLAKE2B 61ff64298f3740fb50a2cb9c5561e1d4594eea8edbecc4fde9771807be22f753b6c606a530eea9bf569aaccbb4c4a39664ba5d08793d8e127d0988cf7b0244f8 SHA512 41ca8c0280c4914e43f5a37ed09ce47174f991e3079703a705081265509d22cd6cb66a928dc1c41d473a3d8cc59bb6f74e25e3a960e828d6e469d85a8db58c18
+DIST julia-1.0.3.tar.gz 7460268 BLAKE2B d9d42e0235f249fa8c1ced12c659091b97d338ec4a4662ea13ea6a107cb59e90d8385c51962199e47dae5f9770156be2db2d8bb2e3cc8f42aa7403b4f4ca7f04 SHA512 b61399c7b7ffae828264a6ec916b409b2cbc6b3b98d9a6d39b60b014a97a1f1ad75e1ed4860d9ab15d1e5ffec691c04d1b797c238953290770b7313790ae3f1d
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
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
new file mode 100644
index 00000000000..98f4fc5c754
--- /dev/null
+++ b/dev-lang/julia/files/julia-1.0.3-fix_build_system.patch
@@ -0,0 +1,87 @@
+diff --git a/Make.inc b/Make.inc
+index e5c102f..c4c6640 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/base/Makefile b/base/Makefile
+index 21c7ad4..737e40d 100644
+--- a/base/Makefile
++++ b/base/Makefile
+@@ -207,7 +207,6 @@ $(build_private_libdir)/libLLVM.dylib:
+ ln -sf "$$REALPATH" "$@"
+ ifneq ($(USE_SYSTEM_LLVM),0)
+ ifneq ($(USE_LLVM_SHLIB),0)
+-SYMLINK_SYSTEM_LIBRARIES += symlink_libLLVM
+ endif
+ endif
+
+diff --git a/doc/Makefile b/doc/Makefile
+index 3d07733..8bd3bc0 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.3.ebuild b/dev-lang/julia/julia-1.0.3.ebuild
new file mode 100644
index 00000000000..1194c900964
--- /dev/null
+++ b/dev-lang/julia/julia-1.0.3.ebuild
@@ -0,0 +1,199 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+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://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
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+# julia 0.7* needs a patched llvm-6
+RDEPEND="
+ =sys-devel/llvm-6*:=
+ =sys-devel/clang-6*:="
+LLVM_MAX_SLOT=6
+
+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.3-fix_build_system.patch
+)
+
+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:=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)"
+ 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 "whatyoudoing@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/html "${ED}"/usr/share/doc/${PF} || die
+ rmdir "${ED}"/usr/share/doc/julia || die
+}
^ permalink raw reply related [flat|nested] 24+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-lang/julia/, dev-lang/julia/files/
@ 2023-12-17 21:45 Maciej Barć
0 siblings, 0 replies; 24+ messages in thread
From: Maciej Barć @ 2023-12-17 21:45 UTC (permalink / raw
To: gentoo-commits
commit: c23941b5005c3f3e91a9550c6523bd0776ca6f02
Author: Alexis Praga <alexis.praga <AT> proton <DOT> me>
AuthorDate: Sat Dec 16 21:45:07 2023 +0000
Commit: Maciej Barć <xgqt <AT> gentoo <DOT> org>
CommitDate: Sun Dec 17 21:45:44 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c23941b5
dev-lang/julia: adding new version 1.9.4
Signed-off-by: Alexis Praga <alexis.praga <AT> proton.me>
Closes: https://github.com/gentoo/gentoo/pull/34314
Signed-off-by: Maciej Barć <xgqt <AT> gentoo.org>
dev-lang/julia/Manifest | 1 +
.../julia/files/julia-1.9.4-no-doc-install.patch | 13 ++
.../julia/files/julia-1.9.4-string-replace.patch | 13 ++
dev-lang/julia/julia-1.9.4.ebuild | 197 +++++++++++++++++++++
4 files changed, 224 insertions(+)
diff --git a/dev-lang/julia/Manifest b/dev-lang/julia/Manifest
index 66bfdf7d0aa1..38d3d84115db 100644
--- a/dev-lang/julia/Manifest
+++ b/dev-lang/julia/Manifest
@@ -16,4 +16,5 @@ DIST julia-1.8.0-make-install-no-build.patch 555 BLAKE2B 36a86c3dd281a85f1b1fd68
DIST julia-1.8.3-full.tar.gz 275266765 BLAKE2B 2cd54e33cea5d53a93e8ec9c1cd44df4e63a132f2d7a7dca363c6067e1eb5f245a6f65c79bbb29ec641c597ed33fc9376847803b8dd5bc18c537e48d07bcee04 SHA512 0e62d293626c83ff258a3d66aa1e86f9cab114edb8a21ebaad3990332894fbdfd96c23f907debbfd0af9f9f09c0a95a36a3c617784d5eb541b68ed7558630d86
DIST julia-1.8.5-full.tar.gz 275344455 BLAKE2B d51ee25e9c7dd54e3fcc35cd75c909686cc5e48c6b34371cd100bddb038b76e1ba8812bab554ffb8ca5b725cc30fec1a0fb4f58220de8917de35dc2d3a159d81 SHA512 3f92cdecdfc79194e1cde3ec96871bde984c2527d0cd3909c91a27a819d734e39260c5fe7129d958e88db1965f8b5d61ffe7e95c7cddac111aeafe844e29900d
DIST julia-1.9.0-full.tar.gz 297690117 BLAKE2B 7fb67dedff33f627ab4c33a1a784f8a56c69c92e1fa88badeecc6c19e7c6889a6c686502ce49df06fcee989372bb5978cb811647f8b6f9b1d4cec201fc1000b4 SHA512 e7ab6bc1f923af6ea2ef0fc80ddd1e489e059d8fc1ed47de160e33c13dcb8daa8141ada174588dde12943ffa48332681d1d060c6372f4e2292d92946d1fb7fe2
+DIST julia-1.9.4-full.tar.gz 294983229 BLAKE2B d4ffa0d2ceff2113d007502248cc7dd106fa5262e23b2f79d63bf419994f42f814a49cdc88483615665d5d57b1b36b6c319f68f3e0802a603a5cbb0e6b992cc1 SHA512 cd2c7df8856f35ffc89e2a22ef70fbbfbec2e50835e56e26c67a9efcd69aa448c1aa71b002235a47c2036926ab127c4e232c938df4d23e600dbd27bf72b8283c
DIST julia-a48ad530.patch 2790 BLAKE2B 4f7b1a3baeadff597b8b7e0e55705ff09625457a7889179e2f7d7ec1370008a5329901c45ad038bd830276d120e35d87254fe55ea497b2632988254ddd591df2 SHA512 4222901d28b100a81743a4092fb78862160e5b1c23d1a7fd242df815703897b974c8aec79518f67f4cf33ccbc88f75bf6e10d1189b7163b94b5d347ef8db940b
diff --git a/dev-lang/julia/files/julia-1.9.4-no-doc-install.patch b/dev-lang/julia/files/julia-1.9.4-no-doc-install.patch
new file mode 100644
index 000000000000..e1976a3fcde1
--- /dev/null
+++ b/dev-lang/julia/files/julia-1.9.4-no-doc-install.patch
@@ -0,0 +1,13 @@
+diff --git a/Makefile b/Makefile
+index 68e2136..a38edee 100644
+--- a/Makefile
++++ b/Makefile
+@@ -236,7 +236,7 @@ define stringreplace
+ endef
+
+
+-install: $(build_depsbindir)/stringreplace $(BUILDROOT)/doc/_build/html/en/index.html
++install: $(build_depsbindir)/stringreplace
+ @$(MAKE) $(QUIET_MAKE) $(JULIA_BUILD_MODE)
+ @for subdir in $(bindir) $(datarootdir)/julia/stdlib/$(VERSDIR) $(docdir) $(man1dir) $(includedir)/julia $(libdir) $(private_libdir) $(sysconfdir) $(private_libexecdir); do \
+ mkdir -p $(DESTDIR)$$subdir; \
diff --git a/dev-lang/julia/files/julia-1.9.4-string-replace.patch b/dev-lang/julia/files/julia-1.9.4-string-replace.patch
new file mode 100644
index 000000000000..7f5497bdac8f
--- /dev/null
+++ b/dev-lang/julia/files/julia-1.9.4-string-replace.patch
@@ -0,0 +1,13 @@
+diff --git a/Makefile b/Makefile
+index c742a9f..a38edee 100644
+--- a/Makefile
++++ b/Makefile
+@@ -232,7 +232,7 @@ endif
+ # Note that we disable MSYS2's path munging here, as otherwise
+ # it replaces our `:`-separated list as a `;`-separated one.
+ define stringreplace
+- MSYS2_ARG_CONV_EXCL='*' $(build_depsbindir)/stringreplace $$(strings -t x - '$1' | grep "$2" | awk '{print $$1;}') "$3" 255 "$(call cygpath_w,$1)"
++ MSYS2_ARG_CONV_EXCL='*' $(build_depsbindir)/stringreplace $$(strings -t x - "$1" | grep "$2" | awk '{print $$1;}') "$3" 255 "$(call cygpath_w,$1)"
+ endef
+
+
diff --git a/dev-lang/julia/julia-1.9.4.ebuild b/dev-lang/julia/julia-1.9.4.ebuild
new file mode 100644
index 000000000000..b0105c0e508f
--- /dev/null
+++ b/dev-lang/julia/julia-1.9.4.ebuild
@@ -0,0 +1,197 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# correct versions for stdlibs are in deps/checksums
+# for everything else, run with network-sandbox and wait for the crash
+
+EAPI=8
+
+MY_LLVM_V=14.0.6
+
+PYTHON_COMPAT=( python3_{9..12} )
+
+inherit check-reqs flag-o-matic optfeature pax-utils python-any-r1 toolchain-funcs
+
+DESCRIPTION="High-performance programming language for technical computing"
+HOMEPAGE="https://julialang.org/
+ https://github.com/JuliaLang/julia/"
+SRC_URI="
+ https://github.com/JuliaLang/julia/releases/download/v${PV}/${P}-full.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+PROPERTIES="test_network"
+RESTRICT="test"
+
+RDEPEND="
+ >=dev-libs/libutf8proc-2.6.1:0=[-cjk]
+ >=dev-util/patchelf-0.13
+ >=net-libs/mbedtls-2.2
+ >=sci-mathematics/dsfmt-2.2.4
+ >=sys-libs/libunwind-1.1:0=
+ >=virtual/blas-3.6
+ app-arch/p7zip
+ app-misc/ca-certificates
+ dev-libs/gmp:0=
+ dev-libs/libgit2:0
+ dev-libs/mpfr:0=
+ net-misc/curl[http2,ssh]
+ 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/openblas:0=
+ sci-libs/spqr:0=
+ sci-libs/umfpack:0=
+ sys-libs/zlib:0=
+ virtual/lapack
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ ${PYTHON_DEPS}
+ dev-util/cmake
+ virtual/pkgconfig
+"
+
+CHECKREQS_DISK_BUILD="4G"
+# Avoid building ocaml binding with LLVM_ENABLE_BINDINGS=OFF #47862 (merged upstream but not yet for 1.9.4)
+PATCHES=(
+ "${FILESDIR}"/julia-1.8.0-llvm-no-bindings.patch
+ "${FILESDIR}"/julia-1.9.4-no-doc-install.patch
+ "${FILESDIR}"/julia-1.9.4-string-replace.patch
+ )
+QA_FLAGS_IGNORED+='usr/.*/julia/sys.so' # Julia sysimage generated by bootstrapping.
+
+pkg_setup() {
+ check-reqs_pkg_setup
+ python-any-r1_pkg_setup
+}
+
+src_unpack() {
+ local -a tounpack=( ${A} )
+ # the main source tree, followed by deps
+ unpack "${tounpack[0]}"
+
+ mkdir -p "${S}/deps/srccache/"
+ local i
+ for i in "${tounpack[@]:1}"; do
+ cp "${DISTDIR}/${i}" "${S}/deps/srccache/${i#julia-}" || die
+ done
+
+ # Extract tarballs for patching.
+ # cd "${S}/deps/srccache/" || die
+ # tar xf llvm-julia-${MY_LLVM_V}-3.tar.gz || die
+}
+
+src_prepare() {
+ default
+
+ # Sledgehammer:
+ # - prevent fetching of bundled stuff in compile and install phase
+ # - respect CFLAGS
+ # - respect EPREFIX and Gentoo specific paths
+
+ sed -i \
+ -e "\|SHIPFLAGS :=|c\\SHIPFLAGS := ${CFLAGS}" \
+ Make.inc || die
+
+ sed -i \
+ -e "s|ar -rcs|$(tc-getAR) -rcs|g" \
+ src/Makefile || die
+
+ # Blank the tarball checksum check script.
+ echo "#!/bin/sh" > deps/tools/jlchecksum || die
+}
+
+src_configure() {
+ # bug #855602
+ filter-lto
+
+ # julia does not play well with the system versions of libuv
+ # Fails to compile with libpcre2 on split-usr, bug #893336
+ # USE_SYSTEM_LIBM=0 implies using external openlibm
+ cat <<-EOF > Make.user
+ LOCALBASE:=${EPREFIX}/usr
+ override prefix:=${EPREFIX}/usr
+ override libdir:=\$(prefix)/$(get_libdir)
+ override CC:=$(tc-getCC)
+ override CXX:=$(tc-getCXX)
+ override AR:=$(tc-getAR)
+
+ BUNDLE_DEBUG_LIBS:=0
+ USE_BINARYBUILDER:=0
+ USE_INTEL_JITEVENTS=0
+ USE_SYSTEM_CSL:=1
+ USE_SYSTEM_LLVM:=0
+ USE_SYSTEM_LIBUNWIND:=1
+ USE_SYSTEM_PCRE:=0
+ USE_SYSTEM_LIBM:=0
+ USE_SYSTEM_OPENLIBM:=1
+ USE_SYSTEM_DSFMT:=1
+ USE_SYSTEM_BLAS:=1
+ USE_SYSTEM_LAPACK:=1
+ USE_SYSTEM_LIBBLASTRAMPOLINE:=0
+ USE_SYSTEM_GMP:=1
+ USE_SYSTEM_MPFR:=1
+ USE_SYSTEM_LIBSUITESPARSE:=1
+ USE_SYSTEM_LIBUV:=0
+ USE_SYSTEM_UTF8PROC:=1
+ USE_SYSTEM_MBEDTLS:=1
+ USE_SYSTEM_LIBSSH2:=1
+ USE_SYSTEM_NGHTTP2:=1
+ USE_SYSTEM_CURL:=1
+ USE_SYSTEM_LIBGIT2:=1
+ USE_SYSTEM_PATCHELF:=1
+ USE_SYSTEM_ZLIB:=1
+ USE_SYSTEM_P7ZIP:=1
+ VERBOSE:=1
+ EOF
+}
+
+src_compile() {
+ # Julia accesses /proc/self/mem on Linux.
+ addpredict /proc/self/mem
+
+ # Julia expects .so files to be in lib64 during compilation
+ mkdir -p "${S}"/usr/lib
+ ln -s lib "${S}"/usr/lib64
+
+ emake
+ pax-mark m "$(file usr/bin/julia-* | awk -F : '/ELF/ {print $1}')"
+}
+
+src_install() {
+ emake -j1 install DESTDIR="${D}"
+ dodoc CONTRIBUTING.md HISTORY.md NEWS.md README.md THIRDPARTY.md
+
+ local llvmslot=$(ver_cut 1 ${MY_LLVM_V})
+ cp "${S}"/usr/lib/libLLVM-${llvmslot}jl.so "${ED}"/usr/$(get_libdir)/julia/ || die
+ cp "${S}"/usr/lib/libLLVM-${MY_LLVM_V}jl.so "${ED}"/usr/$(get_libdir)/julia/ || die
+
+ 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
+
+ # The appdata directory is deprecated.
+ mv "${ED}"/usr/share/{appdata,metainfo}/ || die
+
+ # Link ca-certificates.crt, bug: https://bugs.gentoo.org/888978
+ dosym -r /etc/ssl/certs/ca-certificates.crt /usr/share/julia/cert.pem
+
+ # Julia always searches for "sys.so" inside "/usr/lib/julia",
+ # bug: https://github.com/JuliaLang/julia/issues/49574
+ if [[ $(get_libdir) == "lib64" ]] ; then
+ insinto /usr/lib/julia
+ doins "${ED}"/usr/$(get_libdir)/julia/sys.so
+ fi
+}
+
+pkg_postinst() {
+ optfeature "Julia Plots" sci-visualization/gr
+}
^ permalink raw reply related [flat|nested] 24+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-lang/julia/, dev-lang/julia/files/
@ 2023-05-02 0:39 Maciej Barć
0 siblings, 0 replies; 24+ messages in thread
From: Maciej Barć @ 2023-05-02 0:39 UTC (permalink / raw
To: gentoo-commits
commit: ff92c8f0acd46f84cdd4e1dde15e9ed75536cbe8
Author: Maciej Barć <xgqt <AT> gentoo <DOT> org>
AuthorDate: Mon May 1 19:29:09 2023 +0000
Commit: Maciej Barć <xgqt <AT> gentoo <DOT> org>
CommitDate: Tue May 2 00:39:02 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ff92c8f0
dev-lang/julia: patch for GCC 13
Closes: https://bugs.gentoo.org/895710
Signed-off-by: Maciej Barć <xgqt <AT> gentoo.org>
dev-lang/julia/files/julia-1.8.3-gcc13.patch | 10 ++++++++++
dev-lang/julia/julia-1.8.5.ebuild | 12 ++++++++++++
2 files changed, 22 insertions(+)
diff --git a/dev-lang/julia/files/julia-1.8.3-gcc13.patch b/dev-lang/julia/files/julia-1.8.3-gcc13.patch
new file mode 100644
index 000000000000..96e2e48ba78d
--- /dev/null
+++ b/dev-lang/julia/files/julia-1.8.3-gcc13.patch
@@ -0,0 +1,10 @@
+--- a/deps/srccache/JuliaLang-llvm-project-8a2ae8c/llvm/include/llvm/Support/Signals.h
++++ b/deps/srccache/JuliaLang-llvm-project-8a2ae8c/llvm/include/llvm/Support/Signals.h
+@@ -15,6 +15,7 @@
+ #define LLVM_SUPPORT_SIGNALS_H
+
+ #include <string>
++#include <cstdint>
+
+ namespace llvm {
+ class StringRef;
diff --git a/dev-lang/julia/julia-1.8.5.ebuild b/dev-lang/julia/julia-1.8.5.ebuild
index eff4ebe3ca0b..85c029763417 100644
--- a/dev-lang/julia/julia-1.8.5.ebuild
+++ b/dev-lang/julia/julia-1.8.5.ebuild
@@ -65,6 +65,7 @@ PATCHES=(
"${DISTDIR}"/${PN}-0b211609.patch
"${DISTDIR}"/${PN}-a48ad530.patch
"${FILESDIR}"/${PN}-1.8.0-llvm-no-bindings.patch
+ "${FILESDIR}"/${PN}-1.8.3-gcc13.patch
)
QA_FLAGS_IGNORED+='usr/.*/julia/sys.so' # Julia sysimage generated by bootstrapping.
@@ -103,6 +104,10 @@ src_unpack() {
for i in "${tounpack[@]:1}"; do
cp "${DISTDIR}/${i}" "${S}/deps/srccache/${i#julia-}" || die
done
+
+ # Extract tarballs for patching.
+ cd "${S}/deps/srccache/" || die
+ tar xf llvm-julia-13.0.1-3.tar.gz || die
}
src_prepare() {
@@ -123,6 +128,13 @@ src_prepare() {
# 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
+
+ # Blank the tarball checksum check script.
+ echo "#!/bin/sh" > deps/tools/jlchecksum || die
+
+ # Repack tarballs.
+ cd "${S}/deps/srccache/" || die
+ tar czf llvm-julia-13.0.1-3.tar.gz JuliaLang-llvm-project-8a2ae8c || die
}
src_configure() {
^ permalink raw reply related [flat|nested] 24+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-lang/julia/, dev-lang/julia/files/
@ 2022-10-28 10:43 Sam James
0 siblings, 0 replies; 24+ messages in thread
From: Sam James @ 2022-10-28 10:43 UTC (permalink / raw
To: gentoo-commits
commit: 207238d237a0374f91066b624077076a37d9ec4d
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 28 10:41:51 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Oct 28 10:41:51 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=207238d2
dev-lang/julia: drop 1.7.1-r4, 1.7.3
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-lang/julia/Manifest | 19 --
.../julia/files/julia-1.4.0-no_symlink_llvm.patch | 10 --
dev-lang/julia/files/julia-1.6.5-libgit-1.2.patch | 17 --
dev-lang/julia/files/julia-1.6.5-libgit-1.4.patch | 43 -----
.../files/julia-1.6.5-llvm_13_compat_part_1.patch | 172 ------------------
.../files/julia-1.6.5-llvm_13_compat_part_2.patch | 80 ---------
.../files/julia-1.6.5-make-install-no-build.patch | 17 --
.../julia/files/julia-1.7.1-do_not_set_rpath.patch | 11 --
.../julia/files/julia-1.7.1-hardcoded-libs.patch | 72 --------
dev-lang/julia/julia-1.7.1-r4.ebuild | 186 -------------------
dev-lang/julia/julia-1.7.3.ebuild | 199 ---------------------
11 files changed, 826 deletions(-)
diff --git a/dev-lang/julia/Manifest b/dev-lang/julia/Manifest
index e2912fffc6ed..418faba58f13 100644
--- a/dev-lang/julia/Manifest
+++ b/dev-lang/julia/Manifest
@@ -1,15 +1,3 @@
-DIST julia-1.7.1-full.tar.gz 255682275 BLAKE2B 923cd1ed735f1ff5537ff8655ba5b63cc8d27a9b36ba05f3942447bea67034ad771ca8f69192ca7718ab3aace5d12c0e08961eafead9aedb9af35e2d212e8e97 SHA512 df6c9d33ed69c1b53a7f77f95954d4ed5fadb176ebf9f490e7721bc036109edfaa5873ce9041620af1d5c3731db7acc5af932b4173ce54bcc7ae3d7c9c393638
-DIST julia-1.7.1-llvm_13_compat_part_3.patch 28006 BLAKE2B b1909fd6df1ac51e7e2d16279ff5ed2febe27967832ddbb9517372dcb41597f7ba9fa6013d65fdbdaf345b5c32fdf90f60c086afcdf6b793172061fe63263b0f SHA512 d251d5fbc088aa03e2c423926fa9f82a8a29a995e20150f27bf01ea9209008259f97daf27c333686b62412190fa4077cca178ce39bb6c7bd4e3e8b4f2affa22f
-DIST julia-1.7.1-llvm_13_compat_part_4.patch 11421 BLAKE2B ca4f3e2c6b60462f7f04f609be07f95b81fe076350167de3354cf5c0fb98d3f1b5a5b2d275da8074a077be3edbb8544a3403a080dc1ca0dbe827dde96c61f5f2 SHA512 5cd709b24a6e00f67998efcc21d77b710399f1bf96e7656b3c90a2cc564bcf05e2e1012b788751d48ff7964fb6be2af710d850c34e83532976addecae4db1969
-DIST julia-1.7.1-llvm_13_compat_part_5.patch 27094 BLAKE2B b70a96c4f897349dce04246335bc38a6726e02a43cd5a28bc31bfcb9190f5361e2e4d16a9fb5c1b3c0e53d2e59f5380b161350968f9479cdb765b4681b9f5743 SHA512 efd1029d0030417082b7d640b2e4b7bb35818d555c808bceb9a31e5d93b2f27a8ca11b9228cf4129b5bee411e1fe9e4ce4e7515226ceab905532d1875e260f7c
-DIST julia-1.7.3-full.tar.gz 256584516 BLAKE2B d9520de2a85566cfe02ac471061b6cc255e1ab67039387d4ebda3438b67990cbd0e9e1a17865995f48e537b21fc63be6ff376f3989ff50396ab339df0021a074 SHA512 0286a3f8ecb469eb09690a7723aac267a7655247648a3099115e0dc0531d2f779f2aac6e829d9781f462887de281a78c29d99a986b3c3db8c0b0d565ee31f0df
-DIST julia-1.7.3-llvm_13_compat_part_1.patch 6741 BLAKE2B fd61ed4990128150221f2d348bd5cdf953f1b83ddad8a3920dce44249265471854eda513f3cb5a9f641bac201eec70d08c071d31c56d60592dffd8d17b94ddfe SHA512 d8872bbc123e16daa360cbc7f586f2f610bb0d928d9390b41c4f68d9dbba8a945693756b44dd8e960c8feae22ba0f5b50a7ce33157e1e82d8e1a8f2c999e7141
-DIST julia-1.7.3-llvm_13_compat_part_2.patch 2673 BLAKE2B 14d292029ca8312ae2d6729b2c5697b2b0ec065e43475b0939961586455988aec573ece8685f8150b0e27a388b39c6ed05e822a1c931a8192d4651958de86b05 SHA512 98643ac351a45c6bb1c2f945fb1e46db98c8658625731048e7cfc76684db8b1c219b53c6c230ca1da8dc07139fb1db1602f756b94e91655c6248541510d0c2ee
-DIST julia-1.7.3-llvm_13_compat_part_3.patch 28024 BLAKE2B bffa797f92425eb22f64861e13c2ac9d311434b3727acc8268247bf131e7654c154fd3cc6f7966b3fabc86d56ed0f65b46ea178a2e87cd47f56675af739ee01a SHA512 45231605f4c89ad7faab5564f0c9ea67ebb86ff32d8adffd68ba632668b8adb4185e15351a5714de07495908e059731b702e3c202e043cb9cac252285cd21a0b
-DIST julia-1.7.3-llvm_13_compat_part_4.patch 2425 BLAKE2B 9440296aa9669c44f23757f24f5e098353171e2747c24220a3ab6f5fdd9bd3915975dc24e7e19a3441a17555858cff7cfbc678a8a6d7e0894a604e7d699cb6cb SHA512 7e5a5fcd5b18086fbd638cdf98c13d8954bb8716e60ed6ae613b072e4ec8e406abe5a7ba29db488c34a97ecdd2932ddb2e827949191407aead202221bacf736f
-DIST julia-1.7.3-llvm_13_compat_part_5.patch 11421 BLAKE2B ca4f3e2c6b60462f7f04f609be07f95b81fe076350167de3354cf5c0fb98d3f1b5a5b2d275da8074a077be3edbb8544a3403a080dc1ca0dbe827dde96c61f5f2 SHA512 5cd709b24a6e00f67998efcc21d77b710399f1bf96e7656b3c90a2cc564bcf05e2e1012b788751d48ff7964fb6be2af710d850c34e83532976addecae4db1969
-DIST julia-1.7.3-llvm_13_compat_part_6.patch 27063 BLAKE2B 3878cba37be6f270a1ba240b22bea65c2c0efe77b0d415cc47370f234c8d26f01c66bec4b01824472926ba231a8881deadb21006efe6fa6c5bf6fd6250933a0b SHA512 7c27b4b49465a4fbe206c1e9ba6c48d74264124a866fb414bb698cab151a9e1fb7180c7e07c0bc843d4817e9e99cbd70b35c2906384503d44ab7051ebb1948fe
-DIST julia-1.7.3_Downloads.jl_1.5.3.tar.gz 23484 BLAKE2B cebdc572a10faadf4aa673da2c9cd364ddc76b6299c3d0eaaa54014e199f9c0002188d6281dc4935c2be1f32ffcddc6b98f19f07ea488466fa7ae66db55fa23a SHA512 ec895ebe2b96d8590f34c152d3b4963531250b254c96fadffeee8b2cec132c20ce42d585839a2304dc1a30b13b1cbebcfa88b021b3646a77162a1476ec1d8f16
DIST julia-1.8.0-074d761f.patch 2198 BLAKE2B 7d4b147e290defceaad1b5b6d0c2c9a323b47d685bb1865b23c84aa68135c00104e653a5046d276aa540415ee4c95426f1a4538df3ba0ae4c348966a2f2b1742 SHA512 ff1e23746851b1b7a4480df75815abb35ccc8006f622acb5fb3928e20832cf55022c96650590c8dfea9b39185a3284a0d1310dee3f439429c91e00af567b66f1
DIST julia-1.8.0-ed9851b0.patch 6957 BLAKE2B f40a56bf3b00cc8d0a764ce7d9ef75b6e5dbab70aa13aad810e7288c4b1b0609ee61b1c6661a4d34423c5f25b19c56b326fa0ae520f1310c673d2c0921e4dabb SHA512 a4b6ee8b80639e74185ddaf8567b81eaee18efef02003e254b5e31268f730e022dcb1a53d8595a82570303b5f57ea885ca86374ca5eb7c0b2b270a5c104b79b5
DIST julia-1.8.0-julia-hardcoded-libs.patch 2411 BLAKE2B d71683c68c350c16c61c13e0378072a7689cb6e07ab7d4b940a5049f37ec58d8f4061b94ba5ba3d2dcf73a403b34d5fbe92bb723a0c5a2c318f9c3bd3631f143 SHA512 0256c5af1713b3551b39e0d89168eafb235e6337a9f07efd24a2e271a11bf724295d0a46761bf1a4d3ed14c4539ef1ef56adcf5580879cac268867aac3e2c20e
@@ -18,10 +6,3 @@ DIST julia-1.8.0-julia-llvm-14.patch 882 BLAKE2B f46f02554a6fc997763d368b813298d
DIST julia-1.8.0-julia-system-cblas.patch 4078 BLAKE2B 58aac552ea63859a03fe24fed69c02f9968aa7924abe2ffdf9e33e965d64877206216f1604f28fc67739cada4b5ce7b508feaad18080e3a5e78d89447d0f2a05 SHA512 d4b437da35672aa0b9f371da66a8675ca5be28276886edafb3566c3ea0d0ed8ed2bac192b43a0d292ee4f2754b596b7b79de76f136cfcada9916ff94a544b372
DIST julia-1.8.0-make-install-no-build.patch 555 BLAKE2B 36a86c3dd281a85f1b1fd68ac9796e70b06bb6afe3140fed97b5c7cd4b24987dc75709c4b1b192d5663c4d704cfb9818ec8d895c293b9b0bd741a3a61c860e47 SHA512 97687d24a3aa0a39994a691026981a91496cd2a82112e9acf9a8edd0f7c2a50d946944e8af495a3b1703f397c7a0e620be76dc28f3bbe14357ee8c4a68a5a3bc
DIST julia-1.8.2-full.tar.gz 275255487 BLAKE2B dd4cb035c3ec3b37fd08215baa76764c2a447ec50f0afbec5e6c02b047e62188015ba1492704fbc31081465f3837d6b8e02b31cfe10239ddd31e80e4bd7121e8 SHA512 0660911bbd9b0e0df9e6c2af851e7119b6067b08c845422e44101b9a92a1cbc069e52838f503b06f64db5b282cde1b533aafd9c6f47d349ae7d2beb48cf7d7a6
-DIST julia-hardcoded-libs.patch 2411 BLAKE2B 54eb1d0bbf15bbeea723c32c8ddbb42d3e3fbd22c6d8e2fa4c660d857bc8b6b131f442065689fd1a70c09563ef5c9efa7cb8ff9493ea6b3ed9ec7b05a9cc042e SHA512 4a35a80592c64c8e8924d381b9405283c3c5447ea201715acdcb4e7f6be0560655b0f816fa05127b7df6f9154a74224960aba57b291bd3a8431174eb13c7610e
-DIST julia-libblastrampoline-4.patch 856 BLAKE2B 5efe1602022eaaadb5f6ed06edd5f9e30e19978c5c469f1619efbcc4604efa3f0cd42bb80ba7cf903a89edbabeefca06bf7f5efe78510b6feea5e188655ad456 SHA512 62097e29865a0d4a633974a3ca4ea35623a6de08d8c63316896cdd95844a394302ad892121ec85d8b2a9ca305dff3123cd01e4b7a27b97beb5da36cbe4cd3fa3
-DIST julia-libgit-1.2.patch 17322 BLAKE2B 163ca3dc12e6e654962afc781ef7ae57ea0a74a13d72e40a2944ac6b9ad688467fea2df603f0b5509bd882406c81742ae168a80ae312dea5e7188a3c96996772 SHA512 59688c5f6437fd745e3a37bc8387678a18e7d4ed223907456a426a55f1daaa747b70e2b7907975e4e1af4c32b535d91f1e2685416c4d811aed2f4b6ce5f3bc36
-DIST julia-libgit-1.4.patch 1631 BLAKE2B 0f13c696c9a5067dabf38e65a2c315a0f8bb7e9dfc4ed9f0267b2a0161296aae4b10be833d6d6da2e0ee2c3917b5cf79e438f96232a5c93b15358a984b23ee4a SHA512 044b1fdc31a767c36b8df1f0582f64051450903be4a4ab668d8b7a8c666be800a51250825d807a4503594b73bb5c2e4e9eef4c61363a1484f328138a1871ff60
-DIST julia-libunwind-1.6.patch 778 BLAKE2B 26fcac25c3a906ecbb29e54354fad919c12e2cbd7f8b2a2fc696a495050de1f47ed83ccee2ae8a92c82f51e57319dfc4e8a672a3e6af8e32af6bc2d056bd6813 SHA512 e43119ea9fded88e9ed1c85c3d47dfd62771884d29e409f91779b6db9557f6f1af840b719ee879eda8929cfd53fd9e9b34eb0cac7e9ab6a3f3032edf3e50ca3a
-DIST julia-system-cblas.patch 4816 BLAKE2B f5f56cf6a5c4919f002da4865e51022e738fabaf50a537c9e79771c6f3bbfe46333eafa224172008812500169370cdcf8b39464483c8cf7a5c5e8b00257ea162 SHA512 2c5a1818cad8eb5e7ae5d112bbd2f1f3c74fc12ac2ae0325be9e4d2baa016c7a64e02c937014e7b043be3efdb5eac2188919f4aaf58f0f88abc44a455ec9bcc3
-DIST make-install-no-build.patch 555 BLAKE2B b49576a9b4fa49ba46f871e774a72f1b78ed37a4cb9be47655617b30e251ce2ef7b4236b045c271be3f3c00b9bd2b907281040658a2068ca986f84a80f5fc141 SHA512 8cb54dc9aac12450cc9d5041b1c4ea9a2b7ddb3c73533d58ce5e78e0547f36ac77f04576e28e15769d73ed02fcdfcd90a9036816fa8a669b2210332f972ee15f
diff --git a/dev-lang/julia/files/julia-1.4.0-no_symlink_llvm.patch b/dev-lang/julia/files/julia-1.4.0-no_symlink_llvm.patch
deleted file mode 100644
index 1b6371b120d9..000000000000
--- a/dev-lang/julia/files/julia-1.4.0-no_symlink_llvm.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/base/Makefile 2019-11-17 14:07:20.000000000 -0500
-+++ b/base/Makefile 2020-03-28 20:38:40.041571679 -0400
-@@ -223,7 +223,7 @@
- ln -sf "$$REALPATH" "$@"
- ifneq ($(USE_SYSTEM_LLVM),0)
- ifneq ($(USE_LLVM_SHLIB),0)
--SYMLINK_SYSTEM_LIBRARIES += symlink_libLLVM
-+#SYMLINK_SYSTEM_LIBRARIES += symlink_libLLVM
- endif
- endif
diff --git a/dev-lang/julia/files/julia-1.6.5-libgit-1.2.patch b/dev-lang/julia/files/julia-1.6.5-libgit-1.2.patch
deleted file mode 100644
index f0abc7b8f60d..000000000000
--- a/dev-lang/julia/files/julia-1.6.5-libgit-1.2.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-This patch comes from
- https://raw.githubusercontent.com/archlinux/svntogit-community/packages/julia/trunk/julia-libgit-1.2.patch
-
-diff --git a/stdlib/LibGit2/src/types.jl b/stdlib/LibGit2/src/types.jl
-index 9ffcaa3646..5f571e7b26 100644
---- a/stdlib/LibGit2/src/types.jl
-+++ b/stdlib/LibGit2/src/types.jl
-@@ -230,6 +230,9 @@ Matches the [`git_remote_callbacks`](https://libgit2.org/libgit2/#HEAD/type/git_
- push_update_reference::Ptr{Cvoid} = C_NULL
- push_negotiation::Ptr{Cvoid} = C_NULL
- transport::Ptr{Cvoid} = C_NULL
-+ @static if LibGit2.VERSION >= v"1.2.0"
-+ remote_ready::Ptr{Cvoid} = C_NULL
-+ end
- payload::Any = nothing
- @static if LibGit2.VERSION >= v"0.99.0"
- resolve_url::Ptr{Cvoid} = C_NULL
diff --git a/dev-lang/julia/files/julia-1.6.5-libgit-1.4.patch b/dev-lang/julia/files/julia-1.6.5-libgit-1.4.patch
deleted file mode 100644
index fe753c0cd0e4..000000000000
--- a/dev-lang/julia/files/julia-1.6.5-libgit-1.4.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-This patch comes from:
- https://github.com/archlinux/svntogit-community/blob/packages/julia/trunk/julia-libgit-1.4.patch
-
-diff --git a/stdlib/LibGit2/src/consts.jl b/stdlib/LibGit2/src/consts.jl
-index 2bc9edaf89..55887ebe2a 100644
---- a/stdlib/LibGit2/src/consts.jl
-+++ b/stdlib/LibGit2/src/consts.jl
-@@ -247,6 +247,11 @@ const RESET_HARD = Cint(3) # MIXED plus changes in working tree discarded
- REBASE_OPERATION_FIXUP = Cint(4),
- REBASE_OPERATION_EXEC = Cint(5))
-
-+# git_remote_redirect_t
-+const GIT_REMOTE_REDIRECT_NONE = Cint(0)
-+const GIT_REMOTE_REDIRECT_INITIAL = Cint(1)
-+const GIT_REMOTE_REDIRECT_ALL = Cint(2)
-+
- # fetch_prune
- const FETCH_PRUNE_UNSPECIFIED = Cint(0)
- const FETCH_PRUNE = Cint(1)
-diff --git a/stdlib/LibGit2/src/types.jl b/stdlib/LibGit2/src/types.jl
-index 9ffcaa3646..98d938df65 100644
---- a/stdlib/LibGit2/src/types.jl
-+++ b/stdlib/LibGit2/src/types.jl
-@@ -343,6 +343,9 @@ The fields represent:
- @static if LibGit2.VERSION >= v"0.25.0"
- proxy_opts::ProxyOptions = ProxyOptions()
- end
-+ @static if LibGit2.VERSION >= v"1.4.0"
-+ follow_redirects::Cint = Consts.GIT_REMOTE_REDIRECT_INITIAL
-+ end
- @static if LibGit2.VERSION >= v"0.24.0"
- custom_headers::StrArrayStruct = StrArrayStruct()
- end
-@@ -674,6 +677,9 @@ The fields represent:
- @static if LibGit2.VERSION >= v"0.25.0"
- proxy_opts::ProxyOptions = ProxyOptions()
- end
-+ @static if LibGit2.VERSION >= v"1.4.0"
-+ follow_redirects::Cint = Consts.GIT_REMOTE_REDIRECT_INITIAL
-+ end
- @static if LibGit2.VERSION >= v"0.24.0"
- custom_headers::StrArrayStruct = StrArrayStruct()
- end
diff --git a/dev-lang/julia/files/julia-1.6.5-llvm_13_compat_part_1.patch b/dev-lang/julia/files/julia-1.6.5-llvm_13_compat_part_1.patch
deleted file mode 100644
index 1398be7ec873..000000000000
--- a/dev-lang/julia/files/julia-1.6.5-llvm_13_compat_part_1.patch
+++ /dev/null
@@ -1,172 +0,0 @@
-This patch is from the julialang repository:
- https://github.com/JuliaLang/julia/commit/677ce6d3.patch
-but reference comes form ARCH Linux juia package
- https://github.com/archlinux/svntogit-community/tree/packages/julia/trunk
-
-From 677ce6d3adc2f70886f72795b0e5c739e75730ee Mon Sep 17 00:00:00 2001
-From: Valentin Churavy <v.churavy@gmail.com>
-Date: Sat, 28 Aug 2021 16:48:32 +0200
-Subject: [PATCH] [LLVM] Adapt to LLVM 13 changes
-
----
- src/cgutils.cpp | 8 +++++++-
- src/codegen.cpp | 2 +-
- src/disasm.cpp | 8 ++++++++
- src/jitlayers.cpp | 7 +++++++
- src/llvm-late-gc-lowering.cpp | 5 +++--
- src/llvm-multiversioning.cpp | 5 +++++
- src/llvm-remove-addrspaces.cpp | 8 ++++++++
- 7 files changed, 39 insertions(+), 4 deletions(-)
-
-diff --git a/src/cgutils.cpp b/src/cgutils.cpp
-index 4e9917b6b078..928e1a07b2f1 100644
---- a/src/cgutils.cpp
-+++ b/src/cgutils.cpp
-@@ -2757,8 +2757,14 @@ static jl_value_t *static_constant_instance(Constant *constant, jl_value_t *jt)
- size_t nargs;
- if (const auto *CC = dyn_cast<ConstantAggregate>(constant))
- nargs = CC->getNumOperands();
-- else if (const auto *CAZ = dyn_cast<ConstantAggregateZero>(constant))
-+ else if (const auto *CAZ = dyn_cast<ConstantAggregateZero>(constant)) {
-+#if JL_LLVM_VERSION >= 130000
-+ // SVE: Elsewhere we use `getMinKownValue`
-+ nargs = CAZ->getElementCount().getFixedValue();
-+#else
- nargs = CAZ->getNumElements();
-+#endif
-+ }
- else if (const auto *CDS = dyn_cast<ConstantDataSequential>(constant))
- nargs = CDS->getNumElements();
- else
-diff --git a/src/codegen.cpp b/src/codegen.cpp
-index 5cc9f66ffaef..9000513151fe 100644
---- a/src/codegen.cpp
-+++ b/src/codegen.cpp
-@@ -7394,7 +7394,7 @@ static std::pair<std::unique_ptr<Module>, jl_llvm_functions_t>
- #endif
- continue;
- }
-- assert(find(pred_begin(PhiBB), pred_end(PhiBB), FromBB) != pred_end(PhiBB)); // consistency check
-+ assert(std::find(pred_begin(PhiBB), pred_end(PhiBB), FromBB) != pred_end(PhiBB)); // consistency check
- TerminatorInst *terminator = FromBB->getTerminator();
- if (!terminator->getParent()->getUniqueSuccessor()) {
- // Can't use `llvm::SplitCriticalEdge` here because
-diff --git a/src/disasm.cpp b/src/disasm.cpp
-index 6157873ad71c..589f618396ea 100644
---- a/src/disasm.cpp
-+++ b/src/disasm.cpp
-@@ -857,8 +857,16 @@ static void jl_dump_asm_internal(
- assert(MRI && "Unable to create target register info!");
-
- std::unique_ptr<MCObjectFileInfo> MOFI(new MCObjectFileInfo());
-+#if JL_LLVM_VERSION >= 130000
-+ MCSubtargetInfo *MSTI = TheTarget->createMCSubtargetInfo(TheTriple.str(), cpu, features);
-+ assert(MSTI && "Unable to create subtarget info!");
-+
-+ MCContext Ctx(TheTriple, MAI.get(), MRI.get(), MSTI, &SrcMgr);
-+ MOFI->initMCObjectFileInfo(Ctx, /* PIC */ false, /* LargeCodeModel */ false);
-+#else
- MCContext Ctx(MAI.get(), MRI.get(), MOFI.get(), &SrcMgr);
- MOFI->InitMCObjectFileInfo(TheTriple, /* PIC */ false, Ctx);
-+#endif
-
- // Set up Subtarget and Disassembler
- std::unique_ptr<MCSubtargetInfo>
-diff --git a/src/jitlayers.cpp b/src/jitlayers.cpp
-index 60b1903aaa80..12497cadf491 100644
---- a/src/jitlayers.cpp
-+++ b/src/jitlayers.cpp
-@@ -10,6 +10,9 @@
- #include <llvm/Analysis/TargetTransformInfo.h>
- #include <llvm/ExecutionEngine/Orc/CompileUtils.h>
- #include <llvm/ExecutionEngine/Orc/ExecutionUtils.h>
-+#if JL_LLVM_VERSION >= 130000
-+#include <llvm/ExecutionEngine/Orc/ExecutorProcessControl.h>
-+#endif
- #include <llvm/Support/DynamicLibrary.h>
- #include <llvm/Support/FormattedStream.h>
- #include <llvm/Support/SmallVectorMemoryBuffer.h>
-@@ -654,7 +657,11 @@ JuliaOJIT::JuliaOJIT(TargetMachine &TM, LLVMContext *LLVMCtx)
- MemMgr(createRTDyldMemoryManager()),
- JuliaListener(CreateJuliaJITEventListener()),
- TSCtx(std::unique_ptr<LLVMContext>(LLVMCtx)),
-+#if JL_LLVM_VERSION >= 130000
-+ ES(cantFail(orc::SelfExecutorProcessControl::Create())),
-+#else
- ES(),
-+#endif
- GlobalJD(ES.createBareJITDylib("JuliaGlobals")),
- JD(ES.createBareJITDylib("JuliaOJIT")),
- ObjectLayer(
-diff --git a/src/llvm-late-gc-lowering.cpp b/src/llvm-late-gc-lowering.cpp
-index 0aac7638be0d..db8b19bacea5 100644
---- a/src/llvm-late-gc-lowering.cpp
-+++ b/src/llvm-late-gc-lowering.cpp
-@@ -709,7 +709,7 @@ void LateLowerGCFrame::LiftSelect(State &S, SelectInst *SI) {
- else
- Numbers[i] = Number;
- }
-- if (auto VTy = dyn_cast<VectorType>(SI->getType())) {
-+ if (auto VTy = dyn_cast<FixedVectorType>(SI->getType())) {
- if (NumRoots != Numbers.size()) {
- // broadcast the scalar root number to fill the vector
- assert(NumRoots == 1);
-@@ -736,11 +736,12 @@ void LateLowerGCFrame::LiftPhi(State &S, PHINode *Phi) {
- SmallVector<PHINode *, 2> lifted;
- std::vector<int> Numbers;
- unsigned NumRoots = 1;
-- if (auto VTy = dyn_cast<VectorType>(Phi->getType())) {
-+ if (auto VTy = dyn_cast<FixedVectorType>(Phi->getType())) {
- NumRoots = VTy->getNumElements();
- Numbers.resize(NumRoots);
- }
- else {
-+ // TODO: SVE
- assert(isa<PointerType>(Phi->getType()) && "unimplemented");
- }
- for (unsigned i = 0; i < NumRoots; ++i) {
-diff --git a/src/llvm-multiversioning.cpp b/src/llvm-multiversioning.cpp
-index 68081eb53d3a..a82600162fa9 100644
---- a/src/llvm-multiversioning.cpp
-+++ b/src/llvm-multiversioning.cpp
-@@ -403,7 +403,12 @@ void CloneCtx::clone_function(Function *F, Function *new_f, ValueToValueMapTy &v
- vmap[&*J] = &*DestI++;
- }
- SmallVector<ReturnInst*,8> Returns;
-+#if JL_LLVM_VERSION >= 130000
-+ // We are cloning into the same module
-+ CloneFunctionInto(new_f, F, vmap, CloneFunctionChangeType::GlobalChanges, Returns);
-+#else
- CloneFunctionInto(new_f, F, vmap, true, Returns);
-+#endif
- }
-
- // Clone all clone_all targets. Makes sure that the base targets are all available.
-diff --git a/src/llvm-remove-addrspaces.cpp b/src/llvm-remove-addrspaces.cpp
-index ada10c8d5f1f..7c6ef093fbce 100644
---- a/src/llvm-remove-addrspaces.cpp
-+++ b/src/llvm-remove-addrspaces.cpp
-@@ -345,7 +345,11 @@ bool RemoveAddrspacesPass::runOnModule(Module &M)
- for (auto MD : MDs)
- NGV->addMetadata(
- MD.first,
-+#if JL_LLVM_VERSION >= 130000
-+ *MapMetadata(MD.second, VMap));
-+#else
- *MapMetadata(MD.second, VMap, RF_MoveDistinctMDs));
-+#endif
-
- copyComdat(NGV, GV);
-
-@@ -372,7 +376,11 @@ bool RemoveAddrspacesPass::runOnModule(Module &M)
- NF,
- F,
- VMap,
-+#if JL_LLVM_VERSION >= 130000
-+ CloneFunctionChangeType::GlobalChanges,
-+#else
- /*ModuleLevelChanges=*/true,
-+#endif
- Returns,
- "",
- nullptr,
diff --git a/dev-lang/julia/files/julia-1.6.5-llvm_13_compat_part_2.patch b/dev-lang/julia/files/julia-1.6.5-llvm_13_compat_part_2.patch
deleted file mode 100644
index 5a8c2cde93d5..000000000000
--- a/dev-lang/julia/files/julia-1.6.5-llvm_13_compat_part_2.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-This patch is from julialang repository:
- https://github.com/JuliaLang/julia/commit/47f9139e.patch
-but reference comes form ARCH Linux juia package
- https://github.com/archlinux/svntogit-community/tree/packages/julia/trunk
-
-From 47f9139e88917813cb7beee5e690c48c2ac65de4 Mon Sep 17 00:00:00 2001
-From: Xuanda Yang <th3charlie@gmail.com>
-Date: Wed, 9 Jun 2021 22:35:14 +0800
-Subject: [PATCH] codegen: replace deprecated llvm::VectorType::getNumElements
- with new APIs (#41144)
-
----
- src/llvm-late-gc-lowering.cpp | 29 ++++++++++++++++++++++++++---
- 1 file changed, 26 insertions(+), 3 deletions(-)
-
-diff --git a/src/llvm-late-gc-lowering.cpp b/src/llvm-late-gc-lowering.cpp
-index 50015045151b..4df303462d96 100644
---- a/src/llvm-late-gc-lowering.cpp
-+++ b/src/llvm-late-gc-lowering.cpp
-@@ -396,8 +396,14 @@ CountTrackedPointers::CountTrackedPointers(Type *T) {
- }
- if (isa<ArrayType>(T))
- count *= cast<ArrayType>(T)->getNumElements();
-- else if (isa<VectorType>(T))
-+ else if (isa<VectorType>(T)) {
-+#if JL_LLVM_VERSION >= 120000
-+ ElementCount EC = cast<VectorType>(T)->getElementCount();
-+ count *= EC.getKnownMinValue();
-+#else
- count *= cast<VectorType>(T)->getNumElements();
-+#endif
-+ }
- }
- if (count == 0)
- all = false;
-@@ -408,8 +414,14 @@ unsigned getCompositeNumElements(Type *T) {
- return ST->getNumElements();
- else if (auto *AT = dyn_cast<ArrayType>(T))
- return AT->getNumElements();
-- else
-+ else {
-+#if JL_LLVM_VERSION >= 120000
-+ ElementCount EC = cast<VectorType>(T)->getElementCount();
-+ return EC.getKnownMinValue();
-+#else
- return cast<VectorType>(T)->getNumElements();
-+#endif
-+ }
- }
-
- // Walk through a Type, and record the element path to every tracked value inside
-@@ -625,8 +637,14 @@ void LateLowerGCFrame::LiftSelect(State &S, SelectInst *SI) {
- }
- std::vector<int> Numbers;
- unsigned NumRoots = 1;
-- if (auto VTy = dyn_cast<VectorType>(SI->getType()))
-+ if (auto VTy = dyn_cast<VectorType>(SI->getType())) {
-+#if JL_LLVM_VERSION >= 120000
-+ ElementCount EC = VTy->getElementCount();
-+ Numbers.resize(EC.getKnownMinValue(), -1);
-+#else
- Numbers.resize(VTy->getNumElements(), -1);
-+#endif
-+ }
- else
- assert(isa<PointerType>(SI->getType()) && "unimplemented");
- assert(!isTrackedValue(SI));
-@@ -686,7 +704,12 @@ void LateLowerGCFrame::LiftSelect(State &S, SelectInst *SI) {
- assert(NumRoots == 1);
- int Number = Numbers[0];
- Numbers.resize(0);
-+#if JL_LLVM_VERSION >= 120000
-+ ElementCount EC = VTy->getElementCount();
-+ Numbers.resize(EC.getKnownMinValue(), Number);
-+#else
- Numbers.resize(VTy->getNumElements(), Number);
-+#endif
- }
- }
- if (!isa<PointerType>(SI->getType()))
diff --git a/dev-lang/julia/files/julia-1.6.5-make-install-no-build.patch b/dev-lang/julia/files/julia-1.6.5-make-install-no-build.patch
deleted file mode 100644
index 0632a6e726f7..000000000000
--- a/dev-lang/julia/files/julia-1.6.5-make-install-no-build.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-This pacth comes from
- https://raw.githubusercontent.com/archlinux/svntogit-community/packages/julia/trunk/make-install-no-build.patch
-
---- julia-1.3.0/Makefile.orig 2019-12-06 12:54:23.879790955 +0000
-+++ julia-1.3.0/Makefile 2019-12-06 12:54:36.329952953 +0000
-@@ -277,11 +277,6 @@
-
-
- install: $(build_depsbindir)/stringreplace $(BUILDROOT)/doc/_build/html/en/index.html
--ifeq ($(BUNDLE_DEBUG_LIBS),1)
-- @$(MAKE) $(QUIET_MAKE) all
--else
-- @$(MAKE) $(QUIET_MAKE) release
--endif
- @for subdir in $(bindir) $(datarootdir)/julia/stdlib/$(VERSDIR) $(docdir) $(man1dir) $(includedir)/julia $(libdir) $(private_libdir) $(sysconfdir) $(libexecdir); do \
- mkdir -p $(DESTDIR)$$subdir; \
- done
diff --git a/dev-lang/julia/files/julia-1.7.1-do_not_set_rpath.patch b/dev-lang/julia/files/julia-1.7.1-do_not_set_rpath.patch
deleted file mode 100644
index 7b8c3c7ba51b..000000000000
--- a/dev-lang/julia/files/julia-1.7.1-do_not_set_rpath.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/Makefile 2021-12-21 09:38:26.782829864 +0100
-+++ b/Makefile 2021-12-21 10:52:40.760565902 +0100
-@@ -365,7 +365,7 @@
- endif
-
- # Set rpath for LLVM.so which is `$ORIGIN/../lib` moving from `../lib` to `../lib/julia`. We only need to do this for Linux/FreeBSD
--ifneq (,$(findstring $(OS),Linux FreeBSD))
-+ifneq (,$(findstring $(OS),FreeBSD))
- $(PATCHELF) --set-rpath '$$ORIGIN:$$ORIGIN/$(reverse_private_libdir_rel)' $(DESTDIR)$(private_libdir)/libLLVM.$(SHLIB_EXT)
- endif
-
diff --git a/dev-lang/julia/files/julia-1.7.1-hardcoded-libs.patch b/dev-lang/julia/files/julia-1.7.1-hardcoded-libs.patch
deleted file mode 100644
index be7d20368f6d..000000000000
--- a/dev-lang/julia/files/julia-1.7.1-hardcoded-libs.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-This pacth comes from:
- https://raw.githubusercontent.com/archlinux/svntogit-community/packages/julia/trunk/julia-hardcoded-libs.patch
-
-diff --git a/stdlib/MbedTLS_jll/src/MbedTLS_jll.jl b/stdlib/MbedTLS_jll/src/MbedTLS_jll.jl
-index a7ca666b23..b84a42f4e7 100644
---- a/stdlib/MbedTLS_jll/src/MbedTLS_jll.jl
-+++ b/stdlib/MbedTLS_jll/src/MbedTLS_jll.jl
-@@ -31,9 +31,9 @@ elseif Sys.isapple()
- const libmbedtls = "@rpath/libmbedtls.13.dylib"
- const libmbedx509 = "@rpath/libmbedx509.1.dylib"
- else
-- const libmbedcrypto = "libmbedcrypto.so.5"
-- const libmbedtls = "libmbedtls.so.13"
-- const libmbedx509 = "libmbedx509.so.1"
-+ const libmbedcrypto = "libmbedcrypto.so"
-+ const libmbedtls = "libmbedtls.so"
-+ const libmbedx509 = "libmbedx509.so"
- end
-
- function __init__()
-diff --git a/stdlib/libLLVM_jll/src/libLLVM_jll.jl b/stdlib/libLLVM_jll/src/libLLVM_jll.jl
-index fa45e754e5..b51812e3a8 100644
---- a/stdlib/libLLVM_jll/src/libLLVM_jll.jl
-+++ b/stdlib/libLLVM_jll/src/libLLVM_jll.jl
-@@ -23,7 +23,7 @@ if Sys.iswindows()
- elseif Sys.isapple()
- const libLLVM = "@rpath/libLLVM.dylib"
- else
-- const libLLVM = "libLLVM-12jl.so"
-+ const libLLVM = "libLLVM.so"
- end
-
- function __init__()
-diff --git a/stdlib/nghttp2_jll/src/nghttp2_jll.jl b/stdlib/nghttp2_jll/src/nghttp2_jll.jl
-index 8b98c76ac5..77ad9e3800 100644
---- a/stdlib/nghttp2_jll/src/nghttp2_jll.jl
-+++ b/stdlib/nghttp2_jll/src/nghttp2_jll.jl
-@@ -22,7 +22,7 @@ if Sys.iswindows()
- elseif Sys.isapple()
- const libnghttp2 = "@rpath/libnghttp2.14.dylib"
- else
-- const libnghttp2 = "libnghttp2.so.14"
-+ const libnghttp2 = "libnghttp2.so"
- end
-
- function __init__()
-diff --git a/stdlib/LibGit2_jll/src/LibGit2_jll.jl b/stdlib/LibGit2_jll/src/LibGit2_jll.jl
-index f0d4b5dda6..2ed3017b51 100644
---- a/stdlib/LibGit2_jll/src/LibGit2_jll.jl
-+++ b/stdlib/LibGit2_jll/src/LibGit2_jll.jl
-@@ -23,7 +23,7 @@ if Sys.iswindows()
- elseif Sys.isapple()
- const libgit2 = "@rpath/libgit2.1.1.dylib"
- else
-- const libgit2 = "libgit2.so.1.1"
-+ const libgit2 = "libgit2.so"
- end
-
- function __init__()
-diff --git a/stdlib/OpenLibm_jll/src/OpenLibm_jll.jl b/stdlib/OpenLibm_jll/src/OpenLibm_jll.jl
-index 215de8aed6..918d1ffdc2 100644
---- a/stdlib/OpenLibm_jll/src/OpenLibm_jll.jl
-+++ b/stdlib/OpenLibm_jll/src/OpenLibm_jll.jl
-@@ -22,7 +22,7 @@ if Sys.iswindows()
- elseif Sys.isapple()
- const libopenlibm = "@rpath/libopenlibm.3.dylib"
- else
-- const libopenlibm = "libopenlibm.so.3"
-+ const libopenlibm = "libopenlibm.so"
- end
-
- function __init__()
diff --git a/dev-lang/julia/julia-1.7.1-r4.ebuild b/dev-lang/julia/julia-1.7.1-r4.ebuild
deleted file mode 100644
index 1ddfaf72dbc2..000000000000
--- a/dev-lang/julia/julia-1.7.1-r4.ebuild
+++ /dev/null
@@ -1,186 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic llvm pax-utils toolchain-funcs
-
-# correct versions for stdlibs are in deps/checksums
-# for everything else, run with network-sandbox and wait for the crash
-
-MY_LLVM_V="13.0.0"
-
-DESCRIPTION="High-performance programming language for technical computing"
-HOMEPAGE="https://julialang.org/"
-
-SRC_URI="
- https://github.com/JuliaLang/julia/releases/download/v${PV}/${P}-full.tar.gz
- https://github.com/JuliaLang/julia/commit/1eb063f1.patch -> ${PN}-1.7.1-llvm_13_compat_part_3.patch
- https://raw.githubusercontent.com/archlinux/svntogit-community/packages/julia/trunk/f8c918b0.patch -> ${PN}-1.7.1-llvm_13_compat_part_4.patch
- https://raw.githubusercontent.com/archlinux/svntogit-community/packages/julia/trunk/63303980.patch -> ${PN}-1.7.1-llvm_13_compat_part_5.patch
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+system-llvm"
-
-RDEPEND="
- system-llvm? ( sys-devel/llvm:13=[llvm_targets_NVPTX(-)] )
-"
-LLVM_MAX_SLOT=13
-
-RDEPEND+="
- app-arch/p7zip
- dev-libs/gmp:0=
- dev-libs/libgit2:0
- >=dev-libs/libpcre2-10.23:0=[jit,unicode]
- dev-libs/mpfr:0=
- >=dev-libs/libutf8proc-2.6.1:0=[-cjk]
- >=dev-util/patchelf-0.13
- >=net-libs/mbedtls-2.2
- <net-misc/curl-7.81.0[http2,ssh]
- 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/dsfmt-2.2.4
- >=sys-libs/libunwind-1.1:0=
- sys-libs/zlib:0=
- >=virtual/blas-3.6
- virtual/lapack"
-
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- !system-llvm? ( dev-util/cmake )"
-
-PATCHES=(
- "${FILESDIR}/${PN}"-1.4.0-no_symlink_llvm.patch
- "${FILESDIR}/${PN}"-1.6.5-llvm_13_compat_part_1.patch
- "${FILESDIR}/${PN}"-1.6.5-llvm_13_compat_part_2.patch
- "${DISTDIR}/${PN}"-1.7.1-llvm_13_compat_part_3.patch
- "${DISTDIR}/${PN}"-1.7.1-llvm_13_compat_part_4.patch
- "${DISTDIR}/${PN}"-1.7.1-llvm_13_compat_part_5.patch
- "${FILESDIR}/${PN}"-1.6.5-libgit-1.2.patch
- "${FILESDIR}/${PN}"-1.6.5-libgit-1.4.patch
- "${FILESDIR}/${PN}"-1.6.5-make-install-no-build.patch
- "${FILESDIR}/${PN}"-1.7.1-hardcoded-libs.patch
- "${FILESDIR}/${PN}"-1.7.1-do_not_set_rpath.patch
-)
-
-pkg_setup() {
- use system-llvm && llvm_pkg_setup
-}
-
-src_unpack() {
- local tounpack=(${A})
- # the main source tree, followed by deps
- unpack "${tounpack[0]}"
-
- 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
-
- sed -i \
- -e "\|SHIPFLAGS :=|c\\SHIPFLAGS := ${CFLAGS}" \
- Make.inc || 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() {
- # bug #855602
- filter-lto
-
- use system-llvm && ewarn "You have enabled system-llvm. This is unsupported by upstream and may not work."
-
- # julia does not play well with the system versions of libuv
- # USE_SYSTEM_LIBM=0 implies using external openlibm
- cat <<-EOF > Make.user
- LOCALBASE:="${EPREFIX}/usr"
- override prefix:="${EPREFIX}/usr"
- override libdir:="\$(prefix)/$(get_libdir)"
- override CC:=$(tc-getCC)
- override CXX:=$(tc-getCXX)
- override AR:=$(tc-getAR)
-
- BUNDLE_DEBUG_LIBS:=0
- USE_BINARYBUILDER:=0
- USE_SYSTEM_CSL:=1
- USE_SYSTEM_LLVM:=$(usex system-llvm 1 0)
- USE_SYSTEM_LIBUNWIND:=1
- USE_SYSTEM_PCRE:=1
- USE_SYSTEM_LIBM:=0
- USE_SYSTEM_OPENLIBM:=1
- USE_SYSTEM_DSFMT:=1
- USE_SYSTEM_BLAS:=1
- USE_SYSTEM_LAPACK:=1
- USE_SYSTEM_LIBBLASTRAMPOLINE:=0
- USE_SYSTEM_GMP:=1
- USE_SYSTEM_MPFR:=1
- USE_SYSTEM_LIBSUITESPARSE:=1
- USE_SYSTEM_LIBUV:=0
- USE_SYSTEM_UTF8PROC:=1
- USE_SYSTEM_MBEDTLS:=1
- USE_SYSTEM_LIBSSH2:=1
- USE_SYSTEM_NGHTTP2:=1
- USE_SYSTEM_CURL:=1
- USE_SYSTEM_LIBGIT2:=1
- USE_SYSTEM_PATCHELF:=1
- USE_SYSTEM_ZLIB:=1
- USE_SYSTEM_P7ZIP:=1
- VERBOSE:=1
- EOF
-}
-
-src_compile() {
- # Julia accesses /proc/self/mem on Linux
- addpredict /proc/self/mem
-
- default
- pax-mark m "$(file usr/bin/julia-* | awk -F : '/ELF/ {print $1}')"
-}
-
-src_install() {
- emake install DESTDIR="${D}"
-
- if ! use system-llvm ; then
- local llvmslot=$(ver_cut 1 ${MY_LLVM_V})
- cp "${S}/usr/lib/libLLVM-${llvmslot}jl.so" "${ED}/usr/$(get_libdir)/julia/" || die
- fi
-
- 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
-
- # The appdata directory is deprecated.
- mv "${ED}"/usr/share/{appdata,metainfo}/ || die
-}
-
-pkg_postinst() {
- elog "To use Plots, you will need to install sci-visualization/gr."
-}
diff --git a/dev-lang/julia/julia-1.7.3.ebuild b/dev-lang/julia/julia-1.7.3.ebuild
deleted file mode 100644
index 1b2d16111014..000000000000
--- a/dev-lang/julia/julia-1.7.3.ebuild
+++ /dev/null
@@ -1,199 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit flag-o-matic llvm pax-utils toolchain-funcs
-
-# correct versions for stdlibs are in deps/checksums
-# for everything else, run with network-sandbox and wait for the crash
-
-MY_LLVM_V="13.0.0"
-
-DESCRIPTION="High-performance programming language for technical computing"
-HOMEPAGE="https://julialang.org/"
-
-SRC_URI="
- https://github.com/JuliaLang/julia/releases/download/v${PV}/${P}-full.tar.gz
- https://github.com/JuliaLang/julia/commit/677ce6d3.patch -> ${PN}-1.7.3-llvm_13_compat_part_1.patch
- https://github.com/JuliaLang/julia/commit/47f9139e.patch -> ${PN}-1.7.3-llvm_13_compat_part_2.patch
- https://github.com/JuliaLang/julia/commit/1eb063f1.patch -> ${PN}-1.7.3-llvm_13_compat_part_3.patch
- https://github.com/JuliaLang/julia/commit/99d4e655.patch -> ${PN}-1.7.3-llvm_13_compat_part_4.patch
- https://raw.githubusercontent.com/archlinux/svntogit-community/packages/julia/trunk/f8c918b0.patch -> ${PN}-1.7.3-llvm_13_compat_part_5.patch
- https://raw.githubusercontent.com/archlinux/svntogit-community/packages/julia/trunk/63303980.patch -> ${PN}-1.7.3-llvm_13_compat_part_6.patch
- https://raw.githubusercontent.com/archlinux/svntogit-community/packages/julia/trunk/julia-libgit-1.2.patch
- https://raw.githubusercontent.com/archlinux/svntogit-community/packages/julia/trunk/julia-libgit-1.4.patch
- https://raw.githubusercontent.com/archlinux/svntogit-community/packages/julia/trunk/julia-system-cblas.patch
- https://raw.githubusercontent.com/archlinux/svntogit-community/packages/julia/trunk/julia-hardcoded-libs.patch
- https://raw.githubusercontent.com/archlinux/svntogit-community/packages/julia/trunk/make-install-no-build.patch
- https://raw.githubusercontent.com/archlinux/svntogit-community/packages/julia/trunk/julia-libunwind-1.6.patch
- https://raw.githubusercontent.com/archlinux/svntogit-community/packages/julia/trunk/julia-libblastrampoline-4.patch
- https://github.com/JuliaLang/Downloads.jl/archive/refs/tags/v1.5.3.tar.gz -> ${P}_Downloads.jl_1.5.3.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+system-llvm"
-
-RDEPEND="
- system-llvm? ( sys-devel/llvm:13=[llvm_targets_NVPTX(-)] )
-"
-LLVM_MAX_SLOT=13
-
-RDEPEND+="
- app-arch/p7zip
- dev-libs/gmp:0=
- dev-libs/libgit2:0
- >=dev-libs/libpcre2-10.23:0=[jit,unicode]
- dev-libs/mpfr:0=
- >=dev-libs/libutf8proc-2.6.1:0=[-cjk]
- >=dev-util/patchelf-0.13
- >=net-libs/mbedtls-2.2
- net-misc/curl[http2,ssh]
- 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/dsfmt-2.2.4
- >=sys-libs/libunwind-1.1:0=
- sys-libs/zlib:0=
- >=virtual/blas-3.6
- virtual/lapack"
-
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- !system-llvm? ( dev-util/cmake )"
-
-PATCHES=(
- "${DISTDIR}/${PN}"-1.7.3-llvm_13_compat_part_1.patch
- "${DISTDIR}/${PN}"-1.7.3-llvm_13_compat_part_2.patch
- "${DISTDIR}/${PN}"-1.7.3-llvm_13_compat_part_3.patch
- "${DISTDIR}/${PN}"-1.7.3-llvm_13_compat_part_4.patch
- "${DISTDIR}/${PN}"-1.7.3-llvm_13_compat_part_5.patch
- "${DISTDIR}/${PN}"-1.7.3-llvm_13_compat_part_6.patch
- "${DISTDIR}"/julia-libgit-1.2.patch
- "${DISTDIR}"/julia-libgit-1.4.patch
- "${DISTDIR}"/julia-libunwind-1.6.patch
- "${DISTDIR}"/julia-system-cblas.patch
- "${DISTDIR}"/julia-hardcoded-libs.patch
- "${DISTDIR}"/make-install-no-build.patch
- "${DISTDIR}"/julia-libblastrampoline-4.patch
-)
-
-pkg_setup() {
- use system-llvm && llvm_pkg_setup
-}
-
-src_unpack() {
- local tounpack=(${A})
- # the main source tree, followed by deps
- unpack "${tounpack[0]}"
-
- 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
-
- sed -i \
- -e "\|SHIPFLAGS :=|c\\SHIPFLAGS := ${CFLAGS}" \
- Make.inc || 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() {
- # bug #855602
- filter-lto
-
- use system-llvm && ewarn "You have enabled system-llvm. This is unsupported by upstream and may not work."
-
- # julia does not play well with the system versions of libuv
- # USE_SYSTEM_LIBM=0 implies using external openlibm
- cat <<-EOF > Make.user
- LOCALBASE:="${EPREFIX}/usr"
- override prefix:="${EPREFIX}/usr"
- override libdir:="\$(prefix)/$(get_libdir)"
- override CC:=$(tc-getCC)
- override CXX:=$(tc-getCXX)
- override AR:=$(tc-getAR)
-
- BUNDLE_DEBUG_LIBS:=0
- USE_BINARYBUILDER:=0
- USE_SYSTEM_CSL:=1
- USE_SYSTEM_LLVM:=$(usex system-llvm 1 0)
- USE_SYSTEM_LIBUNWIND:=1
- USE_SYSTEM_PCRE:=1
- USE_SYSTEM_LIBM:=0
- USE_SYSTEM_OPENLIBM:=1
- USE_SYSTEM_DSFMT:=1
- USE_SYSTEM_BLAS:=1
- USE_SYSTEM_LAPACK:=1
- USE_SYSTEM_LIBBLASTRAMPOLINE:=0
- USE_SYSTEM_GMP:=1
- USE_SYSTEM_MPFR:=1
- USE_SYSTEM_LIBSUITESPARSE:=1
- USE_SYSTEM_LIBUV:=0
- USE_SYSTEM_UTF8PROC:=1
- USE_SYSTEM_MBEDTLS:=1
- USE_SYSTEM_LIBSSH2:=1
- USE_SYSTEM_NGHTTP2:=1
- USE_SYSTEM_CURL:=1
- USE_SYSTEM_LIBGIT2:=1
- USE_SYSTEM_PATCHELF:=1
- USE_SYSTEM_ZLIB:=1
- USE_SYSTEM_P7ZIP:=1
- VERBOSE:=1
- EOF
-}
-
-src_compile() {
- # Julia accesses /proc/self/mem on Linux
- addpredict /proc/self/mem
-
- default
- pax-mark m "$(file usr/bin/julia-* | awk -F : '/ELF/ {print $1}')"
-}
-
-src_install() {
- emake install DESTDIR="${D}"
-
- if ! use system-llvm ; then
- local llvmslot=$(ver_cut 1 ${MY_LLVM_V})
- cp "${S}/usr/lib/libLLVM-${llvmslot}jl.so" "${ED}/usr/$(get_libdir)/julia/" || die
- fi
-
- 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
-
- # The appdata directory is deprecated.
- mv "${ED}"/usr/share/{appdata,metainfo}/ || die
-}
-
-pkg_postinst() {
- elog "To use Plots, you will need to install sci-visualization/gr."
-}
^ permalink raw reply related [flat|nested] 24+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-lang/julia/, dev-lang/julia/files/
@ 2022-06-06 5:17 Matthias Maier
0 siblings, 0 replies; 24+ messages in thread
From: Matthias Maier @ 2022-06-06 5:17 UTC (permalink / raw
To: gentoo-commits
commit: 5cbce21c37c1d2cc185709c7d327e34a9712df17
Author: Matthias Maier <tamiko <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 6 05:15:57 2022 +0000
Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org>
CommitDate: Mon Jun 6 05:16:53 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5cbce21c
dev-lang/julia: drop 1.6.5-r2
Closes: https://bugs.gentoo.org/840592
Signed-off-by: Matthias Maier <tamiko <AT> gentoo.org>
dev-lang/julia/Manifest | 1 -
.../julia/files/julia-1.1.0-fix_llvm_install.patch | 15 -
.../julia/files/julia-1.6.5-do_not_set_rpath.patch | 20 --
.../files/julia-1.6.5-lazy_artifacts_fix.patch | 30 --
.../files/julia-1.6.5-llvm_13_compat_part_3.patch | 375 ---------------------
.../files/julia-1.6.5-llvm_13_compat_part_4.patch | 35 --
.../files/julia-1.6.5-llvm_bad_perf_fix.patch | 33 --
dev-lang/julia/julia-1.6.5-r2.ebuild | 184 ----------
8 files changed, 693 deletions(-)
diff --git a/dev-lang/julia/Manifest b/dev-lang/julia/Manifest
index 012710241246..91f9e1fcc3fe 100644
--- a/dev-lang/julia/Manifest
+++ b/dev-lang/julia/Manifest
@@ -1,4 +1,3 @@
-DIST julia-1.6.5-full.tar.gz 153795029 BLAKE2B b86d3ad8dbc4ce486cc0d5e3c25f40c0bedf38cab5b29f1aac4dd527650e78c2e0e462f4eb13fde787adf48a2de9f8eee9cfb8f4aaafbae6ee5e76d7d9608995 SHA512 f057a913f4579280d757c0a97a7cd800fb335be8ec83a27a577d2bee0c9736d49715c7861f7bc1e6461966634bd82890f1f69fd0167f21903ad614e8f70e0dcc
DIST julia-1.7.1-full.tar.gz 255682275 BLAKE2B 923cd1ed735f1ff5537ff8655ba5b63cc8d27a9b36ba05f3942447bea67034ad771ca8f69192ca7718ab3aace5d12c0e08961eafead9aedb9af35e2d212e8e97 SHA512 df6c9d33ed69c1b53a7f77f95954d4ed5fadb176ebf9f490e7721bc036109edfaa5873ce9041620af1d5c3731db7acc5af932b4173ce54bcc7ae3d7c9c393638
DIST julia-1.7.1-llvm_13_compat_part_3.patch 28006 BLAKE2B b1909fd6df1ac51e7e2d16279ff5ed2febe27967832ddbb9517372dcb41597f7ba9fa6013d65fdbdaf345b5c32fdf90f60c086afcdf6b793172061fe63263b0f SHA512 d251d5fbc088aa03e2c423926fa9f82a8a29a995e20150f27bf01ea9209008259f97daf27c333686b62412190fa4077cca178ce39bb6c7bd4e3e8b4f2affa22f
DIST julia-1.7.1-llvm_13_compat_part_4.patch 11421 BLAKE2B ca4f3e2c6b60462f7f04f609be07f95b81fe076350167de3354cf5c0fb98d3f1b5a5b2d275da8074a077be3edbb8544a3403a080dc1ca0dbe827dde96c61f5f2 SHA512 5cd709b24a6e00f67998efcc21d77b710399f1bf96e7656b3c90a2cc564bcf05e2e1012b788751d48ff7964fb6be2af710d850c34e83532976addecae4db1969
diff --git a/dev-lang/julia/files/julia-1.1.0-fix_llvm_install.patch b/dev-lang/julia/files/julia-1.1.0-fix_llvm_install.patch
deleted file mode 100644
index 9cb75188b963..000000000000
--- a/dev-lang/julia/files/julia-1.1.0-fix_llvm_install.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/deps/llvm.mk 2019-02-09 10:09:30.102927517 +0300
-+++ b/deps/llvm.mk 2019-02-09 10:10:51.479924878 +0300
-@@ -464,10 +464,11 @@
-
- $(build_prefix)/manifest/llvm: | $(llvm_python_workaround)
-
-+# unset DESTDIR to fix https://github.com/JuliaLang/julia/issues/23462
- LLVM_INSTALL = \
- cd $1 && mkdir -p $2$$(build_depsbindir) && \
- cp -r $$(LLVM_SRC_DIR)/utils/lit $2$$(build_depsbindir)/ && \
-- $$(CMAKE) -DCMAKE_INSTALL_PREFIX="$2$$(build_prefix)" -P cmake_install.cmake
-+ DESTDIR="" $$(CMAKE) -DCMAKE_INSTALL_PREFIX="$2$$(build_prefix)" -P cmake_install.cmake
- ifeq ($(OS), WINNT)
- LLVM_INSTALL += && cp $2$$(build_shlibdir)/LLVM.dll $2$$(build_depsbindir)
- endif
diff --git a/dev-lang/julia/files/julia-1.6.5-do_not_set_rpath.patch b/dev-lang/julia/files/julia-1.6.5-do_not_set_rpath.patch
deleted file mode 100644
index c0c05cc649a0..000000000000
--- a/dev-lang/julia/files/julia-1.6.5-do_not_set_rpath.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/Makefile 2021-12-21 09:38:26.782829864 +0100
-+++ b/Makefile 2021-12-21 10:52:40.760565902 +0100
-@@ -336,7 +336,7 @@
- install_name_tool -add_rpath @executable_path/$(build_libdir_rel) @executable_path/$(libdir_rel) $(DESTDIR)$(bindir)/$$j; \
- done
- endif
--else ifneq (,$(findstring $(OS),Linux FreeBSD))
-+else ifneq (,$(findstring $(OS),FreeBSD))
- for j in $(JL_TARGETS) ; do \
- $(PATCHELF) --set-rpath '$$ORIGIN/$(private_libdir_rel):$$ORIGIN/$(libdir_rel)' $(DESTDIR)$(bindir)/$$j; \
- done
-@@ -357,7 +357,7 @@
- endif
-
- # Set rpath for libjulia-internal, which is moving from `../lib` to `../lib/julia`. We only need to do this for Linux/FreeBSD
--ifneq (,$(findstring $(OS),Linux FreeBSD))
-+ifneq (,$(findstring $(OS),FreeBSD))
- $(PATCHELF) --set-rpath '$$ORIGIN:$$ORIGIN/$(reverse_private_libdir_rel)' $(DESTDIR)$(private_libdir)/libjulia-internal.$(SHLIB_EXT)
- ifeq ($(BUNDLE_DEBUG_LIBS),1)
- $(PATCHELF) --set-rpath '$$ORIGIN:$$ORIGIN/$(reverse_private_libdir_rel)' $(DESTDIR)$(private_libdir)/libjulia-internal-debug.$(SHLIB_EXT)
diff --git a/dev-lang/julia/files/julia-1.6.5-lazy_artifacts_fix.patch b/dev-lang/julia/files/julia-1.6.5-lazy_artifacts_fix.patch
deleted file mode 100644
index 9e0d5ecf1a32..000000000000
--- a/dev-lang/julia/files/julia-1.6.5-lazy_artifacts_fix.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Patch from
-https://github.com/JuliaLang/julia/commit/d6a655bc.patch
- Fix LazyArtifacts tests
-
-From d6a655bcfb610130626470e1aa5e2fc28a014b4a Mon Sep 17 00:00:00 2001
-From: Jameson Nash <vtjnash@gmail.com>
-Date: Thu, 24 Dec 2020 00:29:37 -0500
-Subject: [PATCH] codegen: use new freeze intrinsics to avoid poison UB
- (#38977)
-
-LLVM would likely be required to insert this anyways to make hoisting
-legal (converting branches to and/or), so might as well add it
-ourselves, so that users can legally write that code directly.
----
- src/intrinsics.cpp | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/intrinsics.cpp b/src/intrinsics.cpp
-index ada6166c1ceb..b5160bbc39c0 100644
---- a/src/intrinsics.cpp
-+++ b/src/intrinsics.cpp
-@@ -542,6 +542,8 @@ static jl_cgval_t generic_cast(
- #endif
- }
- Value *ans = ctx.builder.CreateCast(Op, from, to);
-+ if (f == fptosi || f == fptoui)
-+ ans = ctx.builder.CreateFreeze(ans);
- return mark_julia_type(ctx, ans, false, jlto);
- }
-
diff --git a/dev-lang/julia/files/julia-1.6.5-llvm_13_compat_part_3.patch b/dev-lang/julia/files/julia-1.6.5-llvm_13_compat_part_3.patch
deleted file mode 100644
index 43b7925a9ce7..000000000000
--- a/dev-lang/julia/files/julia-1.6.5-llvm_13_compat_part_3.patch
+++ /dev/null
@@ -1,375 +0,0 @@
-This patch is from:
- https://raw.githubusercontent.com/archlinux/svntogit-community/packages/julia/trunk/julia-llvm13.patch
-
-From 9daa25a5f331a7e1c0f0b222373a853c2ce1462d Mon Sep 17 00:00:00 2001
-From: Valentin Churavy <v.churavy@gmail.com>
-Date: Tue, 12 Oct 2021 11:56:19 -0400
-Subject: [PATCH 2/6] WIP: add Type to ByVal attribute
-
----
- src/abi_aarch64.cpp | 2 +-
- src/abi_arm.cpp | 2 +-
- src/abi_llvm.cpp | 2 +-
- src/abi_ppc64le.cpp | 6 +++++-
- src/abi_win32.cpp | 6 +++++-
- src/abi_win64.cpp | 9 +++++++--
- src/abi_x86.cpp | 8 ++++++--
- src/abi_x86_64.cpp | 11 ++++++++++-
- src/ccall.cpp | 4 ++--
- 9 files changed, 38 insertions(+), 12 deletions(-)
-
-diff --git a/src/abi_aarch64.cpp b/src/abi_aarch64.cpp
-index ce94cc66f0..7ffe107d61 100644
---- a/src/abi_aarch64.cpp
-+++ b/src/abi_aarch64.cpp
-@@ -194,7 +194,7 @@ Type *isHFAorHVA(jl_datatype_t *dt, size_t &nele) const
- return NULL;
- }
-
--bool needPassByRef(jl_datatype_t *dt, AttrBuilder &ab) override
-+bool needPassByRef(jl_datatype_t *dt, AttrBuilder &ab, Type *Ty) override
- {
- // B.2
- // If the argument type is an HFA or an HVA, then the argument is used
-diff --git a/src/abi_arm.cpp b/src/abi_arm.cpp
-index 1a5d3d0651..ed846dfafb 100644
---- a/src/abi_arm.cpp
-+++ b/src/abi_arm.cpp
-@@ -23,7 +23,7 @@
-
- struct ABI_ARMLayout : AbiLayout {
-
--bool needPassByRef(jl_datatype_t *dt, AttrBuilder &ab) override
-+bool needPassByRef(jl_datatype_t *dt, AttrBuilder &ab, Type *Ty) override
- {
- return false;
- }
-diff --git a/src/abi_llvm.cpp b/src/abi_llvm.cpp
-index 1ab30da1b2..dba8f4aa8a 100644
---- a/src/abi_llvm.cpp
-+++ b/src/abi_llvm.cpp
-@@ -45,7 +45,7 @@ bool use_sret(jl_datatype_t *ty) override
- return false;
- }
-
--bool needPassByRef(jl_datatype_t *ty, AttrBuilder &ab) override
-+bool needPassByRef(jl_datatype_t *ty, AttrBuilder &ab, Type *Ty) override
- {
- return false;
- }
-diff --git a/src/abi_ppc64le.cpp b/src/abi_ppc64le.cpp
-index dd6f927d9c..35e444ef77 100644
---- a/src/abi_ppc64le.cpp
-+++ b/src/abi_ppc64le.cpp
-@@ -101,12 +101,16 @@ bool use_sret(jl_datatype_t *dt) override
- return false;
- }
-
--bool needPassByRef(jl_datatype_t *dt, AttrBuilder &ab) override
-+bool needPassByRef(jl_datatype_t *dt, AttrBuilder &ab, Type *Ty) override
- {
- jl_datatype_t *ty0 = NULL;
- bool hva = false;
- if (jl_datatype_size(dt) > 64 && isHFA(dt, &ty0, &hva) > 8) {
-+#if JL_LLVM_VERSION < 120000
- ab.addAttribute(Attribute::ByVal);
-+#else
-+ ab.addByValAttr(Ty);
-+#endif
- return true;
- }
- return false;
-diff --git a/src/abi_win32.cpp b/src/abi_win32.cpp
-index af16a0310b..0b34f840e4 100644
---- a/src/abi_win32.cpp
-+++ b/src/abi_win32.cpp
-@@ -49,11 +49,15 @@ bool use_sret(jl_datatype_t *dt) override
- return true;
- }
-
--bool needPassByRef(jl_datatype_t *dt, AttrBuilder &ab) override
-+bool needPassByRef(jl_datatype_t *dt, AttrBuilder &ab, Type *Ty) override
- {
- // Use pass by reference for all structs
- if (dt->layout->nfields > 0) {
-+#if JL_LLVM_VERSION < 120000
- ab.addAttribute(Attribute::ByVal);
-+#else
-+ ab.addByValAttr(Ty);
-+#endif
- return true;
- }
- return false;
-diff --git a/src/abi_win64.cpp b/src/abi_win64.cpp
-index 16e46a9703..f47802edf1 100644
---- a/src/abi_win64.cpp
-+++ b/src/abi_win64.cpp
-@@ -56,14 +56,19 @@ bool use_sret(jl_datatype_t *dt) override
- return true;
- }
-
--bool needPassByRef(jl_datatype_t *dt, AttrBuilder &ab) override
-+bool needPassByRef(jl_datatype_t *dt, AttrBuilder &ab, Type *Ty) override
- {
- nargs++;
- size_t size = jl_datatype_size(dt);
- if (win64_reg_size(size))
- return false;
-- if (nargs <= 4)
-+ if (nargs <= 4) {
-+#if JL_LLVM_VERSION < 120000
- ab.addAttribute(Attribute::ByVal);
-+#else
-+ ab.addByValAttr(Ty);
-+#endif
-+ }
- return true;
- }
-
-diff --git a/src/abi_x86.cpp b/src/abi_x86.cpp
-index 7a65de028e..c6c0282602 100644
---- a/src/abi_x86.cpp
-+++ b/src/abi_x86.cpp
-@@ -67,12 +67,16 @@ bool use_sret(jl_datatype_t *dt) override
- return true;
- }
-
--bool needPassByRef(jl_datatype_t *dt, AttrBuilder &ab) override
-+bool needPassByRef(jl_datatype_t *dt, AttrBuilder &ab, Type *Ty) override
- {
- size_t size = jl_datatype_size(dt);
- if (is_complex64(dt) || is_complex128(dt) || (jl_is_primitivetype(dt) && size <= 8))
- return false;
-- ab.addAttribute(Attribute::ByVal);
-+#if JL_LLVM_VERSION < 120000
-+ ab.addAttribute(Attribute::ByVal);
-+#else
-+ ab.addByValAttr(Ty);
-+#endif
- return true;
- }
-
-diff --git a/src/abi_x86_64.cpp b/src/abi_x86_64.cpp
-index ac28af3011..5f8256dee4 100644
---- a/src/abi_x86_64.cpp
-+++ b/src/abi_x86_64.cpp
-@@ -178,11 +178,15 @@ bool use_sret(jl_datatype_t *dt) override
- return sret;
- }
-
--bool needPassByRef(jl_datatype_t *dt, AttrBuilder &ab) override
-+bool needPassByRef(jl_datatype_t *dt, AttrBuilder &ab, Type *Ty) override
- {
- Classification cl = classify(dt);
- if (cl.isMemory) {
-+#if JL_LLVM_VERSION < 120000
- ab.addAttribute(Attribute::ByVal);
-+#else
-+ ab.addByValAttr(Ty);
-+#endif
- return true;
- }
-
-@@ -202,7 +206,12 @@ bool needPassByRef(jl_datatype_t *dt, AttrBuilder &ab) override
- else if (jl_is_structtype(dt)) {
- // spill to memory even though we would ordinarily pass
- // it in registers
-+#if JL_LLVM_VERSION < 120000
- ab.addAttribute(Attribute::ByVal);
-+#else
-+ Type* Ty = preferred_llvm_type(dt, false);
-+ ab.addByValAttr(Ty);
-+#endif
- return true;
- }
- return false;
-diff --git a/src/ccall.cpp b/src/ccall.cpp
-index 66ab84c264..e21c717d41 100644
---- a/src/ccall.cpp
-+++ b/src/ccall.cpp
-@@ -291,7 +291,7 @@ class AbiLayout {
- public:
- virtual ~AbiLayout() {}
- virtual bool use_sret(jl_datatype_t *ty) = 0;
-- virtual bool needPassByRef(jl_datatype_t *ty, AttrBuilder&) = 0;
-+ virtual bool needPassByRef(jl_datatype_t *ty, AttrBuilder&, Type* llvm_t) = 0;
- virtual Type *preferred_llvm_type(jl_datatype_t *ty, bool isret) const = 0;
- };
-
-@@ -1077,7 +1077,7 @@ std::string generate_func_sig(const char *fname)
- }
-
- // Whether or not LLVM wants us to emit a pointer to the data
-- bool byRef = abi->needPassByRef((jl_datatype_t*)tti, ab);
-+ bool byRef = abi->needPassByRef((jl_datatype_t*)tti, ab, t);
-
- if (jl_is_cpointer_type(tti)) {
- pat = t;
-
-From 1fe19a197ebbe33c9e60b2ca7d30c2573772b476 Mon Sep 17 00:00:00 2001
-From: Valentin Churavy <v.churavy@gmail.com>
-Date: Thu, 21 Oct 2021 20:32:39 -0400
-Subject: [PATCH 4/6] [LLVM/Win32] Force stack alignment on module
-
----
- src/aotcompile.cpp | 3 +++
- src/ccall.cpp | 3 +++
- src/codegen.cpp | 11 ++++++++++-
- 3 files changed, 16 insertions(+), 1 deletion(-)
-
-diff --git a/src/aotcompile.cpp b/src/aotcompile.cpp
-index ffd43ee8d48d..d3dfc744fcd0 100644
---- a/src/aotcompile.cpp
-+++ b/src/aotcompile.cpp
-@@ -550,6 +550,9 @@ void jl_dump_native_impl(void *native_code,
- std::unique_ptr<Module> sysimage(new Module("sysimage", Context));
- sysimage->setTargetTriple(data->M->getTargetTriple());
- sysimage->setDataLayout(data->M->getDataLayout());
-+#if JL_LLVM_VERSION >= 130000
-+ sysimage->setOverrideStackAlignment(data->M->getOverrideStackAlignment());
-+#endif
- data->M.reset(); // free memory for data->M
-
- if (sysimg_data) {
-diff --git a/src/ccall.cpp b/src/ccall.cpp
-index fb70e53e2814..dd7626c918d0 100644
---- a/src/ccall.cpp
-+++ b/src/ccall.cpp
-@@ -891,6 +891,9 @@ static jl_cgval_t emit_llvmcall(jl_codectx_t &ctx, jl_value_t **args, size_t nar
- // copy module properties that should always match
- Mod->setTargetTriple(jl_Module->getTargetTriple());
- Mod->setDataLayout(jl_Module->getDataLayout());
-+#if JL_LLVM_VERSION >= 130000
-+ Mod->setOverrideStackAlignment(jl_Module->getOverrideStackAlignment());
-+#endif
-
- // verify the definition
- Function *def = Mod->getFunction(ir_name);
-diff --git a/src/codegen.cpp b/src/codegen.cpp
-index b09eb8db04e0..bc4ea7711a04 100644
---- a/src/codegen.cpp
-+++ b/src/codegen.cpp
-@@ -1707,6 +1707,14 @@ static void jl_setup_module(Module *m, const jl_cgparams_t *params = &jl_default
- llvm::DEBUG_METADATA_VERSION);
- m->setDataLayout(jl_data_layout);
- m->setTargetTriple(jl_TargetMachine->getTargetTriple().str());
-+
-+#if defined(_OS_WINDOWS_) && !defined(_CPU_X86_64_) && JL_LLVM_VERSIOn >= 130000
-+ // tell Win32 to assume the stack is always 16-byte aligned,
-+ // and to ensure that it is 16-byte aligned for out-going calls,
-+ // to ensure compatibility with GCC codes
-+ m->setOverrideStackAlignment(16;)
-+#endif
-+
- }
-
- Module *jl_create_llvm_module(StringRef name)
-@@ -8235,10 +8243,11 @@ extern "C" void jl_init_llvm(void)
-
- TargetOptions options = TargetOptions();
- //options.PrintMachineCode = true; //Print machine code produced during JIT compiling
--#if defined(_OS_WINDOWS_) && !defined(_CPU_X86_64_)
-+#if defined(_OS_WINDOWS_) && !defined(_CPU_X86_64_) && JL_LLVM_VERSION <= 120000
- // tell Win32 to assume the stack is always 16-byte aligned,
- // and to ensure that it is 16-byte aligned for out-going calls,
- // to ensure compatibility with GCC codes
-+ // In LLVM 13 and onwards this has turned into a module option
- options.StackAlignmentOverride = 16;
- #endif
- #ifdef JL_DEBUG_BUILD
-
-From 7a320647976eb97fdd169b5e85397b9e493e4569 Mon Sep 17 00:00:00 2001
-From: Valentin Churavy <v.churavy@gmail.com>
-Date: Fri, 22 Oct 2021 15:35:38 -0400
-Subject: [PATCH 5/6] StackProtector is now a module flag
-
----
- src/aotcompile.cpp | 1 +
- src/ccall.cpp | 1 +
- src/codegen.cpp | 6 ++++--
- 3 files changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/src/aotcompile.cpp b/src/aotcompile.cpp
-index d3dfc744fcd0..05fcca50c4ee 100644
---- a/src/aotcompile.cpp
-+++ b/src/aotcompile.cpp
-@@ -551,6 +551,7 @@ void jl_dump_native_impl(void *native_code,
- sysimage->setTargetTriple(data->M->getTargetTriple());
- sysimage->setDataLayout(data->M->getDataLayout());
- #if JL_LLVM_VERSION >= 130000
-+ sysimage->setStackProtectorGuard(data->M->getStackProtectorGuard());
- sysimage->setOverrideStackAlignment(data->M->getOverrideStackAlignment());
- #endif
- data->M.reset(); // free memory for data->M
-diff --git a/src/ccall.cpp b/src/ccall.cpp
-index dd7626c918d0..647735edb37d 100644
---- a/src/ccall.cpp
-+++ b/src/ccall.cpp
-@@ -892,6 +892,7 @@ static jl_cgval_t emit_llvmcall(jl_codectx_t &ctx, jl_value_t **args, size_t nar
- Mod->setTargetTriple(jl_Module->getTargetTriple());
- Mod->setDataLayout(jl_Module->getDataLayout());
- #if JL_LLVM_VERSION >= 130000
-+ Mod->setStackProtectorGuard(jl_Module->getStackProtectorGuard());
- Mod->setOverrideStackAlignment(jl_Module->getOverrideStackAlignment());
- #endif
-
-diff --git a/src/codegen.cpp b/src/codegen.cpp
-index bc4ea7711a04..1a7017d3aeb7 100644
---- a/src/codegen.cpp
-+++ b/src/codegen.cpp
-@@ -1714,7 +1714,9 @@ static void jl_setup_module(Module *m, const jl_cgparams_t *params = &jl_default
- // to ensure compatibility with GCC codes
- m->setOverrideStackAlignment(16;)
- #endif
--
-+#if defined(JL_DEBUG_BUILD) && JL_LLVM_VERSION >= 130000
-+ m->setStackProtectorGuard("global");
-+#endif
- }
-
- Module *jl_create_llvm_module(StringRef name)
-
-From e323fc8f7be4ce053dec613076d7dd7517515134 Mon Sep 17 00:00:00 2001
-From: Valentin Churavy <v.churavy@gmail.com>
-Date: Sun, 24 Oct 2021 15:18:23 -0400
-Subject: [PATCH 6/6] Cleanup MachineObjectFileInfo handling in disassembly
-
----
- src/disasm.cpp | 18 +++++++++---------
- 1 file changed, 9 insertions(+), 9 deletions(-)
-
-diff --git a/src/disasm.cpp b/src/disasm.cpp
-index 73b394b77d0b..25e7841bde85 100644
---- a/src/disasm.cpp
-+++ b/src/disasm.cpp
-@@ -860,21 +860,21 @@ static void jl_dump_asm_internal(
- std::unique_ptr<MCRegisterInfo> MRI(TheTarget->createMCRegInfo(TheTriple.str()));
- assert(MRI && "Unable to create target register info!");
-
-- std::unique_ptr<MCObjectFileInfo> MOFI(new MCObjectFileInfo());
--#if JL_LLVM_VERSION >= 130000
-- MCSubtargetInfo *MSTI = TheTarget->createMCSubtargetInfo(TheTriple.str(), cpu, features);
-- assert(MSTI && "Unable to create subtarget info!");
-+ std::unique_ptr<llvm::MCSubtargetInfo> STI(
-+ TheTarget->createMCSubtargetInfo(TheTriple.str(), cpu, features));
-+ assert(STI && "Unable to create subtarget info!");
-
-- MCContext Ctx(TheTriple, MAI.get(), MRI.get(), MSTI, &SrcMgr);
-- MOFI->initMCObjectFileInfo(Ctx, /* PIC */ false, /* LargeCodeModel */ false);
-+#if JL_LLVM_VERSION >= 130000
-+ MCContext Ctx(TheTriple, MAI.get(), MRI.get(), STI.get(), &SrcMgr);
-+ std::unique_ptr<MCObjectFileInfo> MOFI(
-+ TheTarget->createMCObjectFileInfo(Ctx, /*PIC=*/false, /*LargeCodeModel=*/ false));
-+ Ctx.setObjectFileInfo(MOFI.get());
- #else
-+ std::unique_ptr<MCObjectFileInfo> MOFI(new MCObjectFileInfo());
- MCContext Ctx(MAI.get(), MRI.get(), MOFI.get(), &SrcMgr);
- MOFI->InitMCObjectFileInfo(TheTriple, /* PIC */ false, Ctx);
- #endif
-
-- // Set up Subtarget and Disassembler
-- std::unique_ptr<MCSubtargetInfo>
-- STI(TheTarget->createMCSubtargetInfo(TheTriple.str(), cpu, features));
- std::unique_ptr<MCDisassembler> DisAsm(TheTarget->createMCDisassembler(*STI, Ctx));
- if (!DisAsm) {
- rstream << "ERROR: no disassembler for target " << TheTriple.str();
diff --git a/dev-lang/julia/files/julia-1.6.5-llvm_13_compat_part_4.patch b/dev-lang/julia/files/julia-1.6.5-llvm_13_compat_part_4.patch
deleted file mode 100644
index 839dd4ba39a0..000000000000
--- a/dev-lang/julia/files/julia-1.6.5-llvm_13_compat_part_4.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-Patch from
- https://github.com/JuliaLang/julia/commit/a2d85f6d.patch
-
-
-From a2d85f6dc63439aea9f973bacb55006596fdb2b8 Mon Sep 17 00:00:00 2001
-From: Fangrui Song <i@maskray.me>
-Date: Tue, 4 May 2021 11:53:40 -0700
-Subject: [PATCH] Replace llvm::sys::fs::F_None with llvm::sys::fs::OF_None
- (#40666)
-
-The former is deprecated.
-OF_None has been available in LLVM since 2018-06.
----
- src/codegen.cpp | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/codegen.cpp b/src/codegen.cpp
-index ee5ec4dce0c1..bc60798220d5 100644
---- a/src/codegen.cpp
-+++ b/src/codegen.cpp
-@@ -8092,12 +8092,12 @@ extern "C" void jl_dump_llvm_mfunction(void *v)
-
- extern void jl_write_bitcode_func(void *F, char *fname) {
- std::error_code EC;
-- raw_fd_ostream OS(fname, EC, sys::fs::F_None);
-+ raw_fd_ostream OS(fname, EC, sys::fs::OF_None);
- llvm::WriteBitcodeToFile(*((llvm::Function*)F)->getParent(), OS);
- }
-
- extern void jl_write_bitcode_module(void *M, char *fname) {
- std::error_code EC;
-- raw_fd_ostream OS(fname, EC, sys::fs::F_None);
-+ raw_fd_ostream OS(fname, EC, sys::fs::OF_None);
- llvm::WriteBitcodeToFile(*(llvm::Module*)M, OS);
- }
diff --git a/dev-lang/julia/files/julia-1.6.5-llvm_bad_perf_fix.patch b/dev-lang/julia/files/julia-1.6.5-llvm_bad_perf_fix.patch
deleted file mode 100644
index f38c26bfd52e..000000000000
--- a/dev-lang/julia/files/julia-1.6.5-llvm_bad_perf_fix.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-Patch from
- https://github.com/JuliaLang/julia/commit/7df16be0.patch
-fixes bad performance with LLVM 12
-
-From 7df16be0bfafee6d304ee0690366fa33845cc8d6 Mon Sep 17 00:00:00 2001
-From: Valentin Churavy <v.churavy@gmail.com>
-Date: Wed, 12 May 2021 18:44:40 -0400
-Subject: [PATCH] [LLVM] add correlated value propagation after jump threading
-
----
- src/aotcompile.cpp | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/aotcompile.cpp b/src/aotcompile.cpp
-index db3f9f4b0e22..4cc22d127528 100644
---- a/src/aotcompile.cpp
-+++ b/src/aotcompile.cpp
-@@ -692,6 +692,7 @@ void addOptimizationPasses(legacy::PassManagerBase *PM, int opt_level,
- PM->add(createSROAPass());
- PM->add(createInstSimplifyLegacyPass());
- PM->add(createJumpThreadingPass());
-+ PM->add(createCorrelatedValuePropagationPass());
-
- PM->add(createReassociatePass());
-
-@@ -743,6 +744,7 @@ void addOptimizationPasses(legacy::PassManagerBase *PM, int opt_level,
- // loops over Union-typed arrays to vectorize.
- PM->add(createInstructionCombiningPass());
- PM->add(createJumpThreadingPass());
-+ PM->add(createCorrelatedValuePropagationPass());
- PM->add(createDeadStoreEliminationPass());
-
- // More dead allocation (store) deletion before loop optimization
diff --git a/dev-lang/julia/julia-1.6.5-r2.ebuild b/dev-lang/julia/julia-1.6.5-r2.ebuild
deleted file mode 100644
index a2d6758f86d7..000000000000
--- a/dev-lang/julia/julia-1.6.5-r2.ebuild
+++ /dev/null
@@ -1,184 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit llvm pax-utils toolchain-funcs
-
-# correct versions for stdlibs are in deps/checksums
-# for everything else, run with network-sandbox and wait for the crash
-
-#MY_LIBUV_V="fb3e3364c33ae48c827f6b103e05c3f0e78b79a9"
-#MY_LIBWHICH_V="81e9723c0273d78493dc8c8ed570f68d9ce7e89e"
-MY_LLVM_V="13.0.1"
-
-DESCRIPTION="High-performance programming language for technical computing"
-HOMEPAGE="https://julialang.org/"
-
-SRC_URI="
- https://github.com/JuliaLang/julia/releases/download/v${PV}/${P}-full.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+system-llvm"
-
-RDEPEND="
- system-llvm? ( sys-devel/llvm:13=[llvm_targets_NVPTX(-)] )
-"
-LLVM_MAX_SLOT=13
-
-RDEPEND+="
- app-arch/p7zip
- dev-libs/gmp:0=
- dev-libs/libgit2:0
- >=dev-libs/libpcre2-10.23:0=[jit,unicode]
- dev-libs/mpfr:0=
- dev-libs/libutf8proc:0=[-cjk]
- dev-util/patchelf
- >=net-libs/mbedtls-2.2
- <net-misc/curl-7.81.0[http2,ssh]
- 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/dsfmt-2.2.4
- >=sys-libs/libunwind-1.1:0=
- sys-libs/zlib:0=
- >=virtual/blas-3.6
- virtual/lapack"
-
-DEPEND="${RDEPEND}
- dev-util/patchelf
- virtual/pkgconfig
- !system-llvm? ( dev-util/cmake )"
-
-PATCHES=(
- "${FILESDIR}/${PN}"-1.1.0-fix_llvm_install.patch
- "${FILESDIR}/${PN}"-1.4.0-no_symlink_llvm.patch
- "${FILESDIR}/${PN}"-1.6.5-llvm_bad_perf_fix.patch
- "${FILESDIR}/${PN}"-1.6.5-llvm_13_compat_part_1.patch
- "${FILESDIR}/${PN}"-1.6.5-llvm_13_compat_part_2.patch
- "${FILESDIR}/${PN}"-1.6.5-llvm_13_compat_part_3.patch
- "${FILESDIR}/${PN}"-1.6.5-llvm_13_compat_part_4.patch
- "${FILESDIR}/${PN}"-1.6.5-libgit-1.2.patch
- "${FILESDIR}/${PN}"-1.6.5-libgit-1.4.patch
- "${FILESDIR}/${PN}"-1.6.5-make-install-no-build.patch
- "${FILESDIR}/${PN}"-1.6.5-hardcoded-libs.patch
- "${FILESDIR}/${PN}"-1.6.5-do_not_set_rpath.patch
- "${FILESDIR}/${PN}"-1.6.5-lazy_artifacts_fix.patch
-)
-
-pkg_setup() {
- use system-llvm && llvm_pkg_setup
-}
-
-src_unpack() {
- local tounpack=(${A})
- # the main source tree, followed by deps
- unpack "${tounpack[0]}"
-
- 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
-
- sed -i \
- -e "\|SHIPFLAGS :=|c\\SHIPFLAGS := ${CFLAGS}" \
- Make.inc || 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() {
- use system-llvm && ewarn "You have enabled system-llvm. This is unsupported by upstream and may not work."
-
- # julia does not play well with the system versions of libuv
- # USE_SYSTEM_LIBM=0 implies using external openlibm
- cat <<-EOF > Make.user
- LOCALBASE:="${EPREFIX}/usr"
- override prefix:="${EPREFIX}/usr"
- override libdir:="\$(prefix)/$(get_libdir)"
- override CC:=$(tc-getCC)
- override CXX:=$(tc-getCXX)
- override AR:=$(tc-getAR)
-
- BUNDLE_DEBUG_LIBS:=0
- USE_BINARYBUILDER:=0
- USE_SYSTEM_CSL:=1
- USE_SYSTEM_LLVM:=$(usex system-llvm 1 0)
- USE_SYSTEM_LIBUNWIND:=1
- USE_SYSTEM_PCRE:=1
- USE_SYSTEM_LIBM:=0
- USE_SYSTEM_OPENLIBM:=1
- USE_SYSTEM_DSFMT:=1
- USE_SYSTEM_BLAS:=1
- USE_SYSTEM_LAPACK:=1
- USE_SYSTEM_GMP:=1
- USE_SYSTEM_MPFR:=1
- USE_SYSTEM_SUITESPARSE:=1
- USE_SYSTEM_LIBUV:=0
- USE_SYSTEM_UTF8PROC:=1
- USE_SYSTEM_MBEDTLS:=1
- USE_SYSTEM_LIBSSH2:=1
- USE_SYSTEM_NGHTTP2:=1
- USE_SYSTEM_CURL:=1
- USE_SYSTEM_LIBGIT2:=1
- USE_SYSTEM_PATCHELF:=1
- USE_SYSTEM_ZLIB:=1
- USE_SYSTEM_P7ZIP:=1
- VERBOSE:=1
- EOF
-}
-
-src_compile() {
- # Julia accesses /proc/self/mem on Linux
- addpredict /proc/self/mem
-
- default
- pax-mark m "$(file usr/bin/julia-* | awk -F : '/ELF/ {print $1}')"
-}
-
-src_install() {
- emake install DESTDIR="${D}"
-
- if ! use system-llvm ; then
- local llvmslot=$(ver_cut 1 ${MY_LLVM_V})
- cp "${S}/usr/lib/libLLVM-${llvmslot}jl.so" "${ED}/usr/$(get_libdir)/julia/" || die
- fi
-
- 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
-
- # The appdata directory is deprecated.
- mv "${ED}"/usr/share/{appdata,metainfo}/ || die
-}
-
-pkg_postinst() {
- elog "To use Plots, you will need to install sci-visualization/gr."
-}
^ permalink raw reply related [flat|nested] 24+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-lang/julia/, dev-lang/julia/files/
@ 2022-04-24 14:41 Michał Górny
0 siblings, 0 replies; 24+ messages in thread
From: Michał Górny @ 2022-04-24 14:41 UTC (permalink / raw
To: gentoo-commits
commit: d5ed1c2ec3f6f3038d9573e58e35fda96a467320
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 24 13:44:39 2022 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Apr 24 14:40:46 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d5ed1c2e
dev-lang/julia: Remove old
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
dev-lang/julia/Manifest | 4 -
.../files/julia-1.6.0-fix-hardcoded-libs.patch | 43 -----
dev-lang/julia/julia-1.6.3.ebuild | 178 ---------------------
3 files changed, 225 deletions(-)
diff --git a/dev-lang/julia/Manifest b/dev-lang/julia/Manifest
index 399954d47d5e..3f0db07ad736 100644
--- a/dev-lang/julia/Manifest
+++ b/dev-lang/julia/Manifest
@@ -1,9 +1,5 @@
-DIST julia-1.6.3.tar.gz 7734900 BLAKE2B 679851ee159ac83f49e54f1d71068d4abde919a0da39475dccaecc97e705b87db70c38a55fbc7a0cfacc774291013b189fb516817d6c6e67ca5ccfbb515c3f90 SHA512 a622fddc9e9f3f47037053a1e722153a567c065723f99a97912f8c5a6c2a22c3be0be674325361dd1b04601bbe6c6f204c66004ce887f3f7822e8204fd6855de
DIST julia-1.6.5-full.tar.gz 153795029 BLAKE2B b86d3ad8dbc4ce486cc0d5e3c25f40c0bedf38cab5b29f1aac4dd527650e78c2e0e462f4eb13fde787adf48a2de9f8eee9cfb8f4aaafbae6ee5e76d7d9608995 SHA512 f057a913f4579280d757c0a97a7cd800fb335be8ec83a27a577d2bee0c9736d49715c7861f7bc1e6461966634bd82890f1f69fd0167f21903ad614e8f70e0dcc
DIST julia-1.7.1-full.tar.gz 255682275 BLAKE2B 923cd1ed735f1ff5537ff8655ba5b63cc8d27a9b36ba05f3942447bea67034ad771ca8f69192ca7718ab3aace5d12c0e08961eafead9aedb9af35e2d212e8e97 SHA512 df6c9d33ed69c1b53a7f77f95954d4ed5fadb176ebf9f490e7721bc036109edfaa5873ce9041620af1d5c3731db7acc5af932b4173ce54bcc7ae3d7c9c393638
DIST julia-1.7.1-llvm_13_compat_part_3.patch 28006 BLAKE2B b1909fd6df1ac51e7e2d16279ff5ed2febe27967832ddbb9517372dcb41597f7ba9fa6013d65fdbdaf345b5c32fdf90f60c086afcdf6b793172061fe63263b0f SHA512 d251d5fbc088aa03e2c423926fa9f82a8a29a995e20150f27bf01ea9209008259f97daf27c333686b62412190fa4077cca178ce39bb6c7bd4e3e8b4f2affa22f
DIST julia-1.7.1-llvm_13_compat_part_4.patch 11421 BLAKE2B ca4f3e2c6b60462f7f04f609be07f95b81fe076350167de3354cf5c0fb98d3f1b5a5b2d275da8074a077be3edbb8544a3403a080dc1ca0dbe827dde96c61f5f2 SHA512 5cd709b24a6e00f67998efcc21d77b710399f1bf96e7656b3c90a2cc564bcf05e2e1012b788751d48ff7964fb6be2af710d850c34e83532976addecae4db1969
DIST julia-1.7.1-llvm_13_compat_part_5.patch 27094 BLAKE2B b70a96c4f897349dce04246335bc38a6726e02a43cd5a28bc31bfcb9190f5361e2e4d16a9fb5c1b3c0e53d2e59f5380b161350968f9479cdb765b4681b9f5743 SHA512 efd1029d0030417082b7d640b2e4b7bb35818d555c808bceb9a31e5d93b2f27a8ca11b9228cf4129b5bee411e1fe9e4ce4e7515226ceab905532d1875e260f7c
-DIST julia-libuv-fb3e3364c33ae48c827f6b103e05c3f0e78b79a9.tar.gz 1643008 BLAKE2B b2a121e0b94cd1f5d40e292fc2356e8940bf8dfe1e6a200b50caf60def1982b705d1d42dd234e9e8b0aa70439bf34a5bce71761424623cbfcd20c9131ce09c25 SHA512 29947c236aef8931be4767df1cd8404ee9b036ee107b31cbce6fad9a97743df57d068b15bc4bd00320b9b81cd879258a9ec9dc675853e424ccdb8d6bdd226240
-DIST julia-libwhich-81e9723c0273d78493dc8c8ed570f68d9ce7e89e.tar.gz 4183 BLAKE2B c932e23b1b476d3fd16cf6f451efd5fc6d9c1ec2c53e8ac086340a100817d9b30dae3eff50b284a42c09b2bbae30b9e2fd38b2881f8cbf4974a89f3bd0c87599 SHA512 6fb77b715d70d9bc95a8546c3bf97bd3677c7ea344b88bb5bc3bbfac9dceabe8a8cde7a0f64dec884cde802e4a3000e30837d3f824b5a9242348c4fe061526a3
-DIST llvm-11.0.1.src.tar.xz 38914796 BLAKE2B ccdec0632c9cf5fae8e6947c266136e04dc8c609e2ca9c1efb1205767d9181301e0de14601d11e2f27ec0ebc0749858a5f1089d8a40a9ae3f22582cbf6abef6e SHA512 b42c67ef88e09dd94171f85cdf49a421a15cfc82ff715c7ce6de22f98cefbe6c7cdf6bf4af7ca017d56ecf6aa3e36df3d823a78cf2dd5312de4301b54b43dbe8
diff --git a/dev-lang/julia/files/julia-1.6.0-fix-hardcoded-libs.patch b/dev-lang/julia/files/julia-1.6.0-fix-hardcoded-libs.patch
deleted file mode 100644
index 1d184c3dbb54..000000000000
--- a/dev-lang/julia/files/julia-1.6.0-fix-hardcoded-libs.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-diff --git a/stdlib/MbedTLS_jll/src/MbedTLS_jll.jl b/stdlib/MbedTLS_jll/src/MbedTLS_jll.jl
-index a7ca666b23..b84a42f4e7 100644
---- a/stdlib/MbedTLS_jll/src/MbedTLS_jll.jl
-+++ b/stdlib/MbedTLS_jll/src/MbedTLS_jll.jl
-@@ -31,9 +31,9 @@ elseif Sys.isapple()
- const libmbedtls = "@rpath/libmbedtls.13.dylib"
- const libmbedx509 = "@rpath/libmbedx509.1.dylib"
- else
-- const libmbedcrypto = "libmbedcrypto.so.5"
-- const libmbedtls = "libmbedtls.so.13"
-- const libmbedx509 = "libmbedx509.so.1"
-+ const libmbedcrypto = "libmbedcrypto.so"
-+ const libmbedtls = "libmbedtls.so"
-+ const libmbedx509 = "libmbedx509.so"
- end
-
- function __init__()
-diff --git a/stdlib/libLLVM_jll/src/libLLVM_jll.jl b/stdlib/libLLVM_jll/src/libLLVM_jll.jl
-index fa45e754e5..b51812e3a8 100644
---- a/stdlib/libLLVM_jll/src/libLLVM_jll.jl
-+++ b/stdlib/libLLVM_jll/src/libLLVM_jll.jl
-@@ -23,7 +23,7 @@ if Sys.iswindows()
- elseif Sys.isapple()
- const libLLVM = "@rpath/libLLVM.dylib"
- else
-- const libLLVM = "libLLVM-11jl.so"
-+ const libLLVM = "libLLVM.so"
- end
-
- function __init__()
-diff --git a/stdlib/nghttp2_jll/src/nghttp2_jll.jl b/stdlib/nghttp2_jll/src/nghttp2_jll.jl
-index 8b98c76ac5..77ad9e3800 100644
---- a/stdlib/nghttp2_jll/src/nghttp2_jll.jl
-+++ b/stdlib/nghttp2_jll/src/nghttp2_jll.jl
-@@ -22,7 +22,7 @@ if Sys.iswindows()
- elseif Sys.isapple()
- const libnghttp2 = "@rpath/libnghttp2.14.dylib"
- else
-- const libnghttp2 = "libnghttp2.so.14"
-+ const libnghttp2 = "libnghttp2.so"
- end
-
- function __init__()
diff --git a/dev-lang/julia/julia-1.6.3.ebuild b/dev-lang/julia/julia-1.6.3.ebuild
deleted file mode 100644
index 096876a7c5a3..000000000000
--- a/dev-lang/julia/julia-1.6.3.ebuild
+++ /dev/null
@@ -1,178 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit llvm pax-utils toolchain-funcs
-
-# correct versions for stdlibs are in deps/checksums
-# for everything else, run with network-sandbox and wait for the crash
-
-MY_LIBUV_V="fb3e3364c33ae48c827f6b103e05c3f0e78b79a9"
-MY_LIBWHICH_V="81e9723c0273d78493dc8c8ed570f68d9ce7e89e"
-MY_LLVM_V="11.0.1"
-
-DESCRIPTION="High-performance programming language for technical computing"
-HOMEPAGE="https://julialang.org/"
-
-SRC_URI="
- https://github.com/JuliaLang/julia/releases/download/v${PV}/${P}.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/vtjnash/libwhich/tarball/${MY_LIBWHICH_V} -> ${PN}-libwhich-${MY_LIBWHICH_V}.tar.gz
- !system-llvm? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-${MY_LLVM_V}/llvm-${MY_LLVM_V}.src.tar.xz )
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+system-llvm"
-
-RDEPEND="
- system-llvm? ( sys-devel/llvm:11=[llvm_targets_NVPTX(-)] )
-"
-LLVM_MAX_SLOT=11
-
-RDEPEND+="
- app-arch/p7zip
- dev-libs/gmp:0=
- dev-libs/libgit2:0
- >=dev-libs/libpcre2-10.23:0=[jit,unicode]
- dev-libs/mpfr:0=
- dev-libs/libutf8proc:0=[-cjk]
- dev-util/patchelf
- >=net-libs/mbedtls-2.2
- net-misc/curl[http2,ssh]
- 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/dsfmt-2.2.4
- >=sys-libs/libunwind-1.1:0=
- sys-libs/zlib:0=
- >=virtual/blas-3.6
- virtual/lapack"
-
-DEPEND="${RDEPEND}
- dev-util/patchelf
- virtual/pkgconfig
- !system-llvm? ( dev-util/cmake )"
-
-PATCHES=(
- "${FILESDIR}/${PN}"-1.1.0-fix_llvm_install.patch
- "${FILESDIR}/${PN}"-1.4.0-no_symlink_llvm.patch
- "${FILESDIR}/${PN}"-1.6.0-fix-hardcoded-libs.patch
- "${FILESDIR}/${PN}"-1.6.3-glibc-2.34.patch
-)
-
-pkg_setup() {
- use system-llvm && llvm_pkg_setup
-}
-
-src_unpack() {
- local tounpack=(${A})
- # the main source tree, followed by deps
- unpack "${tounpack[0]}"
-
- 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
-
- sed -i \
- -e "\|SHIPFLAGS :=|c\\SHIPFLAGS := ${CFLAGS}" \
- Make.inc || 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() {
- use system-llvm && ewarn "You have enabled system-llvm. This is unsupported by upstream and may not work."
-
- # julia does not play well with the system versions of libuv
- # USE_SYSTEM_LIBM=0 implies using external openlibm
- cat <<-EOF > Make.user
- LOCALBASE:="${EPREFIX}/usr"
- override prefix:="${EPREFIX}/usr"
- override libdir:="\$(prefix)/$(get_libdir)"
- override CC:=$(tc-getCC)
- override CXX:=$(tc-getCXX)
- override AR:=$(tc-getAR)
-
- BUNDLE_DEBUG_LIBS:=0
- USE_BINARYBUILDER:=0
- USE_SYSTEM_CSL:=1
- USE_SYSTEM_LLVM:=$(usex system-llvm 1 0)
- USE_SYSTEM_LIBUNWIND:=1
- USE_SYSTEM_PCRE:=1
- USE_SYSTEM_LIBM:=0
- USE_SYSTEM_OPENLIBM:=1
- USE_SYSTEM_DSFMT:=1
- USE_SYSTEM_BLAS:=1
- USE_SYSTEM_LAPACK:=1
- USE_SYSTEM_GMP:=1
- USE_SYSTEM_MPFR:=1
- USE_SYSTEM_SUITESPARSE:=1
- USE_SYSTEM_LIBUV:=0
- USE_SYSTEM_UTF8PROC:=1
- USE_SYSTEM_MBEDTLS:=1
- USE_SYSTEM_LIBSSH2:=1
- USE_SYSTEM_NGHTTP2:=1
- USE_SYSTEM_CURL:=1
- USE_SYSTEM_LIBGIT2:=1
- USE_SYSTEM_PATCHELF:=1
- USE_SYSTEM_ZLIB:=1
- USE_SYSTEM_P7ZIP:=1
- VERBOSE:=1
- EOF
-}
-
-src_compile() {
- # Julia accesses /proc/self/mem on Linux
- addpredict /proc/self/mem
-
- default
- pax-mark m "$(file usr/bin/julia-* | awk -F : '/ELF/ {print $1}')"
-}
-
-src_install() {
- emake install DESTDIR="${D}"
-
- if ! use system-llvm ; then
- local llvmslot=$(ver_cut 1 ${MY_LLVM_V})
- cp "${S}/usr/lib/libLLVM-${llvmslot}jl.so" "${ED}/usr/$(get_libdir)/julia/" || die
- fi
-
- 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
-
- # The appdata directory is deprecated.
- mv "${ED}"/usr/share/{appdata,metainfo}/ || die
-}
-
-pkg_postinst() {
- elog "To use Plots, you will need to install sci-visualization/gr."
-}
^ permalink raw reply related [flat|nested] 24+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-lang/julia/, dev-lang/julia/files/
@ 2022-01-05 11:00 Matthias Maier
0 siblings, 0 replies; 24+ messages in thread
From: Matthias Maier @ 2022-01-05 11:00 UTC (permalink / raw
To: gentoo-commits
commit: e13b594c70d5d85e0180f248de12224cd0139015
Author: Matthias Maier <tamiko <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 5 10:57:40 2022 +0000
Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org>
CommitDate: Wed Jan 5 11:00:41 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e13b594c
dev-lang/julia: rename patches
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Matthias Maier <tamiko <AT> gentoo.org>
dev-lang/julia/Manifest | 6 +++---
...bgit-1.2.patch => julia-1.6.5-libgit-1.2.patch} | 0
...tch => julia-1.6.5-llvm_13_compat_part_1.patch} | 0
...tch => julia-1.6.5-llvm_13_compat_part_2.patch} | 0
...tch => julia-1.6.5-llvm_13_compat_part_3.patch} | 0
...tch => julia-1.6.5-make-install-no-build.patch} | 0
...libs.patch => julia-1.7.1-hardcoded-libs.patch} | 0
dev-lang/julia/julia-1.6.5.ebuild | 12 ++++++------
dev-lang/julia/julia-1.7.1-r2.ebuild | 22 +++++++++++-----------
9 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/dev-lang/julia/Manifest b/dev-lang/julia/Manifest
index 12e16a297558..399954d47d5e 100644
--- a/dev-lang/julia/Manifest
+++ b/dev-lang/julia/Manifest
@@ -1,9 +1,9 @@
DIST julia-1.6.3.tar.gz 7734900 BLAKE2B 679851ee159ac83f49e54f1d71068d4abde919a0da39475dccaecc97e705b87db70c38a55fbc7a0cfacc774291013b189fb516817d6c6e67ca5ccfbb515c3f90 SHA512 a622fddc9e9f3f47037053a1e722153a567c065723f99a97912f8c5a6c2a22c3be0be674325361dd1b04601bbe6c6f204c66004ce887f3f7822e8204fd6855de
DIST julia-1.6.5-full.tar.gz 153795029 BLAKE2B b86d3ad8dbc4ce486cc0d5e3c25f40c0bedf38cab5b29f1aac4dd527650e78c2e0e462f4eb13fde787adf48a2de9f8eee9cfb8f4aaafbae6ee5e76d7d9608995 SHA512 f057a913f4579280d757c0a97a7cd800fb335be8ec83a27a577d2bee0c9736d49715c7861f7bc1e6461966634bd82890f1f69fd0167f21903ad614e8f70e0dcc
-DIST julia-1.7.0-llvm_13_compat_part_4.patch 28006 BLAKE2B b1909fd6df1ac51e7e2d16279ff5ed2febe27967832ddbb9517372dcb41597f7ba9fa6013d65fdbdaf345b5c32fdf90f60c086afcdf6b793172061fe63263b0f SHA512 d251d5fbc088aa03e2c423926fa9f82a8a29a995e20150f27bf01ea9209008259f97daf27c333686b62412190fa4077cca178ce39bb6c7bd4e3e8b4f2affa22f
-DIST julia-1.7.0-llvm_13_compat_part_5.patch 11421 BLAKE2B ca4f3e2c6b60462f7f04f609be07f95b81fe076350167de3354cf5c0fb98d3f1b5a5b2d275da8074a077be3edbb8544a3403a080dc1ca0dbe827dde96c61f5f2 SHA512 5cd709b24a6e00f67998efcc21d77b710399f1bf96e7656b3c90a2cc564bcf05e2e1012b788751d48ff7964fb6be2af710d850c34e83532976addecae4db1969
-DIST julia-1.7.0-llvm_13_compat_part_6.patch 27094 BLAKE2B b70a96c4f897349dce04246335bc38a6726e02a43cd5a28bc31bfcb9190f5361e2e4d16a9fb5c1b3c0e53d2e59f5380b161350968f9479cdb765b4681b9f5743 SHA512 efd1029d0030417082b7d640b2e4b7bb35818d555c808bceb9a31e5d93b2f27a8ca11b9228cf4129b5bee411e1fe9e4ce4e7515226ceab905532d1875e260f7c
DIST julia-1.7.1-full.tar.gz 255682275 BLAKE2B 923cd1ed735f1ff5537ff8655ba5b63cc8d27a9b36ba05f3942447bea67034ad771ca8f69192ca7718ab3aace5d12c0e08961eafead9aedb9af35e2d212e8e97 SHA512 df6c9d33ed69c1b53a7f77f95954d4ed5fadb176ebf9f490e7721bc036109edfaa5873ce9041620af1d5c3731db7acc5af932b4173ce54bcc7ae3d7c9c393638
+DIST julia-1.7.1-llvm_13_compat_part_3.patch 28006 BLAKE2B b1909fd6df1ac51e7e2d16279ff5ed2febe27967832ddbb9517372dcb41597f7ba9fa6013d65fdbdaf345b5c32fdf90f60c086afcdf6b793172061fe63263b0f SHA512 d251d5fbc088aa03e2c423926fa9f82a8a29a995e20150f27bf01ea9209008259f97daf27c333686b62412190fa4077cca178ce39bb6c7bd4e3e8b4f2affa22f
+DIST julia-1.7.1-llvm_13_compat_part_4.patch 11421 BLAKE2B ca4f3e2c6b60462f7f04f609be07f95b81fe076350167de3354cf5c0fb98d3f1b5a5b2d275da8074a077be3edbb8544a3403a080dc1ca0dbe827dde96c61f5f2 SHA512 5cd709b24a6e00f67998efcc21d77b710399f1bf96e7656b3c90a2cc564bcf05e2e1012b788751d48ff7964fb6be2af710d850c34e83532976addecae4db1969
+DIST julia-1.7.1-llvm_13_compat_part_5.patch 27094 BLAKE2B b70a96c4f897349dce04246335bc38a6726e02a43cd5a28bc31bfcb9190f5361e2e4d16a9fb5c1b3c0e53d2e59f5380b161350968f9479cdb765b4681b9f5743 SHA512 efd1029d0030417082b7d640b2e4b7bb35818d555c808bceb9a31e5d93b2f27a8ca11b9228cf4129b5bee411e1fe9e4ce4e7515226ceab905532d1875e260f7c
DIST julia-libuv-fb3e3364c33ae48c827f6b103e05c3f0e78b79a9.tar.gz 1643008 BLAKE2B b2a121e0b94cd1f5d40e292fc2356e8940bf8dfe1e6a200b50caf60def1982b705d1d42dd234e9e8b0aa70439bf34a5bce71761424623cbfcd20c9131ce09c25 SHA512 29947c236aef8931be4767df1cd8404ee9b036ee107b31cbce6fad9a97743df57d068b15bc4bd00320b9b81cd879258a9ec9dc675853e424ccdb8d6bdd226240
DIST julia-libwhich-81e9723c0273d78493dc8c8ed570f68d9ce7e89e.tar.gz 4183 BLAKE2B c932e23b1b476d3fd16cf6f451efd5fc6d9c1ec2c53e8ac086340a100817d9b30dae3eff50b284a42c09b2bbae30b9e2fd38b2881f8cbf4974a89f3bd0c87599 SHA512 6fb77b715d70d9bc95a8546c3bf97bd3677c7ea344b88bb5bc3bbfac9dceabe8a8cde7a0f64dec884cde802e4a3000e30837d3f824b5a9242348c4fe061526a3
DIST llvm-11.0.1.src.tar.xz 38914796 BLAKE2B ccdec0632c9cf5fae8e6947c266136e04dc8c609e2ca9c1efb1205767d9181301e0de14601d11e2f27ec0ebc0749858a5f1089d8a40a9ae3f22582cbf6abef6e SHA512 b42c67ef88e09dd94171f85cdf49a421a15cfc82ff715c7ce6de22f98cefbe6c7cdf6bf4af7ca017d56ecf6aa3e36df3d823a78cf2dd5312de4301b54b43dbe8
diff --git a/dev-lang/julia/files/julia-1.7.0-libgit-1.2.patch b/dev-lang/julia/files/julia-1.6.5-libgit-1.2.patch
similarity index 100%
rename from dev-lang/julia/files/julia-1.7.0-libgit-1.2.patch
rename to dev-lang/julia/files/julia-1.6.5-libgit-1.2.patch
diff --git a/dev-lang/julia/files/julia-1.7.0-llvm_13_compat_part_1.patch b/dev-lang/julia/files/julia-1.6.5-llvm_13_compat_part_1.patch
similarity index 100%
rename from dev-lang/julia/files/julia-1.7.0-llvm_13_compat_part_1.patch
rename to dev-lang/julia/files/julia-1.6.5-llvm_13_compat_part_1.patch
diff --git a/dev-lang/julia/files/julia-1.7.0-llvm_13_compat_part_2.patch b/dev-lang/julia/files/julia-1.6.5-llvm_13_compat_part_2.patch
similarity index 100%
rename from dev-lang/julia/files/julia-1.7.0-llvm_13_compat_part_2.patch
rename to dev-lang/julia/files/julia-1.6.5-llvm_13_compat_part_2.patch
diff --git a/dev-lang/julia/files/julia-1.7.0-llvm_13_compat_part_3.patch b/dev-lang/julia/files/julia-1.6.5-llvm_13_compat_part_3.patch
similarity index 100%
rename from dev-lang/julia/files/julia-1.7.0-llvm_13_compat_part_3.patch
rename to dev-lang/julia/files/julia-1.6.5-llvm_13_compat_part_3.patch
diff --git a/dev-lang/julia/files/julia-1.7.0-make-install-no-build.patch b/dev-lang/julia/files/julia-1.6.5-make-install-no-build.patch
similarity index 100%
rename from dev-lang/julia/files/julia-1.7.0-make-install-no-build.patch
rename to dev-lang/julia/files/julia-1.6.5-make-install-no-build.patch
diff --git a/dev-lang/julia/files/julia-1.7.0-hardcoded-libs.patch b/dev-lang/julia/files/julia-1.7.1-hardcoded-libs.patch
similarity index 100%
rename from dev-lang/julia/files/julia-1.7.0-hardcoded-libs.patch
rename to dev-lang/julia/files/julia-1.7.1-hardcoded-libs.patch
diff --git a/dev-lang/julia/julia-1.6.5.ebuild b/dev-lang/julia/julia-1.6.5.ebuild
index e7bcae84ca7a..534e938e4e3d 100644
--- a/dev-lang/julia/julia-1.6.5.ebuild
+++ b/dev-lang/julia/julia-1.6.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -64,12 +64,12 @@ PATCHES=(
"${FILESDIR}/${PN}"-1.1.0-fix_llvm_install.patch
"${FILESDIR}/${PN}"-1.4.0-no_symlink_llvm.patch
"${FILESDIR}/${PN}"-1.6.5-llvm_bad_perf_fix.patch
- "${FILESDIR}/${PN}"-1.7.0-llvm_13_compat_part_1.patch
- "${FILESDIR}/${PN}"-1.7.0-llvm_13_compat_part_2.patch
- "${FILESDIR}/${PN}"-1.7.0-llvm_13_compat_part_3.patch
+ "${FILESDIR}/${PN}"-1.6.5-llvm_13_compat_part_1.patch
+ "${FILESDIR}/${PN}"-1.6.5-llvm_13_compat_part_2.patch
+ "${FILESDIR}/${PN}"-1.6.5-llvm_13_compat_part_3.patch
"${FILESDIR}/${PN}"-1.6.5-llvm_13_compat_part_4.patch
- "${FILESDIR}/${PN}"-1.7.0-libgit-1.2.patch
- "${FILESDIR}/${PN}"-1.7.0-make-install-no-build.patch
+ "${FILESDIR}/${PN}"-1.6.5-libgit-1.2.patch
+ "${FILESDIR}/${PN}"-1.6.5-make-install-no-build.patch
"${FILESDIR}/${PN}"-1.6.5-hardcoded-libs.patch
"${FILESDIR}/${PN}"-1.6.5-do_not_set_rpath.patch
"${FILESDIR}/${PN}"-1.6.5-lazy_artifacts_fix.patch
diff --git a/dev-lang/julia/julia-1.7.1-r2.ebuild b/dev-lang/julia/julia-1.7.1-r2.ebuild
index a66329f48d64..58f9de7db701 100644
--- a/dev-lang/julia/julia-1.7.1-r2.ebuild
+++ b/dev-lang/julia/julia-1.7.1-r2.ebuild
@@ -15,9 +15,9 @@ HOMEPAGE="https://julialang.org/"
SRC_URI="
https://github.com/JuliaLang/julia/releases/download/v${PV}/${P}-full.tar.gz
- https://github.com/JuliaLang/julia/commit/1eb063f1.patch -> ${PN}-1.7.0-llvm_13_compat_part_4.patch
- https://raw.githubusercontent.com/archlinux/svntogit-community/packages/julia/trunk/f8c918b0.patch -> ${PN}-1.7.0-llvm_13_compat_part_5.patch
- https://raw.githubusercontent.com/archlinux/svntogit-community/packages/julia/trunk/63303980.patch -> ${PN}-1.7.0-llvm_13_compat_part_6.patch
+ https://github.com/JuliaLang/julia/commit/1eb063f1.patch -> ${PN}-1.7.1-llvm_13_compat_part_3.patch
+ https://raw.githubusercontent.com/archlinux/svntogit-community/packages/julia/trunk/f8c918b0.patch -> ${PN}-1.7.1-llvm_13_compat_part_4.patch
+ https://raw.githubusercontent.com/archlinux/svntogit-community/packages/julia/trunk/63303980.patch -> ${PN}-1.7.1-llvm_13_compat_part_5.patch
"
LICENSE="MIT"
@@ -62,14 +62,14 @@ DEPEND="${RDEPEND}
PATCHES=(
"${FILESDIR}/${PN}"-1.4.0-no_symlink_llvm.patch
- "${FILESDIR}/${PN}"-1.7.0-llvm_13_compat_part_1.patch
- "${FILESDIR}/${PN}"-1.7.0-llvm_13_compat_part_2.patch
- "${DISTDIR}/${PN}"-1.7.0-llvm_13_compat_part_4.patch
- "${DISTDIR}/${PN}"-1.7.0-llvm_13_compat_part_5.patch
- "${DISTDIR}/${PN}"-1.7.0-llvm_13_compat_part_6.patch
- "${FILESDIR}/${PN}"-1.7.0-libgit-1.2.patch
- "${FILESDIR}/${PN}"-1.7.0-make-install-no-build.patch
- "${FILESDIR}/${PN}"-1.7.0-hardcoded-libs.patch
+ "${FILESDIR}/${PN}"-1.6.5-llvm_13_compat_part_1.patch
+ "${FILESDIR}/${PN}"-1.6.5-llvm_13_compat_part_2.patch
+ "${DISTDIR}/${PN}"-1.7.1-llvm_13_compat_part_3.patch
+ "${DISTDIR}/${PN}"-1.7.1-llvm_13_compat_part_4.patch
+ "${DISTDIR}/${PN}"-1.7.1-llvm_13_compat_part_5.patch
+ "${FILESDIR}/${PN}"-1.6.5-libgit-1.2.patch
+ "${FILESDIR}/${PN}"-1.6.5-make-install-no-build.patch
+ "${FILESDIR}/${PN}"-1.7.1-hardcoded-libs.patch
"${FILESDIR}/${PN}"-1.7.1-do_not_set_rpath.patch
)
^ permalink raw reply related [flat|nested] 24+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-lang/julia/, dev-lang/julia/files/
@ 2022-01-05 11:00 Matthias Maier
0 siblings, 0 replies; 24+ messages in thread
From: Matthias Maier @ 2022-01-05 11:00 UTC (permalink / raw
To: gentoo-commits
commit: 60f9d0619455f6065cfe38fdd204193e754e8de0
Author: Janusz Andrzejewski <janusz.andrzejewski <AT> gmail <DOT> com>
AuthorDate: Tue Jan 4 22:51:07 2022 +0000
Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org>
CommitDate: Wed Jan 5 11:00:40 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=60f9d061
dev-lang/julia: more LLVM 13 patches for 1.7.1
- I also minimized julia-1.7.1-do_not_set_rpath.patch
Bug: https://bugs.gentoo.org/819381
Closes: https://github.com/gentoo/gentoo/pull/23652
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Janusz Andrzejewski <janusz.andrzejewski <AT> gmail.com>
Signed-off-by: Matthias Maier <tamiko <AT> gentoo.org>
dev-lang/julia/Manifest | 3 +
.../julia/files/julia-1.7.1-do_not_set_rpath.patch | 11 ++
dev-lang/julia/julia-1.7.1-r2.ebuild | 183 +++++++++++++++++++++
3 files changed, 197 insertions(+)
diff --git a/dev-lang/julia/Manifest b/dev-lang/julia/Manifest
index d24ea63f2732..97dcc962e7b7 100644
--- a/dev-lang/julia/Manifest
+++ b/dev-lang/julia/Manifest
@@ -1,6 +1,9 @@
DIST julia-1.6.3.tar.gz 7734900 BLAKE2B 679851ee159ac83f49e54f1d71068d4abde919a0da39475dccaecc97e705b87db70c38a55fbc7a0cfacc774291013b189fb516817d6c6e67ca5ccfbb515c3f90 SHA512 a622fddc9e9f3f47037053a1e722153a567c065723f99a97912f8c5a6c2a22c3be0be674325361dd1b04601bbe6c6f204c66004ce887f3f7822e8204fd6855de
DIST julia-1.6.5-full.tar.gz 153795029 BLAKE2B b86d3ad8dbc4ce486cc0d5e3c25f40c0bedf38cab5b29f1aac4dd527650e78c2e0e462f4eb13fde787adf48a2de9f8eee9cfb8f4aaafbae6ee5e76d7d9608995 SHA512 f057a913f4579280d757c0a97a7cd800fb335be8ec83a27a577d2bee0c9736d49715c7861f7bc1e6461966634bd82890f1f69fd0167f21903ad614e8f70e0dcc
DIST julia-1.7.0-full.tar.gz 255670801 BLAKE2B e7c5be50ab9e7014f028cf7d0530b269e78dd798dc3d4a88af2ed9fa1331694e39fbcae26d2cae6f15aaf1087656384c9872f344f99121406abdf2902a200176 SHA512 00e1bfe354010f5d900476e46b471c4425b711fff5a2aa0ac9e5dbe6ff02245011d4297e4703f2d46f7d4e7b6d97ffaf1bc63170edbfec440196c5ec75c984ce
+DIST julia-1.7.0-llvm_13_compat_part_4.patch 28006 BLAKE2B b1909fd6df1ac51e7e2d16279ff5ed2febe27967832ddbb9517372dcb41597f7ba9fa6013d65fdbdaf345b5c32fdf90f60c086afcdf6b793172061fe63263b0f SHA512 d251d5fbc088aa03e2c423926fa9f82a8a29a995e20150f27bf01ea9209008259f97daf27c333686b62412190fa4077cca178ce39bb6c7bd4e3e8b4f2affa22f
+DIST julia-1.7.0-llvm_13_compat_part_5.patch 11421 BLAKE2B ca4f3e2c6b60462f7f04f609be07f95b81fe076350167de3354cf5c0fb98d3f1b5a5b2d275da8074a077be3edbb8544a3403a080dc1ca0dbe827dde96c61f5f2 SHA512 5cd709b24a6e00f67998efcc21d77b710399f1bf96e7656b3c90a2cc564bcf05e2e1012b788751d48ff7964fb6be2af710d850c34e83532976addecae4db1969
+DIST julia-1.7.0-llvm_13_compat_part_6.patch 27094 BLAKE2B b70a96c4f897349dce04246335bc38a6726e02a43cd5a28bc31bfcb9190f5361e2e4d16a9fb5c1b3c0e53d2e59f5380b161350968f9479cdb765b4681b9f5743 SHA512 efd1029d0030417082b7d640b2e4b7bb35818d555c808bceb9a31e5d93b2f27a8ca11b9228cf4129b5bee411e1fe9e4ce4e7515226ceab905532d1875e260f7c
DIST julia-1.7.1-full.tar.gz 255682275 BLAKE2B 923cd1ed735f1ff5537ff8655ba5b63cc8d27a9b36ba05f3942447bea67034ad771ca8f69192ca7718ab3aace5d12c0e08961eafead9aedb9af35e2d212e8e97 SHA512 df6c9d33ed69c1b53a7f77f95954d4ed5fadb176ebf9f490e7721bc036109edfaa5873ce9041620af1d5c3731db7acc5af932b4173ce54bcc7ae3d7c9c393638
DIST julia-libuv-fb3e3364c33ae48c827f6b103e05c3f0e78b79a9.tar.gz 1643008 BLAKE2B b2a121e0b94cd1f5d40e292fc2356e8940bf8dfe1e6a200b50caf60def1982b705d1d42dd234e9e8b0aa70439bf34a5bce71761424623cbfcd20c9131ce09c25 SHA512 29947c236aef8931be4767df1cd8404ee9b036ee107b31cbce6fad9a97743df57d068b15bc4bd00320b9b81cd879258a9ec9dc675853e424ccdb8d6bdd226240
DIST julia-libwhich-81e9723c0273d78493dc8c8ed570f68d9ce7e89e.tar.gz 4183 BLAKE2B c932e23b1b476d3fd16cf6f451efd5fc6d9c1ec2c53e8ac086340a100817d9b30dae3eff50b284a42c09b2bbae30b9e2fd38b2881f8cbf4974a89f3bd0c87599 SHA512 6fb77b715d70d9bc95a8546c3bf97bd3677c7ea344b88bb5bc3bbfac9dceabe8a8cde7a0f64dec884cde802e4a3000e30837d3f824b5a9242348c4fe061526a3
diff --git a/dev-lang/julia/files/julia-1.7.1-do_not_set_rpath.patch b/dev-lang/julia/files/julia-1.7.1-do_not_set_rpath.patch
new file mode 100644
index 000000000000..7b8c3c7ba51b
--- /dev/null
+++ b/dev-lang/julia/files/julia-1.7.1-do_not_set_rpath.patch
@@ -0,0 +1,11 @@
+--- a/Makefile 2021-12-21 09:38:26.782829864 +0100
++++ b/Makefile 2021-12-21 10:52:40.760565902 +0100
+@@ -365,7 +365,7 @@
+ endif
+
+ # Set rpath for LLVM.so which is `$ORIGIN/../lib` moving from `../lib` to `../lib/julia`. We only need to do this for Linux/FreeBSD
+-ifneq (,$(findstring $(OS),Linux FreeBSD))
++ifneq (,$(findstring $(OS),FreeBSD))
+ $(PATCHELF) --set-rpath '$$ORIGIN:$$ORIGIN/$(reverse_private_libdir_rel)' $(DESTDIR)$(private_libdir)/libLLVM.$(SHLIB_EXT)
+ endif
+
diff --git a/dev-lang/julia/julia-1.7.1-r2.ebuild b/dev-lang/julia/julia-1.7.1-r2.ebuild
new file mode 100644
index 000000000000..50c67b8c1e00
--- /dev/null
+++ b/dev-lang/julia/julia-1.7.1-r2.ebuild
@@ -0,0 +1,183 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit llvm pax-utils toolchain-funcs
+
+# correct versions for stdlibs are in deps/checksums
+# for everything else, run with network-sandbox and wait for the crash
+
+MY_LLVM_V="13.0.0"
+
+DESCRIPTION="High-performance programming language for technical computing"
+HOMEPAGE="https://julialang.org/"
+
+SRC_URI="
+ https://github.com/JuliaLang/julia/releases/download/v${PV}/${P}-full.tar.gz
+ https://github.com/JuliaLang/julia/commit/1eb063f1.patch -> ${PN}-1.7.0-llvm_13_compat_part_4.patch
+ https://raw.githubusercontent.com/archlinux/svntogit-community/packages/julia/trunk/f8c918b0.patch -> ${PN}-1.7.0-llvm_13_compat_part_5.patch
+ https://raw.githubusercontent.com/archlinux/svntogit-community/packages/julia/trunk/63303980.patch -> ${PN}-1.7.0-llvm_13_compat_part_6.patch
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+system-llvm"
+
+RDEPEND="
+ system-llvm? ( sys-devel/llvm:13=[llvm_targets_NVPTX(-)] )
+"
+LLVM_MAX_SLOT=13
+
+RDEPEND+="
+ app-arch/p7zip
+ dev-libs/gmp:0=
+ dev-libs/libgit2:0
+ >=dev-libs/libpcre2-10.23:0=[jit,unicode]
+ dev-libs/mpfr:0=
+ >=dev-libs/libutf8proc-2.6.1:0=[-cjk]
+ >=dev-util/patchelf-0.13
+ >=net-libs/mbedtls-2.2
+ net-misc/curl[http2,ssh]
+ 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/dsfmt-2.2.4
+ >=sys-libs/libunwind-1.1:0=
+ sys-libs/zlib:0=
+ >=virtual/blas-3.6
+ virtual/lapack"
+
+DEPEND="${RDEPEND}
+ dev-util/patchelf
+ virtual/pkgconfig
+ !system-llvm? ( dev-util/cmake )"
+
+PATCHES=(
+ "${FILESDIR}/${PN}"-1.4.0-no_symlink_llvm.patch
+ "${FILESDIR}/${PN}"-1.7.0-llvm_13_compat_part_1.patch
+ "${FILESDIR}/${PN}"-1.7.0-llvm_13_compat_part_2.patch
+ "${DISTDIR}/${PN}"-1.7.0-llvm_13_compat_part_4.patch
+ "${DISTDIR}/${PN}"-1.7.0-llvm_13_compat_part_5.patch
+ "${DISTDIR}/${PN}"-1.7.0-llvm_13_compat_part_6.patch
+ "${FILESDIR}/${PN}"-1.7.0-libgit-1.2.patch
+ "${FILESDIR}/${PN}"-1.7.0-make-install-no-build.patch
+ "${FILESDIR}/${PN}"-1.7.0-hardcoded-libs.patch
+ "${FILESDIR}/${PN}"-1.7.1-do_not_set_rpath.patch
+)
+
+pkg_setup() {
+ use system-llvm && llvm_pkg_setup
+}
+
+src_unpack() {
+ local tounpack=(${A})
+ # the main source tree, followed by deps
+ unpack "${tounpack[0]}"
+
+ 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
+
+ sed -i \
+ -e "\|SHIPFLAGS :=|c\\SHIPFLAGS := ${CFLAGS}" \
+ Make.inc || 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() {
+ use system-llvm && ewarn "You have enabled system-llvm. This is unsupported by upstream and may not work."
+
+ # julia does not play well with the system versions of libuv
+ # USE_SYSTEM_LIBM=0 implies using external openlibm
+ cat <<-EOF > Make.user
+ LOCALBASE:="${EPREFIX}/usr"
+ override prefix:="${EPREFIX}/usr"
+ override libdir:="\$(prefix)/$(get_libdir)"
+ override CC:=$(tc-getCC)
+ override CXX:=$(tc-getCXX)
+ override AR:=$(tc-getAR)
+
+ BUNDLE_DEBUG_LIBS:=0
+ USE_BINARYBUILDER:=0
+ USE_SYSTEM_CSL:=1
+ USE_SYSTEM_LLVM:=$(usex system-llvm 1 0)
+ USE_SYSTEM_LIBUNWIND:=1
+ USE_SYSTEM_PCRE:=1
+ USE_SYSTEM_LIBM:=0
+ USE_SYSTEM_OPENLIBM:=1
+ USE_SYSTEM_DSFMT:=1
+ USE_SYSTEM_BLAS:=1
+ USE_SYSTEM_LAPACK:=1
+ USE_SYSTEM_LIBBLASTRAMPOLINE:=0
+ USE_SYSTEM_GMP:=1
+ USE_SYSTEM_MPFR:=1
+ USE_SYSTEM_LIBSUITESPARSE:=1
+ USE_SYSTEM_LIBUV:=0
+ USE_SYSTEM_UTF8PROC:=1
+ USE_SYSTEM_MBEDTLS:=1
+ USE_SYSTEM_LIBSSH2:=1
+ USE_SYSTEM_NGHTTP2:=1
+ USE_SYSTEM_CURL:=1
+ USE_SYSTEM_LIBGIT2:=1
+ USE_SYSTEM_PATCHELF:=1
+ USE_SYSTEM_ZLIB:=1
+ USE_SYSTEM_P7ZIP:=1
+ VERBOSE:=1
+ EOF
+}
+
+src_compile() {
+ # Julia accesses /proc/self/mem on Linux
+ addpredict /proc/self/mem
+
+ default
+ pax-mark m "$(file usr/bin/julia-* | awk -F : '/ELF/ {print $1}')"
+}
+
+src_install() {
+ emake install DESTDIR="${D}"
+
+ if ! use system-llvm ; then
+ local llvmslot=$(ver_cut 1 ${MY_LLVM_V})
+ cp "${S}/usr/lib/libLLVM-${llvmslot}jl.so" "${ED}/usr/$(get_libdir)/julia/" || die
+ fi
+
+ 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
+
+ # The appdata directory is deprecated.
+ mv "${ED}"/usr/share/{appdata,metainfo}/ || die
+}
+
+pkg_postinst() {
+ elog "To use Plots, you will need to install sci-visualization/gr."
+}
^ permalink raw reply related [flat|nested] 24+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-lang/julia/, dev-lang/julia/files/
@ 2022-01-05 11:00 Matthias Maier
0 siblings, 0 replies; 24+ messages in thread
From: Matthias Maier @ 2022-01-05 11:00 UTC (permalink / raw
To: gentoo-commits
commit: 8e43531d99afe3de55af083f17f930b275ecbefe
Author: Matthias Maier <tamiko <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 5 10:47:01 2022 +0000
Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org>
CommitDate: Wed Jan 5 11:00:40 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8e43531d
dev-lang/julia: remove old versions and patches
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Matthias Maier <tamiko <AT> gentoo.org>
dev-lang/julia/Manifest | 1 -
.../julia/files/julia-1.1.0-fix_build_system.patch | 53 ----
.../julia/files/julia-1.6.0-fix-system-csl.patch | 271 ---------------------
.../julia/files/julia-1.7.0-do_not_set_rpath.patch | 29 ---
dev-lang/julia/julia-1.7.0.ebuild | 179 --------------
dev-lang/julia/julia-1.7.1-r1.ebuild | 178 --------------
dev-lang/julia/julia-1.7.1-r2.ebuild | 1 -
7 files changed, 712 deletions(-)
diff --git a/dev-lang/julia/Manifest b/dev-lang/julia/Manifest
index 97dcc962e7b7..12e16a297558 100644
--- a/dev-lang/julia/Manifest
+++ b/dev-lang/julia/Manifest
@@ -1,6 +1,5 @@
DIST julia-1.6.3.tar.gz 7734900 BLAKE2B 679851ee159ac83f49e54f1d71068d4abde919a0da39475dccaecc97e705b87db70c38a55fbc7a0cfacc774291013b189fb516817d6c6e67ca5ccfbb515c3f90 SHA512 a622fddc9e9f3f47037053a1e722153a567c065723f99a97912f8c5a6c2a22c3be0be674325361dd1b04601bbe6c6f204c66004ce887f3f7822e8204fd6855de
DIST julia-1.6.5-full.tar.gz 153795029 BLAKE2B b86d3ad8dbc4ce486cc0d5e3c25f40c0bedf38cab5b29f1aac4dd527650e78c2e0e462f4eb13fde787adf48a2de9f8eee9cfb8f4aaafbae6ee5e76d7d9608995 SHA512 f057a913f4579280d757c0a97a7cd800fb335be8ec83a27a577d2bee0c9736d49715c7861f7bc1e6461966634bd82890f1f69fd0167f21903ad614e8f70e0dcc
-DIST julia-1.7.0-full.tar.gz 255670801 BLAKE2B e7c5be50ab9e7014f028cf7d0530b269e78dd798dc3d4a88af2ed9fa1331694e39fbcae26d2cae6f15aaf1087656384c9872f344f99121406abdf2902a200176 SHA512 00e1bfe354010f5d900476e46b471c4425b711fff5a2aa0ac9e5dbe6ff02245011d4297e4703f2d46f7d4e7b6d97ffaf1bc63170edbfec440196c5ec75c984ce
DIST julia-1.7.0-llvm_13_compat_part_4.patch 28006 BLAKE2B b1909fd6df1ac51e7e2d16279ff5ed2febe27967832ddbb9517372dcb41597f7ba9fa6013d65fdbdaf345b5c32fdf90f60c086afcdf6b793172061fe63263b0f SHA512 d251d5fbc088aa03e2c423926fa9f82a8a29a995e20150f27bf01ea9209008259f97daf27c333686b62412190fa4077cca178ce39bb6c7bd4e3e8b4f2affa22f
DIST julia-1.7.0-llvm_13_compat_part_5.patch 11421 BLAKE2B ca4f3e2c6b60462f7f04f609be07f95b81fe076350167de3354cf5c0fb98d3f1b5a5b2d275da8074a077be3edbb8544a3403a080dc1ca0dbe827dde96c61f5f2 SHA512 5cd709b24a6e00f67998efcc21d77b710399f1bf96e7656b3c90a2cc564bcf05e2e1012b788751d48ff7964fb6be2af710d850c34e83532976addecae4db1969
DIST julia-1.7.0-llvm_13_compat_part_6.patch 27094 BLAKE2B b70a96c4f897349dce04246335bc38a6726e02a43cd5a28bc31bfcb9190f5361e2e4d16a9fb5c1b3c0e53d2e59f5380b161350968f9479cdb765b4681b9f5743 SHA512 efd1029d0030417082b7d640b2e4b7bb35818d555c808bceb9a31e5d93b2f27a8ca11b9228cf4129b5bee411e1fe9e4ce4e7515226ceab905532d1875e260f7c
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
deleted file mode 100644
index 394f5900a90e..000000000000
--- a/dev-lang/julia/files/julia-1.1.0-fix_build_system.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-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/files/julia-1.6.0-fix-system-csl.patch b/dev-lang/julia/files/julia-1.6.0-fix-system-csl.patch
deleted file mode 100644
index 90a097197bff..000000000000
--- a/dev-lang/julia/files/julia-1.6.0-fix-system-csl.patch
+++ /dev/null
@@ -1,271 +0,0 @@
-From 71d7a8a8c12b72bfa362ae955d2ce4dfbdf5b8ba Mon Sep 17 00:00:00 2001
-From: Elliot Saba <staticfloat@gmail.com>
-Date: Fri, 26 Mar 2021 18:40:07 +0000
-Subject: [PATCH 1/2] [build] Add `symlink_system_library` calls for CSL
-
-We differentiate between a `USE_BINARYBUILDER_CSL=0` configuration
-(where we copy the CSL libraries into the Julia build tree) versus a
-`USE_SYSTEM_CSL=1` configuration (where we symlink them in a manner
-similar to other system libararies)
----
- Make.inc | 23 +++++++++++++-
- base/Makefile | 88 ++++++++++++++++++++++++++++++---------------------
- deps/csl.mk | 40 ++++++++---------------
- 3 files changed, 87 insertions(+), 64 deletions(-)
-
-diff --git a/Make.inc b/Make.inc
-index 519720a861ed7..7cba05806e684 100644
---- a/Make.inc
-+++ b/Make.inc
-@@ -596,6 +596,21 @@ else
- SHLIB_EXT := so
- endif
-
-+ifeq ($(OS),WINNT)
-+define versioned_libname
-+$$(if $(2),$(1)-$(2).$(SHLIB_EXT),$(1).$(SHLIB_EXT))
-+endef
-+else ifeq ($(OS),Darwin)
-+define versioned_libname
-+$$(if $(2),$(1).$(2).$(SHLIB_EXT),$(1).$(SHLIB_EXT))
-+endef
-+else
-+define versioned_libname
-+$$(if $(2),$(1).$(SHLIB_EXT).$(2),$(1).$(SHLIB_EXT))
-+endef
-+endif
-+
-+
- ifeq ($(SHLIB_EXT), so)
- define SONAME_FLAGS
- -Wl,-soname=$1
-@@ -1147,6 +1162,8 @@ BB_TRIPLET_LIBGFORTRAN := $(subst $(SPACE),-,$(filter-out cxx%,$(subst -,$(SPACE
- BB_TRIPLET_CXXABI := $(subst $(SPACE),-,$(filter-out libgfortran%,$(subst -,$(SPACE),$(BB_TRIPLET_LIBGFORTRAN_CXXABI))))
- BB_TRIPLET := $(subst $(SPACE),-,$(filter-out cxx%,$(filter-out libgfortran%,$(subst -,$(SPACE),$(BB_TRIPLET_LIBGFORTRAN_CXXABI)))))
-
-+LIBGFORTRAN_VERSION := $(subst libgfortran,,$(filter libgfortran%,$(subst -,$(SPACE),$(BB_TRIPLET_LIBGFORTRAN))))
-+
- # This is the set of projects that BinaryBuilder dependencies are hooked up for.
- BB_PROJECTS := BLASTRAMPOLINE OPENBLAS LLVM SUITESPARSE OPENLIBM GMP MBEDTLS LIBSSH2 NGHTTP2 MPFR CURL LIBGIT2 PCRE LIBUV LIBUNWIND DSFMT OBJCONV ZLIB P7ZIP CSL
- define SET_BB_DEFAULT
-@@ -1479,8 +1496,12 @@ ifneq ($(findstring $(OS),Linux FreeBSD),)
- LIBGCC_NAME := libgcc_s.$(SHLIB_EXT).1
- endif
-
--
-+# USE_SYSTEM_CSL causes it to get symlinked into build_private_shlibdir
-+ifeq ($(USE_SYSTEM_CSL),1)
-+LIBGCC_BUILD_DEPLIB := $(call dep_lib_path,$(build_libdir),$(build_private_shlibdir)/$(LIBGCC_NAME))
-+else
- LIBGCC_BUILD_DEPLIB := $(call dep_lib_path,$(build_libdir),$(build_shlibdir)/$(LIBGCC_NAME))
-+endif
- LIBGCC_INSTALL_DEPLIB := $(call dep_lib_path,$(libdir),$(private_shlibdir)/$(LIBGCC_NAME))
-
- # USE_SYSTEM_LIBM and USE_SYSTEM_OPENLIBM causes it to get symlinked into build_private_shlibdir
-diff --git a/base/Makefile b/base/Makefile
-index e024e546f94d3..2bef6aab7f1f4 100644
---- a/base/Makefile
-+++ b/base/Makefile
-@@ -169,53 +169,69 @@ endif
- # echo "$$P"
-
- define symlink_system_library
--symlink_$1: $$(build_private_libdir)/$1.$$(SHLIB_EXT)
--$$(build_private_libdir)/$1.$$(SHLIB_EXT):
-- REALPATH=`$$(call spawn,$$(build_depsbindir)/libwhich) -p $$(notdir $$@)` && \
-- $$(call resolve_path,REALPATH) && \
-- [ -e "$$$$REALPATH" ] && \
-- ([ ! -e "$$@" ] || rm "$$@") && \
-- echo ln -sf "$$$$REALPATH" "$$@" && \
-- ln -sf "$$$$REALPATH" "$$@"
--ifneq ($2,)
--ifneq ($$(USE_SYSTEM_$2),0)
--SYMLINK_SYSTEM_LIBRARIES += symlink_$1
--endif
-+libname_$2 := $$(notdir $(call versioned_libname,$2,$3))
-+libpath_$2 := $$(shell $$(call spawn,$$(build_depsbindir)/libwhich) -p $$(libname_$2) 2>/dev/null)
-+symlink_$2: $$(build_private_libdir)/$$(libname_$2)
-+$$(build_private_libdir)/$$(libname_$2):
-+ @if [ -e "$$(libpath_$2)" ]; then \
-+ REALPATH=$$(libpath_$2); \
-+ $$(call resolve_path,REALPATH) && \
-+ [ -e "$$$$REALPATH" ] && \
-+ ([ ! -e "$$@" ] || rm "$$@") && \
-+ echo ln -sf "$$$$REALPATH" "$$@" && \
-+ ln -sf "$$$$REALPATH" "$$@"; \
-+ else \
-+ if [ "$4" != "ALLOW_FAILURE" ]; then \
-+ echo "System library symlink failure: Unable to locate $$(libname_$2) on your system!" >&2; \
-+ false; \
-+ fi; \
-+ fi
-+ifneq ($$(USE_SYSTEM_$1),0)
-+SYMLINK_SYSTEM_LIBRARIES += symlink_$2
- endif
- endef
-
- # the following excludes: libuv.a, libutf8proc.a
-
--$(eval $(call symlink_system_library,$(LIBMNAME)))
- ifneq ($(USE_SYSTEM_LIBM),0)
--SYMLINK_SYSTEM_LIBRARIES += symlink_$(LIBMNAME)
-+$(eval $(call symlink_system_library,LIBM,$(LIBMNAME)))
- else ifneq ($(USE_SYSTEM_OPENLIBM),0)
--SYMLINK_SYSTEM_LIBRARIES += symlink_$(LIBMNAME)
-+$(eval $(call symlink_system_library,OPENLIBM,$(LIBMNAME)))
- endif
-
--$(eval $(call symlink_system_library,libpcre2-8,PCRE))
--$(eval $(call symlink_system_library,libdSFMT,DSFMT))
--$(eval $(call symlink_system_library,$(LIBBLASNAME),BLAS))
-+$(eval $(call symlink_system_library,CSL,libgcc_s,1))
-+ifneq (,$(LIBGFORTRAN_VERSION))
-+$(eval $(call symlink_system_library,CSL,libgfortran,$(LIBGFORTRAN_VERSION)))
-+endif
-+$(eval $(call symlink_system_library,CSL,libquadmath,0))
-+$(eval $(call symlink_system_library,CSL,libstdc++,6))
-+# We allow libssp, libatomic and libgomp to fail as they are not available on all systems
-+$(eval $(call symlink_system_library,CSL,libssp,0,ALLOW_FAILURE))
-+$(eval $(call symlink_system_library,CSL,libatomic,1,ALLOW_FAILURE))
-+$(eval $(call symlink_system_library,CSL,libgomp,1,ALLOW_FAILURE))
-+$(eval $(call symlink_system_library,PCRE,libpcre2-8))
-+$(eval $(call symlink_system_library,DSFMT,libdSFMT))
-+$(eval $(call symlink_system_library,BLAS,$(LIBBLASNAME)))
- ifneq ($(LIBLAPACKNAME),$(LIBBLASNAME))
--$(eval $(call symlink_system_library,$(LIBLAPACKNAME),LAPACK))
-+$(eval $(call symlink_system_library,LAPACK,$(LIBLAPACKNAME)))
- endif
--$(eval $(call symlink_system_library,libgmp,GMP))
--$(eval $(call symlink_system_library,libmpfr,MPFR))
--$(eval $(call symlink_system_library,libmbedtls,MBEDTLS))
--$(eval $(call symlink_system_library,libmbedcrypto,MBEDTLS))
--$(eval $(call symlink_system_library,libmbedx509,MBEDTLS))
--$(eval $(call symlink_system_library,libssh2,LIBSSH2))
--$(eval $(call symlink_system_library,libnghttp2,NGHTTP2))
--$(eval $(call symlink_system_library,libcurl,CURL))
--$(eval $(call symlink_system_library,libgit2,LIBGIT2))
--$(eval $(call symlink_system_library,libamd,SUITESPARSE))
--$(eval $(call symlink_system_library,libcamd,SUITESPARSE))
--$(eval $(call symlink_system_library,libccolamd,SUITESPARSE))
--$(eval $(call symlink_system_library,libcholmod,SUITESPARSE))
--$(eval $(call symlink_system_library,libcolamd,SUITESPARSE))
--$(eval $(call symlink_system_library,libumfpack,SUITESPARSE))
--$(eval $(call symlink_system_library,libspqr,SUITESPARSE))
--$(eval $(call symlink_system_library,libsuitesparseconfig,SUITESPARSE))
-+$(eval $(call symlink_system_library,GMP,libgmp))
-+$(eval $(call symlink_system_library,MPFR,libmpfr))
-+$(eval $(call symlink_system_library,MBEDTLS,libmbedtls))
-+$(eval $(call symlink_system_library,MBEDTLS,libmbedcrypto))
-+$(eval $(call symlink_system_library,MBEDTLS,libmbedx509))
-+$(eval $(call symlink_system_library,LIBSSH2,libssh2))
-+$(eval $(call symlink_system_library,NGHTTP2,libnghttp2))
-+$(eval $(call symlink_system_library,CURL,libcurl))
-+$(eval $(call symlink_system_library,LIBGIT2,libgit2))
-+$(eval $(call symlink_system_library,SUITESPARSE,libamd))
-+$(eval $(call symlink_system_library,SUITESPARSE,libcamd))
-+$(eval $(call symlink_system_library,SUITESPARSE,libccolamd))
-+$(eval $(call symlink_system_library,SUITESPARSE,libcholmod))
-+$(eval $(call symlink_system_library,SUITESPARSE,libcolamd))
-+$(eval $(call symlink_system_library,SUITESPARSE,libumfpack))
-+$(eval $(call symlink_system_library,SUITESPARSE,libspqr))
-+$(eval $(call symlink_system_library,SUITESPARSE,libsuitesparseconfig))
- # EXCLUDED LIBRARIES (installed/used, but not vendored for use with dlopen):
- # libunwind
- endif # WINNT
-diff --git a/deps/csl.mk b/deps/csl.mk
-index 095d4ceec4a1e..423201cbb5a0c 100644
---- a/deps/csl.mk
-+++ b/deps/csl.mk
-@@ -19,48 +19,34 @@ $$(build_shlibdir)/$(1): | $$(build_shlibdir)
- [ -n "$$$${SRC_LIB}" ] && cp $$$${SRC_LIB} $$(build_shlibdir)
- endef
-
--ifeq ($(OS),WINNT)
--define gen_libname
--$$(if $(2),lib$(1)-$(2).$(SHLIB_EXT),lib$(1).$(SHLIB_EXT))
--endef
--else ifeq ($(OS),Darwin)
--define gen_libname
--$$(if $(2),lib$(1).$(2).$(SHLIB_EXT),lib$(1).$(SHLIB_EXT))
--endef
--else
--define gen_libname
--$$(if $(2),lib$(1).$(SHLIB_EXT).$(2),lib$(1).$(SHLIB_EXT))
--endef
--endif
--
- # libgfortran has multiple names; we're just going to copy any version we can find
- # Since we're only looking in the location given by `$(FC)` this should only succeed for one.
--$(eval $(call copy_csl,$(call gen_libname,gfortran,3)))
--$(eval $(call copy_csl,$(call gen_libname,gfortran,4)))
--$(eval $(call copy_csl,$(call gen_libname,gfortran,5)))
-+$(eval $(call copy_csl,$(call versioned_libname,libgfortran,3)))
-+$(eval $(call copy_csl,$(call versioned_libname,libgfortran,4)))
-+$(eval $(call copy_csl,$(call versioned_libname,libgfortran,5)))
-
- # These are all libraries that we should always have
--$(eval $(call copy_csl,$(call gen_libname,quadmath,0)))
--$(eval $(call copy_csl,$(call gen_libname,stdc++,6)))
--$(eval $(call copy_csl,$(call gen_libname,ssp,0)))
--$(eval $(call copy_csl,$(call gen_libname,atomic,1)))
--$(eval $(call copy_csl,$(call gen_libname,gomp,1)))
-+$(eval $(call copy_csl,$(call versioned_libname,libquadmath,0)))
-+$(eval $(call copy_csl,$(call versioned_libname,libstdc++,6)))
-+$(eval $(call copy_csl,$(call versioned_libname,libssp,0)))
-+$(eval $(call copy_csl,$(call versioned_libname,libatomic,1)))
-+$(eval $(call copy_csl,$(call versioned_libname,libgomp,1)))
-
- ifeq ($(OS),WINNT)
- # Windwos has special gcc_s names
- ifeq ($(ARCH),i686)
--$(eval $(call copy_csl,$(call gen_libname,gcc_s_sjlj,1)))
-+$(eval $(call copy_csl,$(call versioned_libname,libgcc_s_sjlj,1)))
- else
--$(eval $(call copy_csl,$(call gen_libname,gcc_s_seh,1)))
-+$(eval $(call copy_csl,$(call versioned_libname,libgcc_s_seh,1)))
- endif
- else
--$(eval $(call copy_csl,$(call gen_libname,gcc_s,1)))
-+$(eval $(call copy_csl,$(call versioned_libname,libgcc_s,1)))
- endif
- # winpthread is only Windows, pthread is only others
- ifeq ($(OS),WINNT)
--$(eval $(call copy_csl,$(call gen_libname,winpthread,1)))
-+$(eval $(call copy_csl,$(call versioned_libname,libwinpthread,1)))
- else
--$(eval $(call copy_csl,$(call gen_libname,pthread,0)))
-+$(eval $(call copy_csl,$(call versioned_libname,libpthread,0)))
- endif
-
- get-csl:
-
-From 6536b8519b25db844f2a1866d056879cb87d1c66 Mon Sep 17 00:00:00 2001
-From: Elliot Saba <staticfloat@gmail.com>
-Date: Fri, 26 Mar 2021 22:32:04 +0000
-Subject: [PATCH 2/2] Expand `JL_PRIVATE_LIBS-1` for versioned library names as
- well
-
-Without this, we fail to install things like `libgcc_s.so.1` when
-installed into the private libdir by `symlink_system_libraries`.
----
- Makefile | 7 +++++--
- 1 file changed, 5 insertions(+), 2 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 823ff3b86339d..e08f0e959e1b3 100644
---- a/Makefile
-+++ b/Makefile
-@@ -290,8 +290,11 @@ endif
- done \
- done
- for suffix in $(JL_PRIVATE_LIBS-1) ; do \
-- lib=$(build_private_libdir)/$${suffix}.$(SHLIB_EXT); \
-- $(INSTALL_M) $$lib $(DESTDIR)$(private_libdir) ; \
-+ for lib in $(build_private_libdir)/$${suffix}.$(SHLIB_EXT)*; do \
-+ if [ "$${lib##*.}" != "dSYM" ]; then \
-+ $(INSTALL_M) $$lib $(DESTDIR)$(private_libdir) ; \
-+ fi \
-+ done \
- done
- endif
- # Install `7z` into libexec/
diff --git a/dev-lang/julia/files/julia-1.7.0-do_not_set_rpath.patch b/dev-lang/julia/files/julia-1.7.0-do_not_set_rpath.patch
deleted file mode 100644
index 24f12d261053..000000000000
--- a/dev-lang/julia/files/julia-1.7.0-do_not_set_rpath.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- a/Makefile 2021-12-21 09:38:26.782829864 +0100
-+++ b/Makefile 2021-12-21 10:52:40.760565902 +0100
-@@ -336,7 +336,7 @@
- install_name_tool -add_rpath @executable_path/$(build_libdir_rel) @executable_path/$(libdir_rel) $(DESTDIR)$(bindir)/$$j; \
- done
- endif
--else ifneq (,$(findstring $(OS),Linux FreeBSD))
-+else ifneq (,$(findstring $(OS),FreeBSD))
- for j in $(JL_TARGETS) ; do \
- $(PATCHELF) --set-rpath '$$ORIGIN/$(private_libdir_rel):$$ORIGIN/$(libdir_rel)' $(DESTDIR)$(bindir)/$$j; \
- done
-@@ -357,7 +357,7 @@
- endif
-
- # Set rpath for libjulia-internal, which is moving from `../lib` to `../lib/julia`. We only need to do this for Linux/FreeBSD
--ifneq (,$(findstring $(OS),Linux FreeBSD))
-+ifneq (,$(findstring $(OS),FreeBSD))
- $(PATCHELF) --set-rpath '$$ORIGIN:$$ORIGIN/$(reverse_private_libdir_rel)' $(DESTDIR)$(private_libdir)/libjulia-internal.$(SHLIB_EXT)
- ifeq ($(BUNDLE_DEBUG_LIBS),1)
- $(PATCHELF) --set-rpath '$$ORIGIN:$$ORIGIN/$(reverse_private_libdir_rel)' $(DESTDIR)$(private_libdir)/libjulia-internal-debug.$(SHLIB_EXT)
-@@ -365,7 +365,7 @@
- endif
-
- # Set rpath for LLVM.so which is `$ORIGIN/../lib` moving from `../lib` to `../lib/julia`. We only need to do this for Linux/FreeBSD
--ifneq (,$(findstring $(OS),Linux FreeBSD))
-+ifneq (,$(findstring $(OS),FreeBSD))
- $(PATCHELF) --set-rpath '$$ORIGIN:$$ORIGIN/$(reverse_private_libdir_rel)' $(DESTDIR)$(private_libdir)/libLLVM.$(SHLIB_EXT)
- endif
-
diff --git a/dev-lang/julia/julia-1.7.0.ebuild b/dev-lang/julia/julia-1.7.0.ebuild
deleted file mode 100644
index 57c446a0e3ab..000000000000
--- a/dev-lang/julia/julia-1.7.0.ebuild
+++ /dev/null
@@ -1,179 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit llvm pax-utils toolchain-funcs
-
-# correct versions for stdlibs are in deps/checksums
-# for everything else, run with network-sandbox and wait for the crash
-
-MY_LLVM_V="13.0.1"
-
-DESCRIPTION="High-performance programming language for technical computing"
-HOMEPAGE="https://julialang.org/"
-
-SRC_URI="
- https://github.com/JuliaLang/julia/releases/download/v${PV}/${P}-full.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+system-llvm"
-
-RDEPEND="
- system-llvm? ( sys-devel/llvm:13=[llvm_targets_NVPTX(-)] )
-"
-LLVM_MAX_SLOT=13
-
-RDEPEND+="
- app-arch/p7zip
- dev-libs/gmp:0=
- dev-libs/libgit2:0
- >=dev-libs/libpcre2-10.23:0=[jit,unicode]
- dev-libs/mpfr:0=
- dev-libs/libutf8proc:0=[-cjk]
- dev-util/patchelf
- >=net-libs/mbedtls-2.2
- net-misc/curl[http2,ssh]
- 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/dsfmt-2.2.4
- >=sys-libs/libunwind-1.1:0=
- sys-libs/zlib:0=
- >=virtual/blas-3.6
- virtual/lapack"
-
-DEPEND="${RDEPEND}
- dev-util/patchelf
- virtual/pkgconfig
- !system-llvm? ( dev-util/cmake )"
-
-PATCHES=(
- "${FILESDIR}/${PN}"-1.4.0-no_symlink_llvm.patch
- "${FILESDIR}/${PN}"-1.7.0-llvm_13_compat_part_1.patch
- "${FILESDIR}/${PN}"-1.7.0-llvm_13_compat_part_2.patch
- "${FILESDIR}/${PN}"-1.7.0-llvm_13_compat_part_3.patch
- "${FILESDIR}/${PN}"-1.7.0-libgit-1.2.patch
- "${FILESDIR}/${PN}"-1.7.0-make-install-no-build.patch
- "${FILESDIR}/${PN}"-1.7.0-hardcoded-libs.patch
- "${FILESDIR}/${PN}"-1.7.0-do_not_set_rpath.patch
-)
- # just remove patchelf from linux ?? just my own solution to sigsegv error ??
- #"${FILESDIR}/${PN}"-turnoff-patchelf.patch
-
-pkg_setup() {
- use system-llvm && llvm_pkg_setup
-}
-
-src_unpack() {
- local tounpack=(${A})
- # the main source tree, followed by deps
- unpack "${tounpack[0]}"
-
- 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
-
- sed -i \
- -e "\|SHIPFLAGS :=|c\\SHIPFLAGS := ${CFLAGS}" \
- Make.inc || 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() {
- use system-llvm && ewarn "You have enabled system-llvm. This is unsupported by upstream and may not work."
-
- # julia does not play well with the system versions of libuv
- # USE_SYSTEM_LIBM=0 implies using external openlibm
- cat <<-EOF > Make.user
- LOCALBASE:="${EPREFIX}/usr"
- override prefix:="${EPREFIX}/usr"
- override libdir:="\$(prefix)/$(get_libdir)"
- override CC:=$(tc-getCC)
- override CXX:=$(tc-getCXX)
- override AR:=$(tc-getAR)
-
- BUNDLE_DEBUG_LIBS:=0
- USE_BINARYBUILDER:=0
- USE_SYSTEM_CSL:=1
- USE_SYSTEM_LLVM:=$(usex system-llvm 1 0)
- USE_SYSTEM_LIBUNWIND:=1
- USE_SYSTEM_PCRE:=1
- USE_SYSTEM_LIBM:=0
- USE_SYSTEM_OPENLIBM:=1
- USE_SYSTEM_DSFMT:=1
- USE_SYSTEM_BLAS:=1
- USE_SYSTEM_LAPACK:=1
- USE_SYSTEM_GMP:=1
- USE_SYSTEM_MPFR:=1
- USE_SYSTEM_SUITESPARSE:=1
- USE_SYSTEM_LIBUV:=0
- USE_SYSTEM_UTF8PROC:=1
- USE_SYSTEM_MBEDTLS:=1
- USE_SYSTEM_LIBSSH2:=1
- USE_SYSTEM_NGHTTP2:=1
- USE_SYSTEM_CURL:=1
- USE_SYSTEM_LIBGIT2:=1
- USE_SYSTEM_PATCHELF:=1
- USE_SYSTEM_ZLIB:=1
- USE_SYSTEM_P7ZIP:=1
- VERBOSE:=1
- EOF
-}
-
-src_compile() {
- # Julia accesses /proc/self/mem on Linux
- addpredict /proc/self/mem
-
- default
- pax-mark m "$(file usr/bin/julia-* | awk -F : '/ELF/ {print $1}')"
-}
-
-src_install() {
- emake install DESTDIR="${D}"
-
- if ! use system-llvm ; then
- local llvmslot=$(ver_cut 1 ${MY_LLVM_V})
- cp "${S}/usr/lib/libLLVM-${llvmslot}jl.so" "${ED}/usr/$(get_libdir)/julia/" || die
- fi
-
- 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
-
- # The appdata directory is deprecated.
- mv "${ED}"/usr/share/{appdata,metainfo}/ || die
-}
-
-pkg_postinst() {
- elog "To use Plots, you will need to install sci-visualization/gr."
-}
diff --git a/dev-lang/julia/julia-1.7.1-r1.ebuild b/dev-lang/julia/julia-1.7.1-r1.ebuild
deleted file mode 100644
index 0277fb0ae72b..000000000000
--- a/dev-lang/julia/julia-1.7.1-r1.ebuild
+++ /dev/null
@@ -1,178 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit llvm pax-utils toolchain-funcs
-
-# correct versions for stdlibs are in deps/checksums
-# for everything else, run with network-sandbox and wait for the crash
-
-MY_LLVM_V="13.0.0"
-
-DESCRIPTION="High-performance programming language for technical computing"
-HOMEPAGE="https://julialang.org/"
-
-SRC_URI="
- https://github.com/JuliaLang/julia/releases/download/v${PV}/${P}-full.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+system-llvm"
-
-RDEPEND="
- system-llvm? ( sys-devel/llvm:13=[llvm_targets_NVPTX(-)] )
-"
-LLVM_MAX_SLOT=13
-
-RDEPEND+="
- app-arch/p7zip
- dev-libs/gmp:0=
- dev-libs/libgit2:0
- >=dev-libs/libpcre2-10.23:0=[jit,unicode]
- dev-libs/mpfr:0=
- >=dev-libs/libutf8proc-2.6.1:0=[-cjk]
- >=dev-util/patchelf-0.13
- >=net-libs/mbedtls-2.2
- net-misc/curl[http2,ssh]
- 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/dsfmt-2.2.4
- >=sys-libs/libunwind-1.1:0=
- sys-libs/zlib:0=
- >=virtual/blas-3.6
- virtual/lapack"
-
-DEPEND="${RDEPEND}
- dev-util/patchelf
- virtual/pkgconfig
- !system-llvm? ( dev-util/cmake )"
-
-PATCHES=(
- "${FILESDIR}/${PN}"-1.4.0-no_symlink_llvm.patch
- "${FILESDIR}/${PN}"-1.7.0-llvm_13_compat_part_1.patch
- "${FILESDIR}/${PN}"-1.7.0-llvm_13_compat_part_2.patch
- "${FILESDIR}/${PN}"-1.7.0-llvm_13_compat_part_3.patch
- "${FILESDIR}/${PN}"-1.7.0-libgit-1.2.patch
- "${FILESDIR}/${PN}"-1.7.0-make-install-no-build.patch
- "${FILESDIR}/${PN}"-1.7.0-hardcoded-libs.patch
- "${FILESDIR}/${PN}"-1.7.0-do_not_set_rpath.patch
-)
-
-pkg_setup() {
- use system-llvm && llvm_pkg_setup
-}
-
-src_unpack() {
- local tounpack=(${A})
- # the main source tree, followed by deps
- unpack "${tounpack[0]}"
-
- 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
-
- sed -i \
- -e "\|SHIPFLAGS :=|c\\SHIPFLAGS := ${CFLAGS}" \
- Make.inc || 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() {
- use system-llvm && ewarn "You have enabled system-llvm. This is unsupported by upstream and may not work."
-
- # julia does not play well with the system versions of libuv
- # USE_SYSTEM_LIBM=0 implies using external openlibm
- cat <<-EOF > Make.user
- LOCALBASE:="${EPREFIX}/usr"
- override prefix:="${EPREFIX}/usr"
- override libdir:="\$(prefix)/$(get_libdir)"
- override CC:=$(tc-getCC)
- override CXX:=$(tc-getCXX)
- override AR:=$(tc-getAR)
-
- BUNDLE_DEBUG_LIBS:=0
- USE_BINARYBUILDER:=0
- USE_SYSTEM_CSL:=1
- USE_SYSTEM_LLVM:=$(usex system-llvm 1 0)
- USE_SYSTEM_LIBUNWIND:=1
- USE_SYSTEM_PCRE:=1
- USE_SYSTEM_LIBM:=0
- USE_SYSTEM_OPENLIBM:=1
- USE_SYSTEM_DSFMT:=1
- USE_SYSTEM_BLAS:=1
- USE_SYSTEM_LAPACK:=1
- USE_SYSTEM_LIBBLASTRAMPOLINE:=0
- USE_SYSTEM_GMP:=1
- USE_SYSTEM_MPFR:=1
- USE_SYSTEM_LIBSUITESPARSE:=1
- USE_SYSTEM_LIBUV:=0
- USE_SYSTEM_UTF8PROC:=1
- USE_SYSTEM_MBEDTLS:=1
- USE_SYSTEM_LIBSSH2:=1
- USE_SYSTEM_NGHTTP2:=1
- USE_SYSTEM_CURL:=1
- USE_SYSTEM_LIBGIT2:=1
- USE_SYSTEM_PATCHELF:=1
- USE_SYSTEM_ZLIB:=1
- USE_SYSTEM_P7ZIP:=1
- VERBOSE:=1
- EOF
-}
-
-src_compile() {
- # Julia accesses /proc/self/mem on Linux
- addpredict /proc/self/mem
-
- default
- pax-mark m "$(file usr/bin/julia-* | awk -F : '/ELF/ {print $1}')"
-}
-
-src_install() {
- emake install DESTDIR="${D}"
-
- if ! use system-llvm ; then
- local llvmslot=$(ver_cut 1 ${MY_LLVM_V})
- cp "${S}/usr/lib/libLLVM-${llvmslot}jl.so" "${ED}/usr/$(get_libdir)/julia/" || die
- fi
-
- 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
-
- # The appdata directory is deprecated.
- mv "${ED}"/usr/share/{appdata,metainfo}/ || die
-}
-
-pkg_postinst() {
- elog "To use Plots, you will need to install sci-visualization/gr."
-}
diff --git a/dev-lang/julia/julia-1.7.1-r2.ebuild b/dev-lang/julia/julia-1.7.1-r2.ebuild
index 50c67b8c1e00..a66329f48d64 100644
--- a/dev-lang/julia/julia-1.7.1-r2.ebuild
+++ b/dev-lang/julia/julia-1.7.1-r2.ebuild
@@ -57,7 +57,6 @@ RDEPEND+="
virtual/lapack"
DEPEND="${RDEPEND}
- dev-util/patchelf
virtual/pkgconfig
!system-llvm? ( dev-util/cmake )"
^ permalink raw reply related [flat|nested] 24+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-lang/julia/, dev-lang/julia/files/
@ 2022-01-03 21:37 Matthias Maier
0 siblings, 0 replies; 24+ messages in thread
From: Matthias Maier @ 2022-01-03 21:37 UTC (permalink / raw
To: gentoo-commits
commit: 87441e688cb184fac2487554d07ddd970f7df3df
Author: Janusz Andrzejewski <janusz.andrzejewski <AT> gmail <DOT> com>
AuthorDate: Mon Dec 27 18:42:35 2021 +0000
Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org>
CommitDate: Mon Jan 3 21:37:28 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=87441e68
dev-lang/julia: julia-1.6.5 ebuild
- version bump to 1.6.5
- patches for llvm 13 compatiblity
- misc patches and compilation fixes
Closes: https://github.com/gentoo/gentoo/pull/23542
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Janusz Andrzejewski <janusz.andrzejewski <AT> gmail.com>
Signed-off-by: Matthias Maier <tamiko <AT> gentoo.org>
dev-lang/julia/Manifest | 1 +
.../julia/files/julia-1.6.5-do_not_set_rpath.patch | 20 +++
.../julia/files/julia-1.6.5-hardcoded-libs.patch | 76 +++++++++
.../files/julia-1.6.5-lazy_artifacts_fix.patch | 30 ++++
.../files/julia-1.6.5-llvm_13_compat_part_4.patch | 35 ++++
.../files/julia-1.6.5-llvm_bad_perf_fix.patch | 33 ++++
dev-lang/julia/julia-1.6.5.ebuild | 183 +++++++++++++++++++++
7 files changed, 378 insertions(+)
diff --git a/dev-lang/julia/Manifest b/dev-lang/julia/Manifest
index 35b63a65c103..00544099f430 100644
--- a/dev-lang/julia/Manifest
+++ b/dev-lang/julia/Manifest
@@ -1,6 +1,7 @@
DIST julia-1.5.3.tar.gz 6949901 BLAKE2B 08f8496980a9bbb9effc0c72cb6b7a5ce1dbd1774735caa366ddc1bb5404117111c624a639f6eb48360061f9fc597a7b37dff24f8555f03ebc4a22524cbeb3b8 SHA512 9e644a64fd6e2caf0390a2bc470084406c078244e65b70a2e3b031d5806c1dff780273ccccfe4bccfd8c03778b7d3a44de7a84bd13f3512afe6864efa5a730fc
DIST julia-1.6.0.tar.gz 7711314 BLAKE2B 135862347a7f3a954acb8d8e17350fbdda84b4813d8498b862e107836a0d29d6e70a26c39c0c29655e6348a5a3afd5b4d7e9824cb88c9e8d31c4515468f46d5b SHA512 41dea60c08882a8f8f9024eb2285c30dbbc68e2256ed6afd5bf956a1828239128b2f39b4ce733a438eafe3b2324ff06dec5c1eb7c9b0f838b2daa972f587d909
DIST julia-1.6.3.tar.gz 7734900 BLAKE2B 679851ee159ac83f49e54f1d71068d4abde919a0da39475dccaecc97e705b87db70c38a55fbc7a0cfacc774291013b189fb516817d6c6e67ca5ccfbb515c3f90 SHA512 a622fddc9e9f3f47037053a1e722153a567c065723f99a97912f8c5a6c2a22c3be0be674325361dd1b04601bbe6c6f204c66004ce887f3f7822e8204fd6855de
+DIST julia-1.6.5-full.tar.gz 153795029 BLAKE2B b86d3ad8dbc4ce486cc0d5e3c25f40c0bedf38cab5b29f1aac4dd527650e78c2e0e462f4eb13fde787adf48a2de9f8eee9cfb8f4aaafbae6ee5e76d7d9608995 SHA512 f057a913f4579280d757c0a97a7cd800fb335be8ec83a27a577d2bee0c9736d49715c7861f7bc1e6461966634bd82890f1f69fd0167f21903ad614e8f70e0dcc
DIST julia-1.7.0-full.tar.gz 255670801 BLAKE2B e7c5be50ab9e7014f028cf7d0530b269e78dd798dc3d4a88af2ed9fa1331694e39fbcae26d2cae6f15aaf1087656384c9872f344f99121406abdf2902a200176 SHA512 00e1bfe354010f5d900476e46b471c4425b711fff5a2aa0ac9e5dbe6ff02245011d4297e4703f2d46f7d4e7b6d97ffaf1bc63170edbfec440196c5ec75c984ce
DIST julia-Pkg-49908bffe83790bc7cf3c5d46faf3667f8902ad4.tar.gz 389738 BLAKE2B 1ed9201badf0a1db5142e0566bfe085b364e4681670937ac5fa53c15312ff8eb29d5e783b75fe3f4f379b041ba38c66ce94962fa7d98fcfd0b7b49acd1749d69 SHA512 a85aa80b3080794a8e3ae5ce54856e63457c461659c12fde5dde1b5ec33176ea06af49ee516d01ccd7b78d8358de2fe0ffcd5c6a6d5a5088cdcd76a0133780eb
DIST julia-UnicodeData-13.0.0.txt 1851767 BLAKE2B 72bbcf352f2f6a004abb3f351fe5da160e83644feea8de0ca154b5a1aa78f36cb04b252d0c7b64a5eeca388e600b2875bb76bc2746ee799a1a6eff97c1fe8b06 SHA512 1a4a662e2ab33469976bf5f91aa6933ed9b73f6d4179a2daffb349e1869d7d6cfa885b164e82d15dcdad7458cd451c81add58d875eb0c70de854589dc97b2055
diff --git a/dev-lang/julia/files/julia-1.6.5-do_not_set_rpath.patch b/dev-lang/julia/files/julia-1.6.5-do_not_set_rpath.patch
new file mode 100644
index 000000000000..c0c05cc649a0
--- /dev/null
+++ b/dev-lang/julia/files/julia-1.6.5-do_not_set_rpath.patch
@@ -0,0 +1,20 @@
+--- a/Makefile 2021-12-21 09:38:26.782829864 +0100
++++ b/Makefile 2021-12-21 10:52:40.760565902 +0100
+@@ -336,7 +336,7 @@
+ install_name_tool -add_rpath @executable_path/$(build_libdir_rel) @executable_path/$(libdir_rel) $(DESTDIR)$(bindir)/$$j; \
+ done
+ endif
+-else ifneq (,$(findstring $(OS),Linux FreeBSD))
++else ifneq (,$(findstring $(OS),FreeBSD))
+ for j in $(JL_TARGETS) ; do \
+ $(PATCHELF) --set-rpath '$$ORIGIN/$(private_libdir_rel):$$ORIGIN/$(libdir_rel)' $(DESTDIR)$(bindir)/$$j; \
+ done
+@@ -357,7 +357,7 @@
+ endif
+
+ # Set rpath for libjulia-internal, which is moving from `../lib` to `../lib/julia`. We only need to do this for Linux/FreeBSD
+-ifneq (,$(findstring $(OS),Linux FreeBSD))
++ifneq (,$(findstring $(OS),FreeBSD))
+ $(PATCHELF) --set-rpath '$$ORIGIN:$$ORIGIN/$(reverse_private_libdir_rel)' $(DESTDIR)$(private_libdir)/libjulia-internal.$(SHLIB_EXT)
+ ifeq ($(BUNDLE_DEBUG_LIBS),1)
+ $(PATCHELF) --set-rpath '$$ORIGIN:$$ORIGIN/$(reverse_private_libdir_rel)' $(DESTDIR)$(private_libdir)/libjulia-internal-debug.$(SHLIB_EXT)
diff --git a/dev-lang/julia/files/julia-1.6.5-hardcoded-libs.patch b/dev-lang/julia/files/julia-1.6.5-hardcoded-libs.patch
new file mode 100644
index 000000000000..fcbc42cd18e6
--- /dev/null
+++ b/dev-lang/julia/files/julia-1.6.5-hardcoded-libs.patch
@@ -0,0 +1,76 @@
+This pacth is very similar to julia-hardcoded-libs-1.7.0.patch,
+ https://raw.githubusercontent.com/archlinux/svntogit-community/packages/julia/trunk/julia-hardcoded-libs.patch
+with changed line
+ const libLLVM = "libLLVM-11jl.so"
+to the line
+ const libLLVM = "libLLVM-12jl.so"
+
+diff --git a/stdlib/MbedTLS_jll/src/MbedTLS_jll.jl b/stdlib/MbedTLS_jll/src/MbedTLS_jll.jl
+index a7ca666b23..b84a42f4e7 100644
+--- a/stdlib/MbedTLS_jll/src/MbedTLS_jll.jl
++++ b/stdlib/MbedTLS_jll/src/MbedTLS_jll.jl
+@@ -31,9 +31,9 @@ elseif Sys.isapple()
+ const libmbedtls = "@rpath/libmbedtls.13.dylib"
+ const libmbedx509 = "@rpath/libmbedx509.1.dylib"
+ else
+- const libmbedcrypto = "libmbedcrypto.so.5"
+- const libmbedtls = "libmbedtls.so.13"
+- const libmbedx509 = "libmbedx509.so.1"
++ const libmbedcrypto = "libmbedcrypto.so"
++ const libmbedtls = "libmbedtls.so"
++ const libmbedx509 = "libmbedx509.so"
+ end
+
+ function __init__()
+diff --git a/stdlib/libLLVM_jll/src/libLLVM_jll.jl b/stdlib/libLLVM_jll/src/libLLVM_jll.jl
+index fa45e754e5..b51812e3a8 100644
+--- a/stdlib/libLLVM_jll/src/libLLVM_jll.jl
++++ b/stdlib/libLLVM_jll/src/libLLVM_jll.jl
+@@ -23,7 +23,7 @@ if Sys.iswindows()
+ elseif Sys.isapple()
+ const libLLVM = "@rpath/libLLVM.dylib"
+ else
+- const libLLVM = "libLLVM-11jl.so"
++ const libLLVM = "libLLVM.so"
+ end
+
+ function __init__()
+diff --git a/stdlib/nghttp2_jll/src/nghttp2_jll.jl b/stdlib/nghttp2_jll/src/nghttp2_jll.jl
+index 8b98c76ac5..77ad9e3800 100644
+--- a/stdlib/nghttp2_jll/src/nghttp2_jll.jl
++++ b/stdlib/nghttp2_jll/src/nghttp2_jll.jl
+@@ -22,7 +22,7 @@ if Sys.iswindows()
+ elseif Sys.isapple()
+ const libnghttp2 = "@rpath/libnghttp2.14.dylib"
+ else
+- const libnghttp2 = "libnghttp2.so.14"
++ const libnghttp2 = "libnghttp2.so"
+ end
+
+ function __init__()
+diff --git a/stdlib/LibGit2_jll/src/LibGit2_jll.jl b/stdlib/LibGit2_jll/src/LibGit2_jll.jl
+index f0d4b5dda6..2ed3017b51 100644
+--- a/stdlib/LibGit2_jll/src/LibGit2_jll.jl
++++ b/stdlib/LibGit2_jll/src/LibGit2_jll.jl
+@@ -23,7 +23,7 @@ if Sys.iswindows()
+ elseif Sys.isapple()
+ const libgit2 = "@rpath/libgit2.1.1.dylib"
+ else
+- const libgit2 = "libgit2.so.1.1"
++ const libgit2 = "libgit2.so"
+ end
+
+ function __init__()
+diff --git a/stdlib/OpenLibm_jll/src/OpenLibm_jll.jl b/stdlib/OpenLibm_jll/src/OpenLibm_jll.jl
+index 215de8aed6..918d1ffdc2 100644
+--- a/stdlib/OpenLibm_jll/src/OpenLibm_jll.jl
++++ b/stdlib/OpenLibm_jll/src/OpenLibm_jll.jl
+@@ -22,7 +22,7 @@ if Sys.iswindows()
+ elseif Sys.isapple()
+ const libopenlibm = "@rpath/libopenlibm.3.dylib"
+ else
+- const libopenlibm = "libopenlibm.so.3"
++ const libopenlibm = "libopenlibm.so"
+ end
+
+ function __init__()
diff --git a/dev-lang/julia/files/julia-1.6.5-lazy_artifacts_fix.patch b/dev-lang/julia/files/julia-1.6.5-lazy_artifacts_fix.patch
new file mode 100644
index 000000000000..9e0d5ecf1a32
--- /dev/null
+++ b/dev-lang/julia/files/julia-1.6.5-lazy_artifacts_fix.patch
@@ -0,0 +1,30 @@
+Patch from
+https://github.com/JuliaLang/julia/commit/d6a655bc.patch
+ Fix LazyArtifacts tests
+
+From d6a655bcfb610130626470e1aa5e2fc28a014b4a Mon Sep 17 00:00:00 2001
+From: Jameson Nash <vtjnash@gmail.com>
+Date: Thu, 24 Dec 2020 00:29:37 -0500
+Subject: [PATCH] codegen: use new freeze intrinsics to avoid poison UB
+ (#38977)
+
+LLVM would likely be required to insert this anyways to make hoisting
+legal (converting branches to and/or), so might as well add it
+ourselves, so that users can legally write that code directly.
+---
+ src/intrinsics.cpp | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/intrinsics.cpp b/src/intrinsics.cpp
+index ada6166c1ceb..b5160bbc39c0 100644
+--- a/src/intrinsics.cpp
++++ b/src/intrinsics.cpp
+@@ -542,6 +542,8 @@ static jl_cgval_t generic_cast(
+ #endif
+ }
+ Value *ans = ctx.builder.CreateCast(Op, from, to);
++ if (f == fptosi || f == fptoui)
++ ans = ctx.builder.CreateFreeze(ans);
+ return mark_julia_type(ctx, ans, false, jlto);
+ }
+
diff --git a/dev-lang/julia/files/julia-1.6.5-llvm_13_compat_part_4.patch b/dev-lang/julia/files/julia-1.6.5-llvm_13_compat_part_4.patch
new file mode 100644
index 000000000000..839dd4ba39a0
--- /dev/null
+++ b/dev-lang/julia/files/julia-1.6.5-llvm_13_compat_part_4.patch
@@ -0,0 +1,35 @@
+Patch from
+ https://github.com/JuliaLang/julia/commit/a2d85f6d.patch
+
+
+From a2d85f6dc63439aea9f973bacb55006596fdb2b8 Mon Sep 17 00:00:00 2001
+From: Fangrui Song <i@maskray.me>
+Date: Tue, 4 May 2021 11:53:40 -0700
+Subject: [PATCH] Replace llvm::sys::fs::F_None with llvm::sys::fs::OF_None
+ (#40666)
+
+The former is deprecated.
+OF_None has been available in LLVM since 2018-06.
+---
+ src/codegen.cpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/codegen.cpp b/src/codegen.cpp
+index ee5ec4dce0c1..bc60798220d5 100644
+--- a/src/codegen.cpp
++++ b/src/codegen.cpp
+@@ -8092,12 +8092,12 @@ extern "C" void jl_dump_llvm_mfunction(void *v)
+
+ extern void jl_write_bitcode_func(void *F, char *fname) {
+ std::error_code EC;
+- raw_fd_ostream OS(fname, EC, sys::fs::F_None);
++ raw_fd_ostream OS(fname, EC, sys::fs::OF_None);
+ llvm::WriteBitcodeToFile(*((llvm::Function*)F)->getParent(), OS);
+ }
+
+ extern void jl_write_bitcode_module(void *M, char *fname) {
+ std::error_code EC;
+- raw_fd_ostream OS(fname, EC, sys::fs::F_None);
++ raw_fd_ostream OS(fname, EC, sys::fs::OF_None);
+ llvm::WriteBitcodeToFile(*(llvm::Module*)M, OS);
+ }
diff --git a/dev-lang/julia/files/julia-1.6.5-llvm_bad_perf_fix.patch b/dev-lang/julia/files/julia-1.6.5-llvm_bad_perf_fix.patch
new file mode 100644
index 000000000000..f38c26bfd52e
--- /dev/null
+++ b/dev-lang/julia/files/julia-1.6.5-llvm_bad_perf_fix.patch
@@ -0,0 +1,33 @@
+Patch from
+ https://github.com/JuliaLang/julia/commit/7df16be0.patch
+fixes bad performance with LLVM 12
+
+From 7df16be0bfafee6d304ee0690366fa33845cc8d6 Mon Sep 17 00:00:00 2001
+From: Valentin Churavy <v.churavy@gmail.com>
+Date: Wed, 12 May 2021 18:44:40 -0400
+Subject: [PATCH] [LLVM] add correlated value propagation after jump threading
+
+---
+ src/aotcompile.cpp | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/aotcompile.cpp b/src/aotcompile.cpp
+index db3f9f4b0e22..4cc22d127528 100644
+--- a/src/aotcompile.cpp
++++ b/src/aotcompile.cpp
+@@ -692,6 +692,7 @@ void addOptimizationPasses(legacy::PassManagerBase *PM, int opt_level,
+ PM->add(createSROAPass());
+ PM->add(createInstSimplifyLegacyPass());
+ PM->add(createJumpThreadingPass());
++ PM->add(createCorrelatedValuePropagationPass());
+
+ PM->add(createReassociatePass());
+
+@@ -743,6 +744,7 @@ void addOptimizationPasses(legacy::PassManagerBase *PM, int opt_level,
+ // loops over Union-typed arrays to vectorize.
+ PM->add(createInstructionCombiningPass());
+ PM->add(createJumpThreadingPass());
++ PM->add(createCorrelatedValuePropagationPass());
+ PM->add(createDeadStoreEliminationPass());
+
+ // More dead allocation (store) deletion before loop optimization
diff --git a/dev-lang/julia/julia-1.6.5.ebuild b/dev-lang/julia/julia-1.6.5.ebuild
new file mode 100644
index 000000000000..e7bcae84ca7a
--- /dev/null
+++ b/dev-lang/julia/julia-1.6.5.ebuild
@@ -0,0 +1,183 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit llvm pax-utils toolchain-funcs
+
+# correct versions for stdlibs are in deps/checksums
+# for everything else, run with network-sandbox and wait for the crash
+
+#MY_LIBUV_V="fb3e3364c33ae48c827f6b103e05c3f0e78b79a9"
+#MY_LIBWHICH_V="81e9723c0273d78493dc8c8ed570f68d9ce7e89e"
+MY_LLVM_V="13.0.1"
+
+DESCRIPTION="High-performance programming language for technical computing"
+HOMEPAGE="https://julialang.org/"
+
+SRC_URI="
+ https://github.com/JuliaLang/julia/releases/download/v${PV}/${P}-full.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+system-llvm"
+
+RDEPEND="
+ system-llvm? ( sys-devel/llvm:13=[llvm_targets_NVPTX(-)] )
+"
+LLVM_MAX_SLOT=13
+
+RDEPEND+="
+ app-arch/p7zip
+ dev-libs/gmp:0=
+ dev-libs/libgit2:0
+ >=dev-libs/libpcre2-10.23:0=[jit,unicode]
+ dev-libs/mpfr:0=
+ dev-libs/libutf8proc:0=[-cjk]
+ dev-util/patchelf
+ >=net-libs/mbedtls-2.2
+ net-misc/curl[http2,ssh]
+ 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/dsfmt-2.2.4
+ >=sys-libs/libunwind-1.1:0=
+ sys-libs/zlib:0=
+ >=virtual/blas-3.6
+ virtual/lapack"
+
+DEPEND="${RDEPEND}
+ dev-util/patchelf
+ virtual/pkgconfig
+ !system-llvm? ( dev-util/cmake )"
+
+PATCHES=(
+ "${FILESDIR}/${PN}"-1.1.0-fix_llvm_install.patch
+ "${FILESDIR}/${PN}"-1.4.0-no_symlink_llvm.patch
+ "${FILESDIR}/${PN}"-1.6.5-llvm_bad_perf_fix.patch
+ "${FILESDIR}/${PN}"-1.7.0-llvm_13_compat_part_1.patch
+ "${FILESDIR}/${PN}"-1.7.0-llvm_13_compat_part_2.patch
+ "${FILESDIR}/${PN}"-1.7.0-llvm_13_compat_part_3.patch
+ "${FILESDIR}/${PN}"-1.6.5-llvm_13_compat_part_4.patch
+ "${FILESDIR}/${PN}"-1.7.0-libgit-1.2.patch
+ "${FILESDIR}/${PN}"-1.7.0-make-install-no-build.patch
+ "${FILESDIR}/${PN}"-1.6.5-hardcoded-libs.patch
+ "${FILESDIR}/${PN}"-1.6.5-do_not_set_rpath.patch
+ "${FILESDIR}/${PN}"-1.6.5-lazy_artifacts_fix.patch
+)
+
+pkg_setup() {
+ use system-llvm && llvm_pkg_setup
+}
+
+src_unpack() {
+ local tounpack=(${A})
+ # the main source tree, followed by deps
+ unpack "${tounpack[0]}"
+
+ 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
+
+ sed -i \
+ -e "\|SHIPFLAGS :=|c\\SHIPFLAGS := ${CFLAGS}" \
+ Make.inc || 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() {
+ use system-llvm && ewarn "You have enabled system-llvm. This is unsupported by upstream and may not work."
+
+ # julia does not play well with the system versions of libuv
+ # USE_SYSTEM_LIBM=0 implies using external openlibm
+ cat <<-EOF > Make.user
+ LOCALBASE:="${EPREFIX}/usr"
+ override prefix:="${EPREFIX}/usr"
+ override libdir:="\$(prefix)/$(get_libdir)"
+ override CC:=$(tc-getCC)
+ override CXX:=$(tc-getCXX)
+ override AR:=$(tc-getAR)
+
+ BUNDLE_DEBUG_LIBS:=0
+ USE_BINARYBUILDER:=0
+ USE_SYSTEM_CSL:=1
+ USE_SYSTEM_LLVM:=$(usex system-llvm 1 0)
+ USE_SYSTEM_LIBUNWIND:=1
+ USE_SYSTEM_PCRE:=1
+ USE_SYSTEM_LIBM:=0
+ USE_SYSTEM_OPENLIBM:=1
+ USE_SYSTEM_DSFMT:=1
+ USE_SYSTEM_BLAS:=1
+ USE_SYSTEM_LAPACK:=1
+ USE_SYSTEM_GMP:=1
+ USE_SYSTEM_MPFR:=1
+ USE_SYSTEM_SUITESPARSE:=1
+ USE_SYSTEM_LIBUV:=0
+ USE_SYSTEM_UTF8PROC:=1
+ USE_SYSTEM_MBEDTLS:=1
+ USE_SYSTEM_LIBSSH2:=1
+ USE_SYSTEM_NGHTTP2:=1
+ USE_SYSTEM_CURL:=1
+ USE_SYSTEM_LIBGIT2:=1
+ USE_SYSTEM_PATCHELF:=1
+ USE_SYSTEM_ZLIB:=1
+ USE_SYSTEM_P7ZIP:=1
+ VERBOSE:=1
+ EOF
+}
+
+src_compile() {
+ # Julia accesses /proc/self/mem on Linux
+ addpredict /proc/self/mem
+
+ default
+ pax-mark m "$(file usr/bin/julia-* | awk -F : '/ELF/ {print $1}')"
+}
+
+src_install() {
+ emake install DESTDIR="${D}"
+
+ if ! use system-llvm ; then
+ local llvmslot=$(ver_cut 1 ${MY_LLVM_V})
+ cp "${S}/usr/lib/libLLVM-${llvmslot}jl.so" "${ED}/usr/$(get_libdir)/julia/" || die
+ fi
+
+ 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
+
+ # The appdata directory is deprecated.
+ mv "${ED}"/usr/share/{appdata,metainfo}/ || die
+}
+
+pkg_postinst() {
+ elog "To use Plots, you will need to install sci-visualization/gr."
+}
^ permalink raw reply related [flat|nested] 24+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-lang/julia/, dev-lang/julia/files/
@ 2021-04-08 2:31 Matthias Maier
0 siblings, 0 replies; 24+ messages in thread
From: Matthias Maier @ 2021-04-08 2:31 UTC (permalink / raw
To: gentoo-commits
commit: f9eec87f0441f022f4851e4d78813d835f25528f
Author: Jeffrey Lin <jeffrey <AT> icurse <DOT> nl>
AuthorDate: Sun Mar 28 06:15:34 2021 +0000
Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org>
CommitDate: Thu Apr 8 02:05:37 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f9eec87f
dev-lang/julia: add 1.6.0
- dSFMT patches have been upstreamed, so split that into a package used
by ::science. Also use system version of dev-libs/libutf8proc.
- LLVM 11 is now supported.
- Add curl as a direct dependency. The ssh USE flag is not strictly
required unless cloning packages over ssh, but it will suppress errors
and should be relatively small. Also, p7zip is needed for Pkg.
- Remove some old baggage:
- dev-libs/double-conversion: compiles fine without.
- dev-libs/openspecfun: compiles fine without.
- net-libs/libssh2: indirect dependency; add curl[ssh] instead.
- sci-mathematics/glpk: hasn't been a dependency in years.
- sci-mathematics/z3: doesn't seem to be an explicit dependency.
- sys-libs/readline: hasn't been a dependency in years.
- No need for separate stdlibs as upstream packs them into tarball.
- Delete some sed commands where the lines to be changed no longer
exist. Replace a patch+sed with a single sed.
- Remove QA warning suppression now that upstream allows using
system compiler support libraries (proper support for this was
added after the 1.6.0 release, so patch is backported).
- Sync Make.user with Make.inc and move make variables there.
Closes: https://bugs.gentoo.org/728726
Closes: https://bugs.gentoo.org/735764
Closes: https://bugs.gentoo.org/778503
Closes: https://bugs.gentoo.org/780444
Closes: https://bugs.gentoo.org/780642
Signed-off-by: Jeffrey Lin <jeffrey <AT> icurse.nl>
Signed-off-by: Matthias Maier <tamiko <AT> gentoo.org>
dev-lang/julia/Manifest | 3 -
.../julia/files/julia-1.6.0-fix-system-csl.patch | 271 +++++++++++++++++++++
dev-lang/julia/julia-1.6.0.ebuild | 103 +++-----
3 files changed, 303 insertions(+), 74 deletions(-)
diff --git a/dev-lang/julia/Manifest b/dev-lang/julia/Manifest
index 2fafe21372a..50b10817aa4 100644
--- a/dev-lang/julia/Manifest
+++ b/dev-lang/julia/Manifest
@@ -1,16 +1,13 @@
DIST julia-1.5.2.tar.gz 6945862 BLAKE2B 9dd9f83fb9ae251f66ae65e14a252b662c3c7d6f92638d91ef6e286032020052e1812f2891270854e0ddeda474afff55c8f87d300550503c1093f4c5e0a51959 SHA512 aa177d03bbde4f368dd2fb14f64d21130531616bcd544af7babbb7fb7c9ee5ea7528c756e10f78468aaffebbcbc6f48e92397c1c13dc3f130b64a82e478f43dc
DIST julia-1.5.3.tar.gz 6949901 BLAKE2B 08f8496980a9bbb9effc0c72cb6b7a5ce1dbd1774735caa366ddc1bb5404117111c624a639f6eb48360061f9fc597a7b37dff24f8555f03ebc4a22524cbeb3b8 SHA512 9e644a64fd6e2caf0390a2bc470084406c078244e65b70a2e3b031d5806c1dff780273ccccfe4bccfd8c03778b7d3a44de7a84bd13f3512afe6864efa5a730fc
DIST julia-1.6.0.tar.gz 7711314 BLAKE2B 135862347a7f3a954acb8d8e17350fbdda84b4813d8498b862e107836a0d29d6e70a26c39c0c29655e6348a5a3afd5b4d7e9824cb88c9e8d31c4515468f46d5b SHA512 41dea60c08882a8f8f9024eb2285c30dbbc68e2256ed6afd5bf956a1828239128b2f39b4ce733a438eafe3b2324ff06dec5c1eb7c9b0f838b2daa972f587d909
-DIST julia-Pkg-05fa7f93f73afdabd251247d03144de9f7b36b50.tar.gz 388550 BLAKE2B ec248dbd06a25014905b55cbd6ca55ef245d09b15d4a9b78ec98fd6fe59b318047914698ece8ef85b6a161f115a227ee5346c5f1698bcb74174bca77dbde9968 SHA512 8f1660e55bd8730ab816109fe802edd14c2ab46aed0db7f04e520b371a9f7296c3ab85d42af64174b0989fa55bb089b1450dcee28e67dbb996471235dbba35c1
DIST julia-Pkg-49908bffe83790bc7cf3c5d46faf3667f8902ad4.tar.gz 389738 BLAKE2B 1ed9201badf0a1db5142e0566bfe085b364e4681670937ac5fa53c15312ff8eb29d5e783b75fe3f4f379b041ba38c66ce94962fa7d98fcfd0b7b49acd1749d69 SHA512 a85aa80b3080794a8e3ae5ce54856e63457c461659c12fde5dde1b5ec33176ea06af49ee516d01ccd7b78d8358de2fe0ffcd5c6a6d5a5088cdcd76a0133780eb
DIST julia-UnicodeData-13.0.0.txt 1851767 BLAKE2B 72bbcf352f2f6a004abb3f351fe5da160e83644feea8de0ca154b5a1aa78f36cb04b252d0c7b64a5eeca388e600b2875bb76bc2746ee799a1a6eff97c1fe8b06 SHA512 1a4a662e2ab33469976bf5f91aa6933ed9b73f6d4179a2daffb349e1869d7d6cfa885b164e82d15dcdad7458cd451c81add58d875eb0c70de854589dc97b2055
DIST julia-dsfmt-2.2.3.tar.gz 291773 BLAKE2B 6ffae90494d72527920c80fc0fb005da1c7b84f8a03a7ecb0789434c0fff97359e5098e85431896dffccc7d5148c414e847aaba5feef648b8788421a466ff65e SHA512 6d8ddcd01aab3f9039f4f0288a8af53e290cc2f293ed8c4a8c9f3b3f12398e7eedfce8016117b425766ba89c61c86c13b3e420035b5f9bf91315b8b814c03662
-DIST julia-dsfmt-2.2.4.tar.gz 4984255 BLAKE2B 6119445d93cb45faab28dfb52a18c07cd5703b243b3cddde35fff7a5e948fa8788dfe8428ae8e0a52604f91ac07fe7b3bb0f6c438ef93b5257b42baee9dfdec5 SHA512 fe84e986cbf198172340adfac0436b08f087643eca3f1ceccacde146cbfd8c41e3eb0dfbb062f7ca5f462db13c386abd7c269bc0cbefc9a0ecf97a8a8870a2e4
DIST julia-libuv-1fcc6d66f9df74189c74d3d390f02202bb7db953.tar.gz 1590342 BLAKE2B eca658f74421587aec78cb38f5a712033afb072e6425a6ce28fd5d4bac61e41cacbd5a850c1f2b29c386b944d1d9c4f16b7d090f7d2dd6b963b5dbc94ae18981 SHA512 70b0c738a60b4e476750b7de8d120e735359e2c36fcb3a8a38628a0ae326210ed3b15d793dfd5443d7aa5603e83e7d99f567aa4c1696846d950df9f83648669c
DIST julia-libuv-35b1504507a7a4168caae3d78db54d1121b121e1.tar.gz 1577394 BLAKE2B 8ab36f781619f710a64ddc6cf257a4c2f6d27ac22e33ed6f184902d0c6cc3a3941254e0a825071fcd57f869e3ccc5eaf71856539cf6b484358d5aafe383000a9 SHA512 5932e9105346e952fd0f51f79898e5b9c993261ec1558408437647ab3b3ce282562f1e0a16db5704cb66e7aa7a4c6a75dd7f0da498a98b1b6af48da88b4869f0
DIST julia-libuv-fb3e3364c33ae48c827f6b103e05c3f0e78b79a9.tar.gz 1643008 BLAKE2B b2a121e0b94cd1f5d40e292fc2356e8940bf8dfe1e6a200b50caf60def1982b705d1d42dd234e9e8b0aa70439bf34a5bce71761424623cbfcd20c9131ce09c25 SHA512 29947c236aef8931be4767df1cd8404ee9b036ee107b31cbce6fad9a97743df57d068b15bc4bd00320b9b81cd879258a9ec9dc675853e424ccdb8d6bdd226240
DIST julia-libwhich-81e9723c0273d78493dc8c8ed570f68d9ce7e89e.tar.gz 4183 BLAKE2B c932e23b1b476d3fd16cf6f451efd5fc6d9c1ec2c53e8ac086340a100817d9b30dae3eff50b284a42c09b2bbae30b9e2fd38b2881f8cbf4974a89f3bd0c87599 SHA512 6fb77b715d70d9bc95a8546c3bf97bd3677c7ea344b88bb5bc3bbfac9dceabe8a8cde7a0f64dec884cde802e4a3000e30837d3f824b5a9242348c4fe061526a3
DIST julia-utf8proc-0890a538bf8238cded9be0c81171f57e43f2c755.tar.gz 155521 BLAKE2B 32dc1a8fb641e89057d317e579f1802b7f7dfbdbea7f91c01b282b9a88c2fc6143743d5e45f46d6d465857cfe1b28bd39e9a0da19e80516536c57cb62b139d27 SHA512 95d6dba2bbdfc5003f6d21fd02c926c7db9661895010041aacee55fa11dc2524bcffaa90965e2a9a8f2a9e49e93ec7572d6a4de6d5d9f9e075b787537864ea20
-DIST julia-utf8proc-3203baa7374d67132384e2830b2183c92351bffc.tar.gz 182914 BLAKE2B 73ebddea183a5993528b1671d365520bea5087e169c79dde33d225cd19af6daa43624acf1afa52da1fd22cd155819e0497830740d70387d10a94de0397c1f5c0 SHA512 912d51e5c2daf80865e862daba2971e3a77b224d40179225d5908385d2f7f543a92cd2d9b6cecacfab185d8bd8f2732cad7a9d217f25f1e10a77083fda74f0b5
DIST llvm-11.0.1.src.tar.xz 38914796 BLAKE2B ccdec0632c9cf5fae8e6947c266136e04dc8c609e2ca9c1efb1205767d9181301e0de14601d11e2f27ec0ebc0749858a5f1089d8a40a9ae3f22582cbf6abef6e SHA512 b42c67ef88e09dd94171f85cdf49a421a15cfc82ff715c7ce6de22f98cefbe6c7cdf6bf4af7ca017d56ecf6aa3e36df3d823a78cf2dd5312de4301b54b43dbe8
DIST llvm-9.0.1.src.tar.xz 33035112 BLAKE2B 5ae7ac42507cb14983eec0785dfc9b9c788cae75d5493ddf6734da55d3733cc90e35634aa39aa536654d4b68c3ccb7c2f989746f21c634c8989a57d9d32a15b2 SHA512 bfb6960a4dd1e18f4005f324f478a781c69e8ec7c20569d9b243fcb9372dc7733b254f26c683373537990cc9c109c78eaf0f65449629ee17caca1bce9b9ccccd
diff --git a/dev-lang/julia/files/julia-1.6.0-fix-system-csl.patch b/dev-lang/julia/files/julia-1.6.0-fix-system-csl.patch
new file mode 100644
index 00000000000..90a097197bf
--- /dev/null
+++ b/dev-lang/julia/files/julia-1.6.0-fix-system-csl.patch
@@ -0,0 +1,271 @@
+From 71d7a8a8c12b72bfa362ae955d2ce4dfbdf5b8ba Mon Sep 17 00:00:00 2001
+From: Elliot Saba <staticfloat@gmail.com>
+Date: Fri, 26 Mar 2021 18:40:07 +0000
+Subject: [PATCH 1/2] [build] Add `symlink_system_library` calls for CSL
+
+We differentiate between a `USE_BINARYBUILDER_CSL=0` configuration
+(where we copy the CSL libraries into the Julia build tree) versus a
+`USE_SYSTEM_CSL=1` configuration (where we symlink them in a manner
+similar to other system libararies)
+---
+ Make.inc | 23 +++++++++++++-
+ base/Makefile | 88 ++++++++++++++++++++++++++++++---------------------
+ deps/csl.mk | 40 ++++++++---------------
+ 3 files changed, 87 insertions(+), 64 deletions(-)
+
+diff --git a/Make.inc b/Make.inc
+index 519720a861ed7..7cba05806e684 100644
+--- a/Make.inc
++++ b/Make.inc
+@@ -596,6 +596,21 @@ else
+ SHLIB_EXT := so
+ endif
+
++ifeq ($(OS),WINNT)
++define versioned_libname
++$$(if $(2),$(1)-$(2).$(SHLIB_EXT),$(1).$(SHLIB_EXT))
++endef
++else ifeq ($(OS),Darwin)
++define versioned_libname
++$$(if $(2),$(1).$(2).$(SHLIB_EXT),$(1).$(SHLIB_EXT))
++endef
++else
++define versioned_libname
++$$(if $(2),$(1).$(SHLIB_EXT).$(2),$(1).$(SHLIB_EXT))
++endef
++endif
++
++
+ ifeq ($(SHLIB_EXT), so)
+ define SONAME_FLAGS
+ -Wl,-soname=$1
+@@ -1147,6 +1162,8 @@ BB_TRIPLET_LIBGFORTRAN := $(subst $(SPACE),-,$(filter-out cxx%,$(subst -,$(SPACE
+ BB_TRIPLET_CXXABI := $(subst $(SPACE),-,$(filter-out libgfortran%,$(subst -,$(SPACE),$(BB_TRIPLET_LIBGFORTRAN_CXXABI))))
+ BB_TRIPLET := $(subst $(SPACE),-,$(filter-out cxx%,$(filter-out libgfortran%,$(subst -,$(SPACE),$(BB_TRIPLET_LIBGFORTRAN_CXXABI)))))
+
++LIBGFORTRAN_VERSION := $(subst libgfortran,,$(filter libgfortran%,$(subst -,$(SPACE),$(BB_TRIPLET_LIBGFORTRAN))))
++
+ # This is the set of projects that BinaryBuilder dependencies are hooked up for.
+ BB_PROJECTS := BLASTRAMPOLINE OPENBLAS LLVM SUITESPARSE OPENLIBM GMP MBEDTLS LIBSSH2 NGHTTP2 MPFR CURL LIBGIT2 PCRE LIBUV LIBUNWIND DSFMT OBJCONV ZLIB P7ZIP CSL
+ define SET_BB_DEFAULT
+@@ -1479,8 +1496,12 @@ ifneq ($(findstring $(OS),Linux FreeBSD),)
+ LIBGCC_NAME := libgcc_s.$(SHLIB_EXT).1
+ endif
+
+-
++# USE_SYSTEM_CSL causes it to get symlinked into build_private_shlibdir
++ifeq ($(USE_SYSTEM_CSL),1)
++LIBGCC_BUILD_DEPLIB := $(call dep_lib_path,$(build_libdir),$(build_private_shlibdir)/$(LIBGCC_NAME))
++else
+ LIBGCC_BUILD_DEPLIB := $(call dep_lib_path,$(build_libdir),$(build_shlibdir)/$(LIBGCC_NAME))
++endif
+ LIBGCC_INSTALL_DEPLIB := $(call dep_lib_path,$(libdir),$(private_shlibdir)/$(LIBGCC_NAME))
+
+ # USE_SYSTEM_LIBM and USE_SYSTEM_OPENLIBM causes it to get symlinked into build_private_shlibdir
+diff --git a/base/Makefile b/base/Makefile
+index e024e546f94d3..2bef6aab7f1f4 100644
+--- a/base/Makefile
++++ b/base/Makefile
+@@ -169,53 +169,69 @@ endif
+ # echo "$$P"
+
+ define symlink_system_library
+-symlink_$1: $$(build_private_libdir)/$1.$$(SHLIB_EXT)
+-$$(build_private_libdir)/$1.$$(SHLIB_EXT):
+- REALPATH=`$$(call spawn,$$(build_depsbindir)/libwhich) -p $$(notdir $$@)` && \
+- $$(call resolve_path,REALPATH) && \
+- [ -e "$$$$REALPATH" ] && \
+- ([ ! -e "$$@" ] || rm "$$@") && \
+- echo ln -sf "$$$$REALPATH" "$$@" && \
+- ln -sf "$$$$REALPATH" "$$@"
+-ifneq ($2,)
+-ifneq ($$(USE_SYSTEM_$2),0)
+-SYMLINK_SYSTEM_LIBRARIES += symlink_$1
+-endif
++libname_$2 := $$(notdir $(call versioned_libname,$2,$3))
++libpath_$2 := $$(shell $$(call spawn,$$(build_depsbindir)/libwhich) -p $$(libname_$2) 2>/dev/null)
++symlink_$2: $$(build_private_libdir)/$$(libname_$2)
++$$(build_private_libdir)/$$(libname_$2):
++ @if [ -e "$$(libpath_$2)" ]; then \
++ REALPATH=$$(libpath_$2); \
++ $$(call resolve_path,REALPATH) && \
++ [ -e "$$$$REALPATH" ] && \
++ ([ ! -e "$$@" ] || rm "$$@") && \
++ echo ln -sf "$$$$REALPATH" "$$@" && \
++ ln -sf "$$$$REALPATH" "$$@"; \
++ else \
++ if [ "$4" != "ALLOW_FAILURE" ]; then \
++ echo "System library symlink failure: Unable to locate $$(libname_$2) on your system!" >&2; \
++ false; \
++ fi; \
++ fi
++ifneq ($$(USE_SYSTEM_$1),0)
++SYMLINK_SYSTEM_LIBRARIES += symlink_$2
+ endif
+ endef
+
+ # the following excludes: libuv.a, libutf8proc.a
+
+-$(eval $(call symlink_system_library,$(LIBMNAME)))
+ ifneq ($(USE_SYSTEM_LIBM),0)
+-SYMLINK_SYSTEM_LIBRARIES += symlink_$(LIBMNAME)
++$(eval $(call symlink_system_library,LIBM,$(LIBMNAME)))
+ else ifneq ($(USE_SYSTEM_OPENLIBM),0)
+-SYMLINK_SYSTEM_LIBRARIES += symlink_$(LIBMNAME)
++$(eval $(call symlink_system_library,OPENLIBM,$(LIBMNAME)))
+ endif
+
+-$(eval $(call symlink_system_library,libpcre2-8,PCRE))
+-$(eval $(call symlink_system_library,libdSFMT,DSFMT))
+-$(eval $(call symlink_system_library,$(LIBBLASNAME),BLAS))
++$(eval $(call symlink_system_library,CSL,libgcc_s,1))
++ifneq (,$(LIBGFORTRAN_VERSION))
++$(eval $(call symlink_system_library,CSL,libgfortran,$(LIBGFORTRAN_VERSION)))
++endif
++$(eval $(call symlink_system_library,CSL,libquadmath,0))
++$(eval $(call symlink_system_library,CSL,libstdc++,6))
++# We allow libssp, libatomic and libgomp to fail as they are not available on all systems
++$(eval $(call symlink_system_library,CSL,libssp,0,ALLOW_FAILURE))
++$(eval $(call symlink_system_library,CSL,libatomic,1,ALLOW_FAILURE))
++$(eval $(call symlink_system_library,CSL,libgomp,1,ALLOW_FAILURE))
++$(eval $(call symlink_system_library,PCRE,libpcre2-8))
++$(eval $(call symlink_system_library,DSFMT,libdSFMT))
++$(eval $(call symlink_system_library,BLAS,$(LIBBLASNAME)))
+ ifneq ($(LIBLAPACKNAME),$(LIBBLASNAME))
+-$(eval $(call symlink_system_library,$(LIBLAPACKNAME),LAPACK))
++$(eval $(call symlink_system_library,LAPACK,$(LIBLAPACKNAME)))
+ endif
+-$(eval $(call symlink_system_library,libgmp,GMP))
+-$(eval $(call symlink_system_library,libmpfr,MPFR))
+-$(eval $(call symlink_system_library,libmbedtls,MBEDTLS))
+-$(eval $(call symlink_system_library,libmbedcrypto,MBEDTLS))
+-$(eval $(call symlink_system_library,libmbedx509,MBEDTLS))
+-$(eval $(call symlink_system_library,libssh2,LIBSSH2))
+-$(eval $(call symlink_system_library,libnghttp2,NGHTTP2))
+-$(eval $(call symlink_system_library,libcurl,CURL))
+-$(eval $(call symlink_system_library,libgit2,LIBGIT2))
+-$(eval $(call symlink_system_library,libamd,SUITESPARSE))
+-$(eval $(call symlink_system_library,libcamd,SUITESPARSE))
+-$(eval $(call symlink_system_library,libccolamd,SUITESPARSE))
+-$(eval $(call symlink_system_library,libcholmod,SUITESPARSE))
+-$(eval $(call symlink_system_library,libcolamd,SUITESPARSE))
+-$(eval $(call symlink_system_library,libumfpack,SUITESPARSE))
+-$(eval $(call symlink_system_library,libspqr,SUITESPARSE))
+-$(eval $(call symlink_system_library,libsuitesparseconfig,SUITESPARSE))
++$(eval $(call symlink_system_library,GMP,libgmp))
++$(eval $(call symlink_system_library,MPFR,libmpfr))
++$(eval $(call symlink_system_library,MBEDTLS,libmbedtls))
++$(eval $(call symlink_system_library,MBEDTLS,libmbedcrypto))
++$(eval $(call symlink_system_library,MBEDTLS,libmbedx509))
++$(eval $(call symlink_system_library,LIBSSH2,libssh2))
++$(eval $(call symlink_system_library,NGHTTP2,libnghttp2))
++$(eval $(call symlink_system_library,CURL,libcurl))
++$(eval $(call symlink_system_library,LIBGIT2,libgit2))
++$(eval $(call symlink_system_library,SUITESPARSE,libamd))
++$(eval $(call symlink_system_library,SUITESPARSE,libcamd))
++$(eval $(call symlink_system_library,SUITESPARSE,libccolamd))
++$(eval $(call symlink_system_library,SUITESPARSE,libcholmod))
++$(eval $(call symlink_system_library,SUITESPARSE,libcolamd))
++$(eval $(call symlink_system_library,SUITESPARSE,libumfpack))
++$(eval $(call symlink_system_library,SUITESPARSE,libspqr))
++$(eval $(call symlink_system_library,SUITESPARSE,libsuitesparseconfig))
+ # EXCLUDED LIBRARIES (installed/used, but not vendored for use with dlopen):
+ # libunwind
+ endif # WINNT
+diff --git a/deps/csl.mk b/deps/csl.mk
+index 095d4ceec4a1e..423201cbb5a0c 100644
+--- a/deps/csl.mk
++++ b/deps/csl.mk
+@@ -19,48 +19,34 @@ $$(build_shlibdir)/$(1): | $$(build_shlibdir)
+ [ -n "$$$${SRC_LIB}" ] && cp $$$${SRC_LIB} $$(build_shlibdir)
+ endef
+
+-ifeq ($(OS),WINNT)
+-define gen_libname
+-$$(if $(2),lib$(1)-$(2).$(SHLIB_EXT),lib$(1).$(SHLIB_EXT))
+-endef
+-else ifeq ($(OS),Darwin)
+-define gen_libname
+-$$(if $(2),lib$(1).$(2).$(SHLIB_EXT),lib$(1).$(SHLIB_EXT))
+-endef
+-else
+-define gen_libname
+-$$(if $(2),lib$(1).$(SHLIB_EXT).$(2),lib$(1).$(SHLIB_EXT))
+-endef
+-endif
+-
+ # libgfortran has multiple names; we're just going to copy any version we can find
+ # Since we're only looking in the location given by `$(FC)` this should only succeed for one.
+-$(eval $(call copy_csl,$(call gen_libname,gfortran,3)))
+-$(eval $(call copy_csl,$(call gen_libname,gfortran,4)))
+-$(eval $(call copy_csl,$(call gen_libname,gfortran,5)))
++$(eval $(call copy_csl,$(call versioned_libname,libgfortran,3)))
++$(eval $(call copy_csl,$(call versioned_libname,libgfortran,4)))
++$(eval $(call copy_csl,$(call versioned_libname,libgfortran,5)))
+
+ # These are all libraries that we should always have
+-$(eval $(call copy_csl,$(call gen_libname,quadmath,0)))
+-$(eval $(call copy_csl,$(call gen_libname,stdc++,6)))
+-$(eval $(call copy_csl,$(call gen_libname,ssp,0)))
+-$(eval $(call copy_csl,$(call gen_libname,atomic,1)))
+-$(eval $(call copy_csl,$(call gen_libname,gomp,1)))
++$(eval $(call copy_csl,$(call versioned_libname,libquadmath,0)))
++$(eval $(call copy_csl,$(call versioned_libname,libstdc++,6)))
++$(eval $(call copy_csl,$(call versioned_libname,libssp,0)))
++$(eval $(call copy_csl,$(call versioned_libname,libatomic,1)))
++$(eval $(call copy_csl,$(call versioned_libname,libgomp,1)))
+
+ ifeq ($(OS),WINNT)
+ # Windwos has special gcc_s names
+ ifeq ($(ARCH),i686)
+-$(eval $(call copy_csl,$(call gen_libname,gcc_s_sjlj,1)))
++$(eval $(call copy_csl,$(call versioned_libname,libgcc_s_sjlj,1)))
+ else
+-$(eval $(call copy_csl,$(call gen_libname,gcc_s_seh,1)))
++$(eval $(call copy_csl,$(call versioned_libname,libgcc_s_seh,1)))
+ endif
+ else
+-$(eval $(call copy_csl,$(call gen_libname,gcc_s,1)))
++$(eval $(call copy_csl,$(call versioned_libname,libgcc_s,1)))
+ endif
+ # winpthread is only Windows, pthread is only others
+ ifeq ($(OS),WINNT)
+-$(eval $(call copy_csl,$(call gen_libname,winpthread,1)))
++$(eval $(call copy_csl,$(call versioned_libname,libwinpthread,1)))
+ else
+-$(eval $(call copy_csl,$(call gen_libname,pthread,0)))
++$(eval $(call copy_csl,$(call versioned_libname,libpthread,0)))
+ endif
+
+ get-csl:
+
+From 6536b8519b25db844f2a1866d056879cb87d1c66 Mon Sep 17 00:00:00 2001
+From: Elliot Saba <staticfloat@gmail.com>
+Date: Fri, 26 Mar 2021 22:32:04 +0000
+Subject: [PATCH 2/2] Expand `JL_PRIVATE_LIBS-1` for versioned library names as
+ well
+
+Without this, we fail to install things like `libgcc_s.so.1` when
+installed into the private libdir by `symlink_system_libraries`.
+---
+ Makefile | 7 +++++--
+ 1 file changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 823ff3b86339d..e08f0e959e1b3 100644
+--- a/Makefile
++++ b/Makefile
+@@ -290,8 +290,11 @@ endif
+ done \
+ done
+ for suffix in $(JL_PRIVATE_LIBS-1) ; do \
+- lib=$(build_private_libdir)/$${suffix}.$(SHLIB_EXT); \
+- $(INSTALL_M) $$lib $(DESTDIR)$(private_libdir) ; \
++ for lib in $(build_private_libdir)/$${suffix}.$(SHLIB_EXT)*; do \
++ if [ "$${lib##*.}" != "dSYM" ]; then \
++ $(INSTALL_M) $$lib $(DESTDIR)$(private_libdir) ; \
++ fi \
++ done \
+ done
+ endif
+ # Install `7z` into libexec/
diff --git a/dev-lang/julia/julia-1.6.0.ebuild b/dev-lang/julia/julia-1.6.0.ebuild
index b6b3aa64075..5296e35163d 100644
--- a/dev-lang/julia/julia-1.6.0.ebuild
+++ b/dev-lang/julia/julia-1.6.0.ebuild
@@ -8,25 +8,17 @@ inherit llvm pax-utils toolchain-funcs
# correct versions for stdlibs are in deps/checksums
# for everything else, run with network-sandbox and wait for the crash
-MY_PV="${PV//_rc/-rc}"
-MY_DSFMT_V="2.2.4"
MY_LIBUV_V="fb3e3364c33ae48c827f6b103e05c3f0e78b79a9"
MY_LIBWHICH_V="81e9723c0273d78493dc8c8ed570f68d9ce7e89e"
MY_LLVM_V="11.0.1"
-MY_PKG_V="05fa7f93f73afdabd251247d03144de9f7b36b50"
-MY_UNICODE_V="13.0.0"
-MY_UTF8PROC_V="3203baa7374d67132384e2830b2183c92351bffc"
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://github.com/JuliaLang/julia/releases/download/v${PV}/${P}.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
- https://github.com/MersenneTwister-Lab/dSFMT/archive/v${MY_DSFMT_V}.tar.gz -> ${PN}-dsfmt-${MY_DSFMT_V}.tar.gz
- http://www.unicode.org/Public/${MY_UNICODE_V}/ucd/UnicodeData.txt -> ${PN}-UnicodeData-${MY_UNICODE_V}.txt
- https://dev.gentoo.org/~patrick/Pkg-${MY_PKG_V}.tar.gz -> ${PN}-Pkg-${MY_PKG_V}.tar.gz
!system-llvm? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-${MY_LLVM_V}/llvm-${MY_LLVM_V}.src.tar.xz )
"
@@ -41,19 +33,16 @@ RDEPEND="
"
LLVM_MAX_SLOT=11
-# Silence some QA warnings. The julia build system does not use user
-# defined CFLAGS for some of the generated binary modules.
-QA_FLAGS_IGNORED='.*'
-
RDEPEND+="
- dev-libs/double-conversion:0=
+ app-arch/p7zip
dev-libs/gmp:0=
dev-libs/libgit2:0
>=dev-libs/libpcre2-10.23:0=[jit,unicode]
dev-libs/mpfr:0=
- dev-libs/openspecfun
- net-libs/libssh2
+ dev-libs/libutf8proc:0=
+ dev-util/patchelf
>=net-libs/mbedtls-2.2
+ net-misc/curl[http2,ssh]
sci-libs/amd:0=
sci-libs/arpack:0=
sci-libs/camd:0=
@@ -64,10 +53,8 @@ RDEPEND+="
sci-libs/openlibm:0=
sci-libs/spqr:0=
sci-libs/umfpack:0=
- sci-mathematics/glpk:0=
- sci-mathematics/z3
+ >=sci-mathematics/dsfmt-2.2.4
>=sys-libs/libunwind-1.1:0=
- sys-libs/readline:0=
sys-libs/zlib:0=
>=virtual/blas-3.6
virtual/lapack"
@@ -77,37 +64,23 @@ DEPEND="${RDEPEND}
virtual/pkgconfig"
PATCHES=(
- "${FILESDIR}"/${PN}-1.6.0-fix_build_system.patch
- "${FILESDIR}"/${PN}-1.1.0-fix_llvm_install.patch
- "${FILESDIR}"/${PN}-1.4.0-no_symlink_llvm.patch
+ "${FILESDIR}/${PN}"-1.1.0-fix_llvm_install.patch
+ "${FILESDIR}/${PN}"-1.4.0-no_symlink_llvm.patch
+ "${FILESDIR}/${PN}"-1.6.0-fix-system-csl.patch
)
-S="${WORKDIR}/${PN}-${MY_PV}"
-
pkg_setup() {
use system-llvm && llvm_pkg_setup
}
src_unpack() {
- tounpack=(${A})
+ local tounpack=(${A})
# the main source tree, followed by deps
- unpack "${A/%\ */}"
+ unpack "${tounpack[0]}"
mkdir -p "${S}/deps/srccache/"
for i in "${tounpack[@]:1}"; do
- if [[ $i == *Pkg* ]] || [[ $i = *Statistics* ]]; then
- # Bundled Pkg and Statistics packages go into ./stdlib
- local tarball="${i#julia-}"
- cp "${DISTDIR}/${i}" "${S}/stdlib/srccache/${tarball}" || die
- # and we have to fix up the sha1sum
- local name="${tarball%-*}"
- local sha1="${tarball#*-}"
- sha1="${sha1%.tar*}"
- einfo "using patched stdlib package \"${name}\""
- sed -i -e "s/PKG_SHA1 = .*/PKG_SHA1 = ${sha1}/" "${S}/stdlib/Pkg.version" || die
- else
- cp "${DISTDIR}/${i}" "${S}/deps/srccache/${i#julia-}" || die
- fi
+ cp "${DISTDIR}/${i}" "${S}/deps/srccache/${i#julia-}" || die
done
}
@@ -120,84 +93,72 @@ src_prepare() {
# - respect EPREFIX and Gentoo specific paths
sed -i \
- -e "s|GENTOOCFLAGS|${CFLAGS}|g" \
- -e "s|/usr/include|${EPREFIX}/usr/include|g" \
- deps/Makefile || die
-
- sed -i \
- -e "s|GENTOOCFLAGS|${CFLAGS}|g" \
- -e "s|GENTOOLIBDIR|$(get_libdir)|" \
+ -e "\|SHIPFLAGS :=|c\\SHIPFLAGS := ${CFLAGS}" \
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
-
- # now using sha512 additionally, so need to recreate checksum -
- sha512sum "${S}/stdlib/srccache/Pkg-${MY_PKG_V}.tar.gz" | awk '{ print $1; }' > "${S}/deps/checksums/Pkg-${MY_PKG_V}.tar.gz/sha512" || die
}
src_configure() {
- # julia does not play well with the system versions of dsfmt, libuv,
- # and utf8proc
-
use system-llvm && ewarn "You have enabled system-llvm. This is unsupported by upstream and may not work."
+ # julia does not play well with the system versions of libuv
# USE_SYSTEM_LIBM=0 implies using external openlibm
cat <<-EOF > Make.user
+ LOCALBASE:="${EPREFIX}/usr"
+ override prefix:="${EPREFIX}/usr"
+ override libdir:="\$(prefix)/$(get_libdir)"
+ override CC:=$(tc-getCC)
+ override CXX:=$(tc-getCXX)
+ override AR:=$(tc-getAR)
+
+ BUNDLE_DEBUG_LIBS:=0
USE_BINARYBUILDER:=0
+ USE_SYSTEM_CSL:=1
USE_SYSTEM_LLVM:=$(usex system-llvm 1 0)
USE_SYSTEM_LIBUNWIND:=1
USE_SYSTEM_PCRE:=1
USE_SYSTEM_LIBM:=0
USE_SYSTEM_OPENLIBM:=1
- USE_SYSTEM_DSFMT:=0
+ USE_SYSTEM_DSFMT:=1
USE_SYSTEM_BLAS:=1
USE_SYSTEM_LAPACK:=1
USE_SYSTEM_GMP:=1
USE_SYSTEM_MPFR:=1
USE_SYSTEM_SUITESPARSE:=1
USE_SYSTEM_LIBUV:=0
- USE_SYSTEM_UTF8PROC:=0
+ USE_SYSTEM_UTF8PROC:=1
USE_SYSTEM_MBEDTLS:=1
USE_SYSTEM_LIBSSH2:=1
+ USE_SYSTEM_NGHTTP2:=1
USE_SYSTEM_CURL:=1
USE_SYSTEM_LIBGIT2:=1
USE_SYSTEM_PATCHELF:=1
USE_SYSTEM_ZLIB:=1
USE_SYSTEM_P7ZIP:=1
- VERBOSE=1
- libdir="${EROOT}/usr/$(get_libdir)"
+ VERBOSE:=1
EOF
}
src_compile() {
-
# Julia accesses /proc/self/mem on Linux
addpredict /proc/self/mem
- emake \
- prefix="${EPREFIX}/usr" DESTDIR="${D}" \
- CC="$(tc-getCC)" CXX="$(tc-getCXX)" AR="$(tc-getAR)"
+ default
pax-mark m "$(file usr/bin/julia-* | awk -F : '/ELF/ {print $1}')"
}
src_install() {
- emake install \
- prefix="${EPREFIX}/usr" DESTDIR="${D}" \
- CC="$(tc-getCC)" CXX="$(tc-getCXX)" AR="$(tc-getAR)" \
- BUNDLE_DEBUG_LIBS=0
+ emake install DESTDIR="${D}"
if ! use system-llvm ; then
- cp "${S}/usr/lib/libLLVM"-?jl.so "${ED}/usr/$(get_libdir)/julia/" || die
+ local llvmslot=$(ver_cut 1 ${MY_LLVM_V})
+ cp "${S}/usr/lib/libLLVM-${llvmslot}jl.so" "${ED}/usr/$(get_libdir)/julia/" || die
fi
dodoc README.md
^ permalink raw reply related [flat|nested] 24+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-lang/julia/, dev-lang/julia/files/
@ 2021-04-05 9:05 罗百科
0 siblings, 0 replies; 24+ messages in thread
From: 罗百科 @ 2021-04-05 9:05 UTC (permalink / raw
To: gentoo-commits
commit: 5fc1fe4a54efa286c76ae8d966e0ba989138b1f0
Author: Patrick Lauer <patrick <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 27 11:54:57 2021 +0000
Commit: 罗百科 <patrick <AT> gentoo <DOT> org>
CommitDate: Mon Apr 5 09:05:17 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5fc1fe4a
dev-lang/julia: Bump to 1.6.0
Package-Manager: Portage-3.0.17, Repoman-3.0.2
Signed-off-by: Patrick Lauer <patrick <AT> gentoo.org>
dev-lang/julia/Manifest | 6 +
.../julia/files/julia-1.6.0-fix_build_system.patch | 53 +++++
dev-lang/julia/julia-1.6.0.ebuild | 216 +++++++++++++++++++++
3 files changed, 275 insertions(+)
diff --git a/dev-lang/julia/Manifest b/dev-lang/julia/Manifest
index 1bce6f6baf5..2fafe21372a 100644
--- a/dev-lang/julia/Manifest
+++ b/dev-lang/julia/Manifest
@@ -1,10 +1,16 @@
DIST julia-1.5.2.tar.gz 6945862 BLAKE2B 9dd9f83fb9ae251f66ae65e14a252b662c3c7d6f92638d91ef6e286032020052e1812f2891270854e0ddeda474afff55c8f87d300550503c1093f4c5e0a51959 SHA512 aa177d03bbde4f368dd2fb14f64d21130531616bcd544af7babbb7fb7c9ee5ea7528c756e10f78468aaffebbcbc6f48e92397c1c13dc3f130b64a82e478f43dc
DIST julia-1.5.3.tar.gz 6949901 BLAKE2B 08f8496980a9bbb9effc0c72cb6b7a5ce1dbd1774735caa366ddc1bb5404117111c624a639f6eb48360061f9fc597a7b37dff24f8555f03ebc4a22524cbeb3b8 SHA512 9e644a64fd6e2caf0390a2bc470084406c078244e65b70a2e3b031d5806c1dff780273ccccfe4bccfd8c03778b7d3a44de7a84bd13f3512afe6864efa5a730fc
+DIST julia-1.6.0.tar.gz 7711314 BLAKE2B 135862347a7f3a954acb8d8e17350fbdda84b4813d8498b862e107836a0d29d6e70a26c39c0c29655e6348a5a3afd5b4d7e9824cb88c9e8d31c4515468f46d5b SHA512 41dea60c08882a8f8f9024eb2285c30dbbc68e2256ed6afd5bf956a1828239128b2f39b4ce733a438eafe3b2324ff06dec5c1eb7c9b0f838b2daa972f587d909
+DIST julia-Pkg-05fa7f93f73afdabd251247d03144de9f7b36b50.tar.gz 388550 BLAKE2B ec248dbd06a25014905b55cbd6ca55ef245d09b15d4a9b78ec98fd6fe59b318047914698ece8ef85b6a161f115a227ee5346c5f1698bcb74174bca77dbde9968 SHA512 8f1660e55bd8730ab816109fe802edd14c2ab46aed0db7f04e520b371a9f7296c3ab85d42af64174b0989fa55bb089b1450dcee28e67dbb996471235dbba35c1
DIST julia-Pkg-49908bffe83790bc7cf3c5d46faf3667f8902ad4.tar.gz 389738 BLAKE2B 1ed9201badf0a1db5142e0566bfe085b364e4681670937ac5fa53c15312ff8eb29d5e783b75fe3f4f379b041ba38c66ce94962fa7d98fcfd0b7b49acd1749d69 SHA512 a85aa80b3080794a8e3ae5ce54856e63457c461659c12fde5dde1b5ec33176ea06af49ee516d01ccd7b78d8358de2fe0ffcd5c6a6d5a5088cdcd76a0133780eb
DIST julia-UnicodeData-13.0.0.txt 1851767 BLAKE2B 72bbcf352f2f6a004abb3f351fe5da160e83644feea8de0ca154b5a1aa78f36cb04b252d0c7b64a5eeca388e600b2875bb76bc2746ee799a1a6eff97c1fe8b06 SHA512 1a4a662e2ab33469976bf5f91aa6933ed9b73f6d4179a2daffb349e1869d7d6cfa885b164e82d15dcdad7458cd451c81add58d875eb0c70de854589dc97b2055
DIST julia-dsfmt-2.2.3.tar.gz 291773 BLAKE2B 6ffae90494d72527920c80fc0fb005da1c7b84f8a03a7ecb0789434c0fff97359e5098e85431896dffccc7d5148c414e847aaba5feef648b8788421a466ff65e SHA512 6d8ddcd01aab3f9039f4f0288a8af53e290cc2f293ed8c4a8c9f3b3f12398e7eedfce8016117b425766ba89c61c86c13b3e420035b5f9bf91315b8b814c03662
+DIST julia-dsfmt-2.2.4.tar.gz 4984255 BLAKE2B 6119445d93cb45faab28dfb52a18c07cd5703b243b3cddde35fff7a5e948fa8788dfe8428ae8e0a52604f91ac07fe7b3bb0f6c438ef93b5257b42baee9dfdec5 SHA512 fe84e986cbf198172340adfac0436b08f087643eca3f1ceccacde146cbfd8c41e3eb0dfbb062f7ca5f462db13c386abd7c269bc0cbefc9a0ecf97a8a8870a2e4
DIST julia-libuv-1fcc6d66f9df74189c74d3d390f02202bb7db953.tar.gz 1590342 BLAKE2B eca658f74421587aec78cb38f5a712033afb072e6425a6ce28fd5d4bac61e41cacbd5a850c1f2b29c386b944d1d9c4f16b7d090f7d2dd6b963b5dbc94ae18981 SHA512 70b0c738a60b4e476750b7de8d120e735359e2c36fcb3a8a38628a0ae326210ed3b15d793dfd5443d7aa5603e83e7d99f567aa4c1696846d950df9f83648669c
DIST julia-libuv-35b1504507a7a4168caae3d78db54d1121b121e1.tar.gz 1577394 BLAKE2B 8ab36f781619f710a64ddc6cf257a4c2f6d27ac22e33ed6f184902d0c6cc3a3941254e0a825071fcd57f869e3ccc5eaf71856539cf6b484358d5aafe383000a9 SHA512 5932e9105346e952fd0f51f79898e5b9c993261ec1558408437647ab3b3ce282562f1e0a16db5704cb66e7aa7a4c6a75dd7f0da498a98b1b6af48da88b4869f0
+DIST julia-libuv-fb3e3364c33ae48c827f6b103e05c3f0e78b79a9.tar.gz 1643008 BLAKE2B b2a121e0b94cd1f5d40e292fc2356e8940bf8dfe1e6a200b50caf60def1982b705d1d42dd234e9e8b0aa70439bf34a5bce71761424623cbfcd20c9131ce09c25 SHA512 29947c236aef8931be4767df1cd8404ee9b036ee107b31cbce6fad9a97743df57d068b15bc4bd00320b9b81cd879258a9ec9dc675853e424ccdb8d6bdd226240
DIST julia-libwhich-81e9723c0273d78493dc8c8ed570f68d9ce7e89e.tar.gz 4183 BLAKE2B c932e23b1b476d3fd16cf6f451efd5fc6d9c1ec2c53e8ac086340a100817d9b30dae3eff50b284a42c09b2bbae30b9e2fd38b2881f8cbf4974a89f3bd0c87599 SHA512 6fb77b715d70d9bc95a8546c3bf97bd3677c7ea344b88bb5bc3bbfac9dceabe8a8cde7a0f64dec884cde802e4a3000e30837d3f824b5a9242348c4fe061526a3
DIST julia-utf8proc-0890a538bf8238cded9be0c81171f57e43f2c755.tar.gz 155521 BLAKE2B 32dc1a8fb641e89057d317e579f1802b7f7dfbdbea7f91c01b282b9a88c2fc6143743d5e45f46d6d465857cfe1b28bd39e9a0da19e80516536c57cb62b139d27 SHA512 95d6dba2bbdfc5003f6d21fd02c926c7db9661895010041aacee55fa11dc2524bcffaa90965e2a9a8f2a9e49e93ec7572d6a4de6d5d9f9e075b787537864ea20
+DIST julia-utf8proc-3203baa7374d67132384e2830b2183c92351bffc.tar.gz 182914 BLAKE2B 73ebddea183a5993528b1671d365520bea5087e169c79dde33d225cd19af6daa43624acf1afa52da1fd22cd155819e0497830740d70387d10a94de0397c1f5c0 SHA512 912d51e5c2daf80865e862daba2971e3a77b224d40179225d5908385d2f7f543a92cd2d9b6cecacfab185d8bd8f2732cad7a9d217f25f1e10a77083fda74f0b5
+DIST llvm-11.0.1.src.tar.xz 38914796 BLAKE2B ccdec0632c9cf5fae8e6947c266136e04dc8c609e2ca9c1efb1205767d9181301e0de14601d11e2f27ec0ebc0749858a5f1089d8a40a9ae3f22582cbf6abef6e SHA512 b42c67ef88e09dd94171f85cdf49a421a15cfc82ff715c7ce6de22f98cefbe6c7cdf6bf4af7ca017d56ecf6aa3e36df3d823a78cf2dd5312de4301b54b43dbe8
DIST llvm-9.0.1.src.tar.xz 33035112 BLAKE2B 5ae7ac42507cb14983eec0785dfc9b9c788cae75d5493ddf6734da55d3733cc90e35634aa39aa536654d4b68c3ccb7c2f989746f21c634c8989a57d9d32a15b2 SHA512 bfb6960a4dd1e18f4005f324f478a781c69e8ec7c20569d9b243fcb9372dc7733b254f26c683373537990cc9c109c78eaf0f65449629ee17caca1bce9b9ccccd
diff --git a/dev-lang/julia/files/julia-1.6.0-fix_build_system.patch b/dev-lang/julia/files/julia-1.6.0-fix_build_system.patch
new file mode 100644
index 00000000000..2a3d9762ce8
--- /dev/null
+++ b/dev-lang/julia/files/julia-1.6.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
+-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
+-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
+-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.6.0.ebuild b/dev-lang/julia/julia-1.6.0.ebuild
new file mode 100644
index 00000000000..b6b3aa64075
--- /dev/null
+++ b/dev-lang/julia/julia-1.6.0.ebuild
@@ -0,0 +1,216 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit llvm pax-utils toolchain-funcs
+
+# correct versions for stdlibs are in deps/checksums
+# for everything else, run with network-sandbox and wait for the crash
+
+MY_PV="${PV//_rc/-rc}"
+MY_DSFMT_V="2.2.4"
+MY_LIBUV_V="fb3e3364c33ae48c827f6b103e05c3f0e78b79a9"
+MY_LIBWHICH_V="81e9723c0273d78493dc8c8ed570f68d9ce7e89e"
+MY_LLVM_V="11.0.1"
+MY_PKG_V="05fa7f93f73afdabd251247d03144de9f7b36b50"
+MY_UNICODE_V="13.0.0"
+MY_UTF8PROC_V="3203baa7374d67132384e2830b2183c92351bffc"
+
+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
+ https://github.com/MersenneTwister-Lab/dSFMT/archive/v${MY_DSFMT_V}.tar.gz -> ${PN}-dsfmt-${MY_DSFMT_V}.tar.gz
+ http://www.unicode.org/Public/${MY_UNICODE_V}/ucd/UnicodeData.txt -> ${PN}-UnicodeData-${MY_UNICODE_V}.txt
+ https://dev.gentoo.org/~patrick/Pkg-${MY_PKG_V}.tar.gz -> ${PN}-Pkg-${MY_PKG_V}.tar.gz
+ !system-llvm? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-${MY_LLVM_V}/llvm-${MY_LLVM_V}.src.tar.xz )
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="system-llvm"
+
+RDEPEND="
+ system-llvm? ( sys-devel/llvm:11=[llvm_targets_NVPTX(-)] )
+ !system-llvm? ( dev-util/cmake )
+"
+LLVM_MAX_SLOT=11
+
+# Silence some QA warnings. The julia build system does not use user
+# defined CFLAGS for some of the generated binary modules.
+QA_FLAGS_IGNORED='.*'
+
+RDEPEND+="
+ dev-libs/double-conversion:0=
+ dev-libs/gmp:0=
+ dev-libs/libgit2:0
+ >=dev-libs/libpcre2-10.23:0=[jit,unicode]
+ dev-libs/mpfr:0=
+ dev-libs/openspecfun
+ net-libs/libssh2
+ >=net-libs/mbedtls-2.2
+ 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=
+ sci-mathematics/z3
+ >=sys-libs/libunwind-1.1:0=
+ sys-libs/readline:0=
+ sys-libs/zlib:0=
+ >=virtual/blas-3.6
+ virtual/lapack"
+
+DEPEND="${RDEPEND}
+ dev-util/patchelf
+ virtual/pkgconfig"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.6.0-fix_build_system.patch
+ "${FILESDIR}"/${PN}-1.1.0-fix_llvm_install.patch
+ "${FILESDIR}"/${PN}-1.4.0-no_symlink_llvm.patch
+)
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+pkg_setup() {
+ use system-llvm && llvm_pkg_setup
+}
+
+src_unpack() {
+ tounpack=(${A})
+ # the main source tree, followed by deps
+ unpack "${A/%\ */}"
+
+ mkdir -p "${S}/deps/srccache/"
+ for i in "${tounpack[@]:1}"; do
+ if [[ $i == *Pkg* ]] || [[ $i = *Statistics* ]]; then
+ # Bundled Pkg and Statistics packages go into ./stdlib
+ local tarball="${i#julia-}"
+ cp "${DISTDIR}/${i}" "${S}/stdlib/srccache/${tarball}" || die
+ # and we have to fix up the sha1sum
+ local name="${tarball%-*}"
+ local sha1="${tarball#*-}"
+ sha1="${sha1%.tar*}"
+ einfo "using patched stdlib package \"${name}\""
+ sed -i -e "s/PKG_SHA1 = .*/PKG_SHA1 = ${sha1}/" "${S}/stdlib/Pkg.version" || die
+ else
+ cp "${DISTDIR}/${i}" "${S}/deps/srccache/${i#julia-}" || die
+ fi
+ done
+}
+
+src_prepare() {
+ default
+
+ # Sledgehammer:
+ # - prevent fetching of bundled stuff in compile and install phase
+ # - respect CFLAGS
+ # - respect EPREFIX and Gentoo specific paths
+
+ sed -i \
+ -e "s|GENTOOCFLAGS|${CFLAGS}|g" \
+ -e "s|/usr/include|${EPREFIX}/usr/include|g" \
+ deps/Makefile || die
+
+ sed -i \
+ -e "s|GENTOOCFLAGS|${CFLAGS}|g" \
+ -e "s|GENTOOLIBDIR|$(get_libdir)|" \
+ 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
+
+ # now using sha512 additionally, so need to recreate checksum -
+ sha512sum "${S}/stdlib/srccache/Pkg-${MY_PKG_V}.tar.gz" | awk '{ print $1; }' > "${S}/deps/checksums/Pkg-${MY_PKG_V}.tar.gz/sha512" || die
+}
+
+src_configure() {
+ # julia does not play well with the system versions of dsfmt, libuv,
+ # and utf8proc
+
+ use system-llvm && ewarn "You have enabled system-llvm. This is unsupported by upstream and may not work."
+
+ # USE_SYSTEM_LIBM=0 implies using external openlibm
+ cat <<-EOF > Make.user
+ USE_BINARYBUILDER:=0
+ USE_SYSTEM_LLVM:=$(usex system-llvm 1 0)
+ USE_SYSTEM_LIBUNWIND:=1
+ USE_SYSTEM_PCRE:=1
+ USE_SYSTEM_LIBM:=0
+ USE_SYSTEM_OPENLIBM:=1
+ USE_SYSTEM_DSFMT:=0
+ USE_SYSTEM_BLAS:=1
+ USE_SYSTEM_LAPACK:=1
+ USE_SYSTEM_GMP:=1
+ USE_SYSTEM_MPFR:=1
+ USE_SYSTEM_SUITESPARSE:=1
+ USE_SYSTEM_LIBUV:=0
+ USE_SYSTEM_UTF8PROC:=0
+ USE_SYSTEM_MBEDTLS:=1
+ USE_SYSTEM_LIBSSH2:=1
+ USE_SYSTEM_CURL:=1
+ USE_SYSTEM_LIBGIT2:=1
+ USE_SYSTEM_PATCHELF:=1
+ USE_SYSTEM_ZLIB:=1
+ USE_SYSTEM_P7ZIP:=1
+ VERBOSE=1
+ libdir="${EROOT}/usr/$(get_libdir)"
+ EOF
+}
+
+src_compile() {
+
+ # Julia accesses /proc/self/mem on Linux
+ addpredict /proc/self/mem
+
+ emake \
+ prefix="${EPREFIX}/usr" DESTDIR="${D}" \
+ CC="$(tc-getCC)" CXX="$(tc-getCXX)" AR="$(tc-getAR)"
+ pax-mark m "$(file usr/bin/julia-* | awk -F : '/ELF/ {print $1}')"
+}
+
+src_install() {
+ emake install \
+ prefix="${EPREFIX}/usr" DESTDIR="${D}" \
+ CC="$(tc-getCC)" CXX="$(tc-getCXX)" AR="$(tc-getAR)" \
+ BUNDLE_DEBUG_LIBS=0
+
+ if ! use system-llvm ; then
+ cp "${S}/usr/lib/libLLVM"-?jl.so "${ED}/usr/$(get_libdir)/julia/" || die
+ fi
+
+ 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
+
+ # The appdata directory is deprecated.
+ mv "${ED}"/usr/share/{appdata,metainfo}/ || die
+}
+
+pkg_postinst() {
+ elog "To use Plots, you will need to install sci-visualization/gr."
+}
^ permalink raw reply related [flat|nested] 24+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-lang/julia/, dev-lang/julia/files/
@ 2019-01-07 21:38 Matthias Maier
0 siblings, 0 replies; 24+ messages in thread
From: Matthias Maier @ 2019-01-07 21:38 UTC (permalink / raw
To: gentoo-commits
commit: 5f93ba7b799fe4eaeb61cb315afe29595470382a
Author: Matthias Maier <tamiko <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 7 20:32:43 2019 +0000
Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org>
CommitDate: Mon Jan 7 21:35:28 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f93ba7b
dev-lang/julia: drop old version 1.0.0
Package-Manager: Portage-2.3.54, Repoman-2.3.12
Signed-off-by: Matthias Maier <tamiko <AT> gentoo.org>
dev-lang/julia/Manifest | 1 -
.../julia/files/julia-1.0.0-fix_build_system.patch | 86 ---------
dev-lang/julia/julia-1.0.1.ebuild | 201 ---------------------
3 files changed, 288 deletions(-)
diff --git a/dev-lang/julia/Manifest b/dev-lang/julia/Manifest
index b0c5dfe9bbf..860188c463e 100644
--- a/dev-lang/julia/Manifest
+++ b/dev-lang/julia/Manifest
@@ -1,7 +1,6 @@
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-0.7.0.tar.gz 7547849 BLAKE2B 6721e980a5fd84f1a28838a91acdd95e8562dd971903e30776dfb90a6cc0ac1ffbedd22c2bfee45bd2fa616adead82680ebe30f9b86a1d968db2353233b32bc2 SHA512 296dbc71fe5238b0cbdc5c67f7002fbf05abea85dc4298784d74fbfef1c96890ab9cc1bbe874337c01f39ca08a6022f6abcde3a5e2ff1cdc25f2f7493ead1804
-DIST julia-1.0.1.tar.gz 7382328 BLAKE2B 61ff64298f3740fb50a2cb9c5561e1d4594eea8edbecc4fde9771807be22f753b6c606a530eea9bf569aaccbb4c4a39664ba5d08793d8e127d0988cf7b0244f8 SHA512 41ca8c0280c4914e43f5a37ed09ce47174f991e3079703a705081265509d22cd6cb66a928dc1c41d473a3d8cc59bb6f74e25e3a960e828d6e469d85a8db58c18
DIST julia-1.0.3.tar.gz 7460268 BLAKE2B d9d42e0235f249fa8c1ced12c659091b97d338ec4a4662ea13ea6a107cb59e90d8385c51962199e47dae5f9770156be2db2d8bb2e3cc8f42aa7403b4f4ca7f04 SHA512 b61399c7b7ffae828264a6ec916b409b2cbc6b3b98d9a6d39b60b014a97a1f1ad75e1ed4860d9ab15d1e5ffec691c04d1b797c238953290770b7313790ae3f1d
DIST julia-dsfmt-2.2.3.tar.gz 291773 BLAKE2B 6ffae90494d72527920c80fc0fb005da1c7b84f8a03a7ecb0789434c0fff97359e5098e85431896dffccc7d5148c414e847aaba5feef648b8788421a466ff65e SHA512 6d8ddcd01aab3f9039f4f0288a8af53e290cc2f293ed8c4a8c9f3b3f12398e7eedfce8016117b425766ba89c61c86c13b3e420035b5f9bf91315b8b814c03662
DIST julia-libuv-ed3700c849289ed01fe04273a7bf865340b2bd7e.tar.gz 1492695 BLAKE2B ad03512dd1db2c7066b46b5a3a314645b925481d8ace09ac0a0ae23cf5b8a64338ad457f8df229aa82f1d45605b5366883f563f2e22756ce28bb6fb7607d7124 SHA512 1305035b1372bdf234e3c5e673ee4c8ab5bda83ff06bc27704786def52667c3143fe587fca8f6e0855ba0c8b6d4dd90b2faefd33736224173f459d751885683e
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
deleted file mode 100644
index 028a2f7e08c..00000000000
--- a/dev-lang/julia/files/julia-1.0.0-fix_build_system.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-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/julia-1.0.1.ebuild b/dev-lang/julia/julia-1.0.1.ebuild
deleted file mode 100644
index 6f417285d13..00000000000
--- a/dev-lang/julia/julia-1.0.1.ebuild
+++ /dev/null
@@ -1,201 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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://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}/${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-6*:=
- =sys-devel/clang-6*:="
-LLVM_MAX_SLOT=6
-
-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_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:=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)"
- 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 "whatyoudoing@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/html "${ED}"/usr/share/doc/${PF} || die
- rmdir "${ED}"/usr/share/doc/julia || die
-}
^ permalink raw reply related [flat|nested] 24+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-lang/julia/, dev-lang/julia/files/
@ 2019-01-07 21:38 Matthias Maier
0 siblings, 0 replies; 24+ messages in thread
From: Matthias Maier @ 2019-01-07 21:38 UTC (permalink / raw
To: gentoo-commits
commit: c0cd790ea098aa3e787013d2cd7bb42af059ae81
Author: Matthias Maier <tamiko <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 7 20:37:22 2019 +0000
Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org>
CommitDate: Mon Jan 7 21:35:30 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c0cd790e
dev-lang/julia: drop old 0.6* and 0.7 versions
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-0.6.3-fix_build_system.patch | 96 ----------
.../julia/files/julia-0.7.0-fix_build_system.patch | 86 ---------
dev-lang/julia/julia-0.6.3-r1.ebuild | 189 -------------------
dev-lang/julia/julia-0.7.0.ebuild | 201 ---------------------
5 files changed, 575 deletions(-)
diff --git a/dev-lang/julia/Manifest b/dev-lang/julia/Manifest
index 860188c463e..41854360be4 100644
--- a/dev-lang/julia/Manifest
+++ b/dev-lang/julia/Manifest
@@ -1,6 +1,3 @@
-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-0.7.0.tar.gz 7547849 BLAKE2B 6721e980a5fd84f1a28838a91acdd95e8562dd971903e30776dfb90a6cc0ac1ffbedd22c2bfee45bd2fa616adead82680ebe30f9b86a1d968db2353233b32bc2 SHA512 296dbc71fe5238b0cbdc5c67f7002fbf05abea85dc4298784d74fbfef1c96890ab9cc1bbe874337c01f39ca08a6022f6abcde3a5e2ff1cdc25f2f7493ead1804
DIST julia-1.0.3.tar.gz 7460268 BLAKE2B d9d42e0235f249fa8c1ced12c659091b97d338ec4a4662ea13ea6a107cb59e90d8385c51962199e47dae5f9770156be2db2d8bb2e3cc8f42aa7403b4f4ca7f04 SHA512 b61399c7b7ffae828264a6ec916b409b2cbc6b3b98d9a6d39b60b014a97a1f1ad75e1ed4860d9ab15d1e5ffec691c04d1b797c238953290770b7313790ae3f1d
DIST julia-dsfmt-2.2.3.tar.gz 291773 BLAKE2B 6ffae90494d72527920c80fc0fb005da1c7b84f8a03a7ecb0789434c0fff97359e5098e85431896dffccc7d5148c414e847aaba5feef648b8788421a466ff65e SHA512 6d8ddcd01aab3f9039f4f0288a8af53e290cc2f293ed8c4a8c9f3b3f12398e7eedfce8016117b425766ba89c61c86c13b3e420035b5f9bf91315b8b814c03662
DIST julia-libuv-ed3700c849289ed01fe04273a7bf865340b2bd7e.tar.gz 1492695 BLAKE2B ad03512dd1db2c7066b46b5a3a314645b925481d8ace09ac0a0ae23cf5b8a64338ad457f8df229aa82f1d45605b5366883f563f2e22756ce28bb6fb7607d7124 SHA512 1305035b1372bdf234e3c5e673ee4c8ab5bda83ff06bc27704786def52667c3143fe587fca8f6e0855ba0c8b6d4dd90b2faefd33736224173f459d751885683e
diff --git a/dev-lang/julia/files/julia-0.6.3-fix_build_system.patch b/dev-lang/julia/files/julia-0.6.3-fix_build_system.patch
deleted file mode 100644
index 41e64672adf..00000000000
--- a/dev-lang/julia/files/julia-0.6.3-fix_build_system.patch
+++ /dev/null
@@ -1,96 +0,0 @@
-diff --git a/Make.inc b/Make.inc
-index 7f3a37c..3560d93 100644
---- a/Make.inc
-+++ b/Make.inc
-@@ -180,7 +180,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
-@@ -400,7 +400,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)
-@@ -411,7 +411,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
-@@ -440,7 +440,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/deps/tools/jldownload b/deps/tools/jldownload
-index ab4fd69..e2c2408 100755
---- a/deps/tools/jldownload
-+++ b/deps/tools/jldownload
-@@ -5,9 +5,9 @@
-
- CACHE_HOST=https://cache.julialang.org
-
--WGET=$(which wget 2>/dev/null)
--CURL=$(which curl 2>/dev/null)
--FETCH=$(which fetch 2>/dev/null)
-+WGET=/bin/true
-+CURL=/bin/true
-+FETCH=/bin/true
-
- TIMEOUT=15 # seconds
- WGET_OPTS="--no-check-certificate --tries=1 --timeout=$TIMEOUT"
-diff --git a/doc/Makefile b/doc/Makefile
-index 743804d..e06dde0 100644
---- a/doc/Makefile
-+++ b/doc/Makefile
-@@ -25,7 +25,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 9fde74d..e01ab2e 100644
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -85,20 +85,8 @@ PUBLIC_HEADER_TARGETS := $(addprefix $(build_includedir)/julia/,$(notdir $(PUBLI
-
- # 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
--ifeq ($(LLVM_USE_CMAKE),1)
--LLVMLINK += $(shell $(LLVM_CONFIG_HOST) --ldflags) -lLLVM
--else
--ifeq ($(OS),WINNT)
--LLVMLINK += $(shell $(LLVM_CONFIG_HOST) --ldflags) -lLLVM-$(LLVM_VER_SHORT)
--else
--LLVMLINK += $(shell $(LLVM_CONFIG_HOST) --ldflags) -lLLVM-$(shell $(LLVM_CONFIG_HOST) --version)
--endif # OS == WINNT
--endif # LLVM_USE_CMAKE == 1
-+LLVMLINK = $(call exec,$(LLVM_CONFIG) --ldflags) $(call exec,$(LLVM_CONFIG) --libs) $(call exec,$(LLVM_CONFIG) --ldflags) $(call exec,$(LLVM_CONFIG) --system-libs)
- FLAGS += -DLLVM_SHLIB
--endif # USE_LLVM_SHLIB == 1
-
- 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/files/julia-0.7.0-fix_build_system.patch b/dev-lang/julia/files/julia-0.7.0-fix_build_system.patch
deleted file mode 100644
index 028a2f7e08c..00000000000
--- a/dev-lang/julia/files/julia-0.7.0-fix_build_system.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-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/julia-0.6.3-r1.ebuild b/dev-lang/julia/julia-0.6.3-r1.ebuild
deleted file mode 100644
index a473e066f88..00000000000
--- a/dev-lang/julia/julia-0.6.3-r1.ebuild
+++ /dev/null
@@ -1,189 +0,0 @@
-# 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=""
-
-# julia 0.6* is compatible with llvm-4
-RDEPEND="
- sys-devel/llvm:4=
- sys-devel/clang:4="
-LLVM_MAX_SLOT=4
-
-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}-0.6.3-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=1
- 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
- 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 "whatyoudoing@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
-}
diff --git a/dev-lang/julia/julia-0.7.0.ebuild b/dev-lang/julia/julia-0.7.0.ebuild
deleted file mode 100644
index f7b451ce750..00000000000
--- a/dev-lang/julia/julia-0.7.0.ebuild
+++ /dev/null
@@ -1,201 +0,0 @@
-# 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
-
-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://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}/${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-6*:=
- =sys-devel/clang-6*:="
-LLVM_MAX_SLOT=6
-
-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_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:=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)"
- 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 "whatyoudoing@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/html "${ED}"/usr/share/doc/${PF} || die
- rmdir "${ED}"/usr/share/doc/julia || die
-}
^ permalink raw reply related [flat|nested] 24+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-lang/julia/, dev-lang/julia/files/
@ 2018-09-04 1:20 Matthias Maier
0 siblings, 0 replies; 24+ messages in thread
From: Matthias Maier @ 2018-09-04 1:20 UTC (permalink / raw
To: gentoo-commits
commit: f5e9b648beabb30f0eefb2bf9ce72e3a8e89a927
Author: Matthias Maier <tamiko <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 3 22:21:33 2018 +0000
Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org>
CommitDate: Tue Sep 4 01:19:52 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f5e9b648
dev-lang/julia: Update ebuild
Closes: https://github.com/gentoo/gentoo/pull/9553
Package-Manager: Portage-2.3.48, Repoman-2.3.10
dev-lang/julia/Manifest | 5 +-
...em.patch => julia-0.7.0-fix_build_system.patch} | 27 ++++--
.../julia/files/julia-1.0.0-fix_build_system.patch | 27 ++++--
dev-lang/julia/julia-1.0.0.ebuild | 96 +++++++++++-----------
4 files changed, 90 insertions(+), 65 deletions(-)
diff --git a/dev-lang/julia/Manifest b/dev-lang/julia/Manifest
index 88b87cdcf4b..04afe500355 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-1.0.0-fix_build_system.patch b/dev-lang/julia/files/julia-0.7.0-fix_build_system.patch
similarity index 80%
copy from dev-lang/julia/files/julia-1.0.0-fix_build_system.patch
copy to dev-lang/julia/files/julia-0.7.0-fix_build_system.patch
index 1ed19d6e06e..028a2f7e08c 100644
--- a/dev-lang/julia/files/julia-1.0.0-fix_build_system.patch
+++ b/dev-lang/julia/files/julia-0.7.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/files/julia-1.0.0-fix_build_system.patch b/dev-lang/julia/files/julia-1.0.0-fix_build_system.patch
index 1ed19d6e06e..028a2f7e08c 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 7d03d2d0b87..f7b451ce750 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
}
^ permalink raw reply related [flat|nested] 24+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-lang/julia/, dev-lang/julia/files/
@ 2018-07-01 4:49 Matthias Maier
0 siblings, 0 replies; 24+ messages in thread
From: Matthias Maier @ 2018-07-01 4:49 UTC (permalink / raw
To: gentoo-commits
commit: 122adfb9f7de4b84dc705470092a35ea6563f4ce
Author: Matthias Maier <tamiko <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 1 04:37:53 2018 +0000
Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org>
CommitDate: Sun Jul 1 04:49:08 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=122adfb9
dev-lang/julia: update live ebuild
Package-Manager: Portage-2.3.41, Repoman-2.3.9
.../julia/files/julia-9999-fix_build_system.patch | 29 +++++++++++++++-------
dev-lang/julia/julia-9999.ebuild | 14 ++---------
2 files changed, 22 insertions(+), 21 deletions(-)
diff --git a/dev-lang/julia/files/julia-9999-fix_build_system.patch b/dev-lang/julia/files/julia-9999-fix_build_system.patch
index d7866f46b3e..336d6e3e590 100644
--- a/dev-lang/julia/files/julia-9999-fix_build_system.patch
+++ b/dev-lang/julia/files/julia-9999-fix_build_system.patch
@@ -1,8 +1,17 @@
diff --git a/Make.inc b/Make.inc
-index e77681669..bc17c6fd0 100644
+index 8cb2c1014..d3be9de8e 100644
--- a/Make.inc
+++ b/Make.inc
-@@ -399,7 +399,7 @@ ifneq ($(OS), WINNT)
+@@ -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
@@ -11,7 +20,7 @@ index e77681669..bc17c6fd0 100644
endif
ifeq ($(USECLANG),1)
-@@ -410,7 +410,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
@@ -20,7 +29,7 @@ index e77681669..bc17c6fd0 100644
ifeq ($(OS), Darwin)
ifeq ($(USE_LIBCPP), 1)
MACOSX_VERSION_MIN := 10.8
-@@ -439,7 +439,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
@@ -30,10 +39,10 @@ index e77681669..bc17c6fd0 100644
ifeq ($(USECCACHE), 1)
diff --git a/doc/Makefile b/doc/Makefile
-index 743804d8b..e06dde030 100644
+index 89b79880d..c3125fde1 100644
--- a/doc/Makefile
+++ b/doc/Makefile
-@@ -25,7 +25,7 @@ deps: UnicodeData.txt
+@@ -29,7 +29,7 @@ deps: UnicodeData.txt
$(JLCHECKSUM) UnicodeData.txt
clean:
@@ -43,13 +52,14 @@ index 743804d8b..e06dde030 100644
cleanall: clean
diff --git a/src/Makefile b/src/Makefile
-index d3ff98900..9c4d889b4 100644
+index 257152d24..240a4a350 100644
--- a/src/Makefile
+++ b/src/Makefile
-@@ -87,14 +87,7 @@ PUBLIC_HEADERS += $(LIBUV_INC)/uv*
+@@ -85,16 +85,7 @@ UV_HEADERS += uv/*.h
endif
- PUBLIC_HEADER_TARGETS := $(addprefix $(build_includedir)/julia/,$(notdir $(PUBLIC_HEADERS)))
+ 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)
@@ -58,6 +68,7 @@ index d3ff98900..9c4d889b4 100644
-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)
diff --git a/dev-lang/julia/julia-9999.ebuild b/dev-lang/julia/julia-9999.ebuild
index 8e0c10fd426..ee966c94ec4 100644
--- a/dev-lang/julia/julia-9999.ebuild
+++ b/dev-lang/julia/julia-9999.ebuild
@@ -51,9 +51,7 @@ PATCHES=(
)
src_prepare() {
- epatch "${PATCHES[@]}"
-
- eapply_user
+ default
# Sledgehammer:
# - respect CFLAGS
@@ -73,12 +71,8 @@ src_prepare() {
liblapack="lib${liblapack#-l}"
sed -i \
- -e "s|\(JULIA_EXECUTABLE = \)\(\$(JULIAHOME)/julia\)|\1 LD_LIBRARY_PATH=\$(BUILD)/$(get_libdir) \2|" \
-e "s|GENTOOCFLAGS|${CFLAGS}|g" \
- -e "s|LIBDIR = lib|LIBDIR = $(get_libdir)|" \
- -e "s|/usr/lib|${EPREFIX}/usr/$(get_libdir)|" \
- -e "s|/usr/include|${EPREFIX}/usr/include|" \
- -e "s|\$(BUILD)/lib|\$(BUILD)/$(get_libdir)|" \
+ -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}|" \
@@ -164,8 +158,4 @@ src_install() {
mv "${ED}"/usr/share/doc/julia/{examples,html} \
"${ED}"/usr/share/doc/${PF} || die
rmdir "${ED}"/usr/share/doc/julia || die
- if [[ $(get_libdir) != lib ]]; then
- mkdir -p "${ED}"/usr/$(get_libdir) || die
- mv "${ED}"/usr/lib/julia "${ED}"/usr/$(get_libdir)/julia || die
- fi
}
^ permalink raw reply related [flat|nested] 24+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-lang/julia/, dev-lang/julia/files/
@ 2018-07-01 4:49 Matthias Maier
0 siblings, 0 replies; 24+ messages in thread
From: Matthias Maier @ 2018-07-01 4:49 UTC (permalink / raw
To: gentoo-commits
commit: 590f14b4730f928ab7773f8d7ad5d8bf1a12817c
Author: Matthias Maier <tamiko <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 1 04:32:31 2018 +0000
Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org>
CommitDate: Sun Jul 1 04:49:04 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=590f14b4
dev-lang/julia: fix library installation path
Closes: https://bugs.gentoo.org/655072
Package-Manager: Portage-2.3.41, Repoman-2.3.9
.../julia/files/julia-0.6.3-fix_build_system.patch | 96 ++++++++++++++++++++++
.../{julia-0.6.3.ebuild => julia-0.6.3-r1.ebuild} | 12 +--
2 files changed, 98 insertions(+), 10 deletions(-)
diff --git a/dev-lang/julia/files/julia-0.6.3-fix_build_system.patch b/dev-lang/julia/files/julia-0.6.3-fix_build_system.patch
new file mode 100644
index 00000000000..41e64672adf
--- /dev/null
+++ b/dev-lang/julia/files/julia-0.6.3-fix_build_system.patch
@@ -0,0 +1,96 @@
+diff --git a/Make.inc b/Make.inc
+index 7f3a37c..3560d93 100644
+--- a/Make.inc
++++ b/Make.inc
+@@ -180,7 +180,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
+@@ -400,7 +400,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)
+@@ -411,7 +411,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
+@@ -440,7 +440,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/deps/tools/jldownload b/deps/tools/jldownload
+index ab4fd69..e2c2408 100755
+--- a/deps/tools/jldownload
++++ b/deps/tools/jldownload
+@@ -5,9 +5,9 @@
+
+ CACHE_HOST=https://cache.julialang.org
+
+-WGET=$(which wget 2>/dev/null)
+-CURL=$(which curl 2>/dev/null)
+-FETCH=$(which fetch 2>/dev/null)
++WGET=/bin/true
++CURL=/bin/true
++FETCH=/bin/true
+
+ TIMEOUT=15 # seconds
+ WGET_OPTS="--no-check-certificate --tries=1 --timeout=$TIMEOUT"
+diff --git a/doc/Makefile b/doc/Makefile
+index 743804d..e06dde0 100644
+--- a/doc/Makefile
++++ b/doc/Makefile
+@@ -25,7 +25,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 9fde74d..e01ab2e 100644
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -85,20 +85,8 @@ PUBLIC_HEADER_TARGETS := $(addprefix $(build_includedir)/julia/,$(notdir $(PUBLI
+
+ # 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
+-ifeq ($(LLVM_USE_CMAKE),1)
+-LLVMLINK += $(shell $(LLVM_CONFIG_HOST) --ldflags) -lLLVM
+-else
+-ifeq ($(OS),WINNT)
+-LLVMLINK += $(shell $(LLVM_CONFIG_HOST) --ldflags) -lLLVM-$(LLVM_VER_SHORT)
+-else
+-LLVMLINK += $(shell $(LLVM_CONFIG_HOST) --ldflags) -lLLVM-$(shell $(LLVM_CONFIG_HOST) --version)
+-endif # OS == WINNT
+-endif # LLVM_USE_CMAKE == 1
++LLVMLINK = $(call exec,$(LLVM_CONFIG) --ldflags) $(call exec,$(LLVM_CONFIG) --libs) $(call exec,$(LLVM_CONFIG) --ldflags) $(call exec,$(LLVM_CONFIG) --system-libs)
+ FLAGS += -DLLVM_SHLIB
+-endif # USE_LLVM_SHLIB == 1
+
+ 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-0.6.3.ebuild b/dev-lang/julia/julia-0.6.3-r1.ebuild
similarity index 89%
rename from dev-lang/julia/julia-0.6.3.ebuild
rename to dev-lang/julia/julia-0.6.3-r1.ebuild
index ba814f62191..163fa629a20 100644
--- a/dev-lang/julia/julia-0.6.3.ebuild
+++ b/dev-lang/julia/julia-0.6.3-r1.ebuild
@@ -54,7 +54,7 @@ DEPEND="${RDEPEND}
virtual/pkgconfig"
PATCHES=(
- "${FILESDIR}"/${PN}-0.6.0-fix_build_system.patch
+ "${FILESDIR}"/${PN}-0.6.3-fix_build_system.patch
)
src_prepare() {
@@ -85,12 +85,8 @@ src_prepare() {
liblapack="lib${liblapack#-l}"
sed -i \
- -e "s|\(JULIA_EXECUTABLE = \)\(\$(JULIAHOME)/julia\)|\1 LD_LIBRARY_PATH=\$(BUILD)/$(get_libdir) \2|" \
-e "s|GENTOOCFLAGS|${CFLAGS}|g" \
- -e "s|LIBDIR = lib|LIBDIR = $(get_libdir)|" \
- -e "s|/usr/lib|${EPREFIX}/usr/$(get_libdir)|" \
- -e "s|/usr/include|${EPREFIX}/usr/include|" \
- -e "s|\$(BUILD)/lib|\$(BUILD)/$(get_libdir)|" \
+ -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}|" \
@@ -187,8 +183,4 @@ src_install() {
mv "${ED}"/usr/share/doc/julia/{examples,html} \
"${ED}"/usr/share/doc/${PF} || die
rmdir "${ED}"/usr/share/doc/julia || die
- if [[ $(get_libdir) != lib ]]; then
- mkdir -p "${ED}"/usr/$(get_libdir) || die
- mv "${ED}"/usr/lib/julia "${ED}"/usr/$(get_libdir)/julia || die
- fi
}
^ permalink raw reply related [flat|nested] 24+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-lang/julia/, dev-lang/julia/files/
@ 2017-09-16 5:01 Matthias Maier
0 siblings, 0 replies; 24+ messages in thread
From: Matthias Maier @ 2017-09-16 5:01 UTC (permalink / raw
To: gentoo-commits
commit: 0c42c3ebe595f815faf826261b2f5cdcec28dd76
Author: Matthias Maier <tamiko <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 16 04:58:43 2017 +0000
Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org>
CommitDate: Sat Sep 16 04:58:43 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0c42c3eb
dev-lang/julia: Update live ebuild
Package-Manager: Portage-2.3.6, Repoman-2.3.3
.../julia/files/julia-9999-fix_build_system.patch | 43 +++++-----------------
dev-lang/julia/julia-9999.ebuild | 2 -
2 files changed, 10 insertions(+), 35 deletions(-)
diff --git a/dev-lang/julia/files/julia-9999-fix_build_system.patch b/dev-lang/julia/files/julia-9999-fix_build_system.patch
index 6f804161775..d7866f46b3e 100644
--- a/dev-lang/julia/files/julia-9999-fix_build_system.patch
+++ b/dev-lang/julia/files/julia-9999-fix_build_system.patch
@@ -1,5 +1,5 @@
diff --git a/Make.inc b/Make.inc
-index e30c150..e6fdbb2 100644
+index e77681669..bc17c6fd0 100644
--- a/Make.inc
+++ b/Make.inc
@@ -399,7 +399,7 @@ ifneq ($(OS), WINNT)
@@ -29,25 +29,8 @@ index e30c150..e6fdbb2 100644
endif
ifeq ($(USECCACHE), 1)
-diff --git a/deps/tools/jldownload b/deps/tools/jldownload
-index ab4fd69..e2c2408 100755
---- a/deps/tools/jldownload
-+++ b/deps/tools/jldownload
-@@ -5,9 +5,9 @@
-
- CACHE_HOST=https://cache.julialang.org
-
--WGET=$(which wget 2>/dev/null)
--CURL=$(which curl 2>/dev/null)
--FETCH=$(which fetch 2>/dev/null)
-+WGET=/bin/true
-+CURL=/bin/true
-+FETCH=/bin/true
-
- TIMEOUT=15 # seconds
- WGET_OPTS="--no-check-certificate --tries=1 --timeout=$TIMEOUT"
diff --git a/doc/Makefile b/doc/Makefile
-index 743804d..e06dde0 100644
+index 743804d8b..e06dde030 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -25,7 +25,7 @@ deps: UnicodeData.txt
@@ -60,28 +43,22 @@ index 743804d..e06dde0 100644
cleanall: clean
diff --git a/src/Makefile b/src/Makefile
-index f71f53d..7cdd23f 100644
+index d3ff98900..9c4d889b4 100644
--- a/src/Makefile
+++ b/src/Makefile
-@@ -85,20 +85,8 @@ PUBLIC_HEADER_TARGETS := $(addprefix $(build_includedir)/julia/,$(notdir $(PUBLI
+@@ -87,14 +87,7 @@ PUBLIC_HEADERS += $(LIBUV_INC)/uv*
+ endif
+ PUBLIC_HEADER_TARGETS := $(addprefix $(build_includedir)/julia/,$(notdir $(PUBLIC_HEADERS)))
- # 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.
+-# 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
--ifeq ($(LLVM_USE_CMAKE),1)
-LLVMLINK += $(shell $(LLVM_CONFIG_HOST) --ldflags) -lLLVM
--else
--ifeq ($(OS),WINNT)
--LLVMLINK += $(shell $(LLVM_CONFIG_HOST) --ldflags) -lLLVM-$(LLVM_VER_SHORT)
--else
--LLVMLINK += $(shell $(LLVM_CONFIG_HOST) --ldflags) -lLLVM-$(shell $(LLVM_CONFIG_HOST) --version)
--endif # OS == WINNT
--endif # LLVM_USE_CMAKE == 1
-+LLVMLINK = $(call exec,$(LLVM_CONFIG) --ldflags) $(call exec,$(LLVM_CONFIG) --libs) $(call exec,$(LLVM_CONFIG) --ldflags) $(call exec,$(LLVM_CONFIG) --system-libs)
- FLAGS += -DLLVM_SHLIB
+-FLAGS += -DLLVM_SHLIB
-endif # USE_LLVM_SHLIB == 1
++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-9999.ebuild b/dev-lang/julia/julia-9999.ebuild
index 586f37aad42..27c15e1646a 100644
--- a/dev-lang/julia/julia-9999.ebuild
+++ b/dev-lang/julia/julia-9999.ebuild
@@ -59,8 +59,6 @@ src_prepare() {
# - fix BLAS and LAPACK link interface
sed -i \
- -e 's|$(JLDOWNLOAD)|${EPREFIX}/bin/true|' \
- -e 's|git submodule|${EPREFIX}/bin/true|g' \
-e "s|GENTOOCFLAGS|${CFLAGS}|g" \
-e "s|/usr/include|${EPREFIX%/}/usr/include|g" \
deps/Makefile || die
^ permalink raw reply related [flat|nested] 24+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-lang/julia/, dev-lang/julia/files/
@ 2017-07-18 19:39 Matthias Maier
0 siblings, 0 replies; 24+ messages in thread
From: Matthias Maier @ 2017-07-18 19:39 UTC (permalink / raw
To: gentoo-commits
commit: f3506fdb14a41519aef6905d992d2f1dde53ef10
Author: Matthias Maier <tamiko <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 18 19:13:30 2017 +0000
Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org>
CommitDate: Tue Jul 18 19:38:57 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f3506fdb
dev-lang/julia: add new ebuild for 0.6.0
Package-Manager: Portage-2.3.6, Repoman-2.3.2
dev-lang/julia/Manifest | 2 +
...em.patch => julia-0.6.0-fix_build_system.patch} | 39 +++--
.../julia/files/julia-9999-fix_build_system.patch | 39 +++--
dev-lang/julia/julia-0.6.0.ebuild | 176 +++++++++++++++++++++
4 files changed, 234 insertions(+), 22 deletions(-)
diff --git a/dev-lang/julia/Manifest b/dev-lang/julia/Manifest
index c91190d4268..344995da4b7 100644
--- a/dev-lang/julia/Manifest
+++ b/dev-lang/julia/Manifest
@@ -1,2 +1,4 @@
DIST julia-0.5.0-bundled.tar.gz 3461547 SHA256 3f4887fc2c0112666eb28b99f86bd8f7bd50615325e03135c546127885d46fbf SHA512 f8df589edf7d6b0e1e6553583c81d26fd256a79cacd79fbdd0ea1a9eea46b2466e3cbf055b5b7aa2d5c08318a5c35b9c09a30ac46a48689cc5c7245954b615c8 WHIRLPOOL b0137b2ed55aef7dc2c1a8693043ce63305bd2bbb5c2f959b2752fdb68189a506b027b467bfc0bb443fa4202f3735dd9410a257adec08302dfcaa0c9e4bfed98
DIST julia-0.5.0.tar.gz 6326490 SHA256 bb62a14806e58f079ecd4941d4a18d1f1c1d89ab33c826d3a58a2244e364112e SHA512 6d76c5050da5050cd541c8407c35c8ecd60ad2ba61c4defcc5c084aaeb09e82ffed09be79a3453000bdf88efe56039948335bab21c8389389ffb8b29806568de WHIRLPOOL 7f0066cc7fa912fe7ce5b6bf43449d828b0b9dcf2ab57df6c13a0df17ee53351c6deb30e7b998dc00ff53c548074d79ed6288bc79507afebc4fd827b3e3c032f
+DIST julia-0.6.0-bundled.tar.gz 2097663 SHA256 2c5505baa76649c35b239aeed20a238427cad76ed4c93bc538f672a1f1ea18dd SHA512 50581da3628930b2d1b89d226f3551fa7b18ca23c322b7e93d1227cc0c3428f255a6087f9859ff2c592014407d53238e01a3847a727a87287fb8c7f679b022d1 WHIRLPOOL 6c07396cebd4799c66e1dc403185b330d5dd9816786d84de5a995782571ce31ceb249d46811540a1d7f87377a9db25b45572f148af4107feaef79b2aec13e89f
+DIST julia-0.6.0.tar.gz 5565427 SHA256 1c62bfce8075acf2b5b02355520a61210690324eceb021030681459d18a3a665 SHA512 da21b35eb2c682c0fb8720974a76759c51fe993f10e6af5ca4864fc7f0bb6c90d880b706eb798476c7228bae2db19ff0825add6a2abde2961f16a93a3050cb69 WHIRLPOOL 7bc1bb82d4ee112d258473d1200b99dfd1a48ae59d9a9b700e60484c6007e45aed3a6bc42b5ecf7d3eae2c61cab166a1086c8c16f5039abd073571cb83fde4a9
diff --git a/dev-lang/julia/files/julia-9999-fix_build_system.patch b/dev-lang/julia/files/julia-0.6.0-fix_build_system.patch
similarity index 70%
copy from dev-lang/julia/files/julia-9999-fix_build_system.patch
copy to dev-lang/julia/files/julia-0.6.0-fix_build_system.patch
index 4ed2822c141..6f804161775 100644
--- a/dev-lang/julia/files/julia-9999-fix_build_system.patch
+++ b/dev-lang/julia/files/julia-0.6.0-fix_build_system.patch
@@ -1,8 +1,8 @@
diff --git a/Make.inc b/Make.inc
-index 651c9df..ff01872 100644
+index e30c150..e6fdbb2 100644
--- a/Make.inc
+++ b/Make.inc
-@@ -389,7 +389,7 @@ ifneq ($(OS), WINNT)
+@@ -399,7 +399,7 @@ ifneq ($(OS), WINNT)
JCXXFLAGS += -pedantic
endif
DEBUGFLAGS := -O0 -ggdb2 -DJL_DEBUG_BUILD -fstack-protector-all
@@ -11,7 +11,7 @@ index 651c9df..ff01872 100644
endif
ifeq ($(USECLANG),1)
-@@ -400,7 +400,7 @@ JCFLAGS := -pipe $(fPIC) -fno-strict-aliasing -D_FILE_OFFSET_BITS=64
+@@ -410,7 +410,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
@@ -19,8 +19,8 @@ index 651c9df..ff01872 100644
+SHIPFLAGS := GENTOOCFLAGS
ifeq ($(OS), Darwin)
ifeq ($(USE_LIBCPP), 1)
- CC += -stdlib=libc++ -mmacosx-version-min=10.7
-@@ -427,7 +427,7 @@ JCFLAGS := -std=gnu11 -pipe $(fPIC) -fno-strict-aliasing -D_FILE_OFFSET_BITS=64
+ MACOSX_VERSION_MIN := 10.8
+@@ -439,7 +439,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
@@ -29,24 +29,41 @@ index 651c9df..ff01872 100644
endif
ifeq ($(USECCACHE), 1)
+diff --git a/deps/tools/jldownload b/deps/tools/jldownload
+index ab4fd69..e2c2408 100755
+--- a/deps/tools/jldownload
++++ b/deps/tools/jldownload
+@@ -5,9 +5,9 @@
+
+ CACHE_HOST=https://cache.julialang.org
+
+-WGET=$(which wget 2>/dev/null)
+-CURL=$(which curl 2>/dev/null)
+-FETCH=$(which fetch 2>/dev/null)
++WGET=/bin/true
++CURL=/bin/true
++FETCH=/bin/true
+
+ TIMEOUT=15 # seconds
+ WGET_OPTS="--no-check-certificate --tries=1 --timeout=$TIMEOUT"
diff --git a/doc/Makefile b/doc/Makefile
-index 0749d73..f4d49ec 100644
+index 743804d..e06dde0 100644
--- a/doc/Makefile
+++ b/doc/Makefile
-@@ -62,7 +62,7 @@ help:
- @echo " doctest to run all doctests embedded in the documentation (if enabled)"
+@@ -25,7 +25,7 @@ deps: UnicodeData.txt
+ $(JLCHECKSUM) UnicodeData.txt
clean:
-- -rm -rf _build/*
+- -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 d7ec864..61d2470 100644
+index f71f53d..7cdd23f 100644
--- a/src/Makefile
+++ b/src/Makefile
-@@ -66,20 +66,8 @@ HEADERS := $(addprefix $(SRCDIR)/,julia.h julia_threads.h julia_internal.h optio
+@@ -85,20 +85,8 @@ PUBLIC_HEADER_TARGETS := $(addprefix $(build_includedir)/julia/,$(notdir $(PUBLI
# 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.
diff --git a/dev-lang/julia/files/julia-9999-fix_build_system.patch b/dev-lang/julia/files/julia-9999-fix_build_system.patch
index 4ed2822c141..6f804161775 100644
--- a/dev-lang/julia/files/julia-9999-fix_build_system.patch
+++ b/dev-lang/julia/files/julia-9999-fix_build_system.patch
@@ -1,8 +1,8 @@
diff --git a/Make.inc b/Make.inc
-index 651c9df..ff01872 100644
+index e30c150..e6fdbb2 100644
--- a/Make.inc
+++ b/Make.inc
-@@ -389,7 +389,7 @@ ifneq ($(OS), WINNT)
+@@ -399,7 +399,7 @@ ifneq ($(OS), WINNT)
JCXXFLAGS += -pedantic
endif
DEBUGFLAGS := -O0 -ggdb2 -DJL_DEBUG_BUILD -fstack-protector-all
@@ -11,7 +11,7 @@ index 651c9df..ff01872 100644
endif
ifeq ($(USECLANG),1)
-@@ -400,7 +400,7 @@ JCFLAGS := -pipe $(fPIC) -fno-strict-aliasing -D_FILE_OFFSET_BITS=64
+@@ -410,7 +410,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
@@ -19,8 +19,8 @@ index 651c9df..ff01872 100644
+SHIPFLAGS := GENTOOCFLAGS
ifeq ($(OS), Darwin)
ifeq ($(USE_LIBCPP), 1)
- CC += -stdlib=libc++ -mmacosx-version-min=10.7
-@@ -427,7 +427,7 @@ JCFLAGS := -std=gnu11 -pipe $(fPIC) -fno-strict-aliasing -D_FILE_OFFSET_BITS=64
+ MACOSX_VERSION_MIN := 10.8
+@@ -439,7 +439,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
@@ -29,24 +29,41 @@ index 651c9df..ff01872 100644
endif
ifeq ($(USECCACHE), 1)
+diff --git a/deps/tools/jldownload b/deps/tools/jldownload
+index ab4fd69..e2c2408 100755
+--- a/deps/tools/jldownload
++++ b/deps/tools/jldownload
+@@ -5,9 +5,9 @@
+
+ CACHE_HOST=https://cache.julialang.org
+
+-WGET=$(which wget 2>/dev/null)
+-CURL=$(which curl 2>/dev/null)
+-FETCH=$(which fetch 2>/dev/null)
++WGET=/bin/true
++CURL=/bin/true
++FETCH=/bin/true
+
+ TIMEOUT=15 # seconds
+ WGET_OPTS="--no-check-certificate --tries=1 --timeout=$TIMEOUT"
diff --git a/doc/Makefile b/doc/Makefile
-index 0749d73..f4d49ec 100644
+index 743804d..e06dde0 100644
--- a/doc/Makefile
+++ b/doc/Makefile
-@@ -62,7 +62,7 @@ help:
- @echo " doctest to run all doctests embedded in the documentation (if enabled)"
+@@ -25,7 +25,7 @@ deps: UnicodeData.txt
+ $(JLCHECKSUM) UnicodeData.txt
clean:
-- -rm -rf _build/*
+- -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 d7ec864..61d2470 100644
+index f71f53d..7cdd23f 100644
--- a/src/Makefile
+++ b/src/Makefile
-@@ -66,20 +66,8 @@ HEADERS := $(addprefix $(SRCDIR)/,julia.h julia_threads.h julia_internal.h optio
+@@ -85,20 +85,8 @@ PUBLIC_HEADER_TARGETS := $(addprefix $(build_includedir)/julia/,$(notdir $(PUBLI
# 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.
diff --git a/dev-lang/julia/julia-0.6.0.ebuild b/dev-lang/julia/julia-0.6.0.ebuild
new file mode 100644
index 00000000000..9fc210dd85b
--- /dev/null
+++ b/dev-lang/julia/julia-0.6.0.ebuild
@@ -0,0 +1,176 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+RESTRICT="test"
+
+inherit eutils multilib pax-utils toolchain-funcs
+
+DESCRIPTION="High-performance programming language for technical computing"
+HOMEPAGE="http://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
+"
+
+LICENSE="MIT"
+SLOT="0"
+#KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS=""
+IUSE=""
+
+RDEPEND="
+ dev-lang/R:0=
+ dev-libs/double-conversion:0=
+ dev-libs/gmp:0=
+ <dev-libs/libgit2-0.25:0=
+ dev-libs/mpfr:0=
+ dev-libs/openspecfun
+ sci-libs/arpack:0=
+ sci-libs/camd:0=
+ sci-libs/cholmod:0=
+ sci-libs/fftw:3.0=[threads]
+ sci-libs/openlibm:0=
+ sci-libs/spqr:0=
+ >=dev-libs/libpcre2-10.23:0=[jit]
+ sci-libs/umfpack:0=
+ sci-mathematics/glpk:0=
+ >=sys-devel/llvm-3.9:0=
+ >=sys-libs/libunwind-1.1:7=
+ sys-libs/readline:0=
+ sys-libs/zlib:0=
+ >=virtual/blas-3.6
+ virtual/lapack"
+
+DEPEND="${RDEPEND}
+ dev-util/patchelf
+ virtual/pkgconfig"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-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|$(JLDOWNLOAD)|${EPREFIX}/bin/true|' \
+ -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|\(JULIA_EXECUTABLE = \)\(\$(JULIAHOME)/julia\)|\1 LD_LIBRARY_PATH=\$(BUILD)/$(get_libdir) \2|" \
+ -e "s|GENTOOCFLAGS|${CFLAGS}|g" \
+ -e "s|LIBDIR = lib|LIBDIR = $(get_libdir)|" \
+ -e "s|/usr/lib|${EPREFIX}/usr/$(get_libdir)|" \
+ -e "s|/usr/include|${EPREFIX}/usr/include|" \
+ -e "s|\$(BUILD)/lib|\$(BUILD)/$(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
+}
+
+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=1
+ 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
+ emake VERBOSE=1 julia-release \
+ prefix="/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() {
+ emake install \
+ prefix="/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
+ if [[ $(get_libdir) != lib ]]; then
+ mkdir -p "${ED}"/usr/$(get_libdir) || die
+ mv "${ED}"/usr/lib/julia "${ED}"/usr/$(get_libdir)/julia || die
+ fi
+}
^ permalink raw reply related [flat|nested] 24+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-lang/julia/, dev-lang/julia/files/
@ 2016-09-24 21:25 Matthias Maier
0 siblings, 0 replies; 24+ messages in thread
From: Matthias Maier @ 2016-09-24 21:25 UTC (permalink / raw
To: gentoo-commits
commit: 7628bf334fad3d3ab0b4130992392ecd45d512a4
Author: Matthias Maier <tamiko <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 24 17:22:15 2016 +0000
Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org>
CommitDate: Sat Sep 24 21:18:56 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7628bf33
dev-lang/julia: add a live ebuild
Package-Manager: portage-2.2.28
.../julia/files/julia-9999-fix_build_system.patch | 70 ++++++++
dev-lang/julia/julia-9999.ebuild | 181 +++++++++++++++++++++
2 files changed, 251 insertions(+)
diff --git a/dev-lang/julia/files/julia-9999-fix_build_system.patch b/dev-lang/julia/files/julia-9999-fix_build_system.patch
new file mode 100644
index 00000000..4ed2822
--- /dev/null
+++ b/dev-lang/julia/files/julia-9999-fix_build_system.patch
@@ -0,0 +1,70 @@
+diff --git a/Make.inc b/Make.inc
+index 651c9df..ff01872 100644
+--- a/Make.inc
++++ b/Make.inc
+@@ -389,7 +389,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)
+@@ -400,7 +400,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)
+ CC += -stdlib=libc++ -mmacosx-version-min=10.7
+@@ -427,7 +427,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 0749d73..f4d49ec 100644
+--- a/doc/Makefile
++++ b/doc/Makefile
+@@ -62,7 +62,7 @@ help:
+ @echo " doctest to run all doctests embedded in the documentation (if enabled)"
+
+ clean:
+- -rm -rf _build/*
++ @echo "Do not clean doc/_build/html. Just use it..."
+
+ cleanall: clean
+
+diff --git a/src/Makefile b/src/Makefile
+index d7ec864..61d2470 100644
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -66,20 +66,8 @@ HEADERS := $(addprefix $(SRCDIR)/,julia.h julia_threads.h julia_internal.h optio
+
+ # 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
+-ifeq ($(LLVM_USE_CMAKE),1)
+-LLVMLINK += $(shell $(LLVM_CONFIG_HOST) --ldflags) -lLLVM
+-else
+-ifeq ($(OS),WINNT)
+-LLVMLINK += $(shell $(LLVM_CONFIG_HOST) --ldflags) -lLLVM-$(LLVM_VER_SHORT)
+-else
+-LLVMLINK += $(shell $(LLVM_CONFIG_HOST) --ldflags) -lLLVM-$(shell $(LLVM_CONFIG_HOST) --version)
+-endif # OS == WINNT
+-endif # LLVM_USE_CMAKE == 1
++LLVMLINK = $(call exec,$(LLVM_CONFIG) --ldflags) $(call exec,$(LLVM_CONFIG) --libs) $(call exec,$(LLVM_CONFIG) --ldflags) $(call exec,$(LLVM_CONFIG) --system-libs)
+ FLAGS += -DLLVM_SHLIB
+-endif # USE_LLVM_SHLIB == 1
+
+ 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-9999.ebuild b/dev-lang/julia/julia-9999.ebuild
new file mode 100644
index 00000000..80df05f1
--- /dev/null
+++ b/dev-lang/julia/julia-9999.ebuild
@@ -0,0 +1,181 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+RESTRICT="test"
+
+inherit git-r3 elisp-common eutils multilib pax-utils toolchain-funcs
+
+DESCRIPTION="High-performance programming language for technical computing"
+HOMEPAGE="http://julialang.org/"
+SRC_URI=""
+EGIT_REPO_URI="git://github.com/JuliaLang/julia.git"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS=""
+IUSE="emacs"
+
+RDEPEND="
+ dev-lang/R:0=
+ dev-libs/double-conversion:0=
+ dev-libs/gmp:0=
+ dev-libs/libgit2:0=
+ dev-libs/mpfr:0=
+ dev-libs/openspecfun
+ sci-libs/arpack:0=
+ sci-libs/camd:0=
+ sci-libs/cholmod:0=
+ sci-libs/fftw:3.0=[threads]
+ sci-libs/openlibm:0=
+ sci-libs/spqr:0=
+ sci-libs/umfpack:0=
+ sci-mathematics/glpk:0=
+ >=sys-devel/llvm-3.5:0=
+ >=sys-libs/libunwind-1.1:7=
+ sys-libs/readline:0=
+ sys-libs/zlib:0=
+ >=virtual/blas-1.1
+ virtual/lapack
+ emacs? ( app-emacs/ess )"
+
+DEPEND="${RDEPEND}
+ dev-util/patchelf
+ virtual/pkgconfig"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-9999-fix_build_system.patch
+)
+
+src_prepare() {
+ epatch "${PATCHES[@]}"
+
+ eapply_user
+
+ # Sledgehammer:
+ # - respect CFLAGS
+ # - respect EPREFIX and Gentoo specific paths
+ # - fix BLAS and LAPACK link interface
+
+ sed -i \
+ -e 's|$(JLDOWNLOAD)|${EPREFIX}/bin/true|' \
+ -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|\(JULIA_EXECUTABLE = \)\(\$(JULIAHOME)/julia\)|\1 LD_LIBRARY_PATH=\$(BUILD)/$(get_libdir) \2|" \
+ -e "s|GENTOOCFLAGS|${CFLAGS}|g" \
+ -e "s|LIBDIR = lib|LIBDIR = $(get_libdir)|" \
+ -e "s|/usr/lib|${EPREFIX}/usr/$(get_libdir)|" \
+ -e "s|/usr/include|${EPREFIX}/usr/include|" \
+ -e "s|\$(BUILD)/lib|\$(BUILD)/$(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
+}
+
+src_configure() {
+ # julia does not play well with the system versions of
+ # dsfmt, libuv, pcre2 and utf8proc
+ cat <<-EOF > Make.user
+ USE_SYSTEM_DSFMT=0
+ USE_SYSTEM_LIBUV=0
+ USE_SYSTEM_PCRE=0
+ USE_SYSTEM_RMATH=0
+ USE_SYSTEM_UTF8PROC=0
+ USE_LLVM_SHLIB=1
+ 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=1
+ 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
+ EOF
+
+}
+
+src_compile() {
+
+ # Julia accesses /proc/self/mem on Linux
+ addpredict /proc/self/mem
+
+ emake cleanall
+ emake julia-release \
+ prefix="/usr" DESTDIR="${D}" CC="$(tc-getCC)" CXX="$(tc-getCXX)"
+ pax-mark m $(file usr/bin/julia-* | awk -F : '/ELF/ {print $1}')
+ emake
+ use emacs && elisp-compile contrib/julia-mode.el
+}
+
+src_test() {
+ emake test
+}
+
+src_install() {
+ emake install \
+ prefix="/usr" DESTDIR="${D}" CC="$(tc-getCC)" CXX="$(tc-getCXX)"
+ cat > 99julia <<-EOF
+ LDPATH=${EROOT%/}/usr/$(get_libdir)/julia
+ EOF
+ doenvd 99julia
+
+ if use emacs; then
+ elisp-install "${PN}" contrib/julia-mode.el
+ elisp-site-file-install "${FILESDIR}"/63julia-gentoo.el
+ fi
+ dodoc README.md
+
+ mv "${ED}"/usr/etc/julia "${ED}"/etc || die
+ rmdir "${ED}"/usr/etc || die
+ rmdir "${ED}"/usr/libexec || die
+ mv "${ED}"/usr/share/doc/julia/{examples,html} \
+ "${ED}"/usr/share/doc/${P} || die
+ rmdir "${ED}"/usr/share/doc/julia || die
+ if [[ $(get_libdir) != lib ]]; then
+ mkdir -p "${ED}"/usr/$(get_libdir) || die
+ mv "${ED}"/usr/lib/julia "${ED}"/usr/$(get_libdir)/julia || die
+ fi
+}
+
+pkg_postinst() {
+ use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+ use emacs && elisp-site-regen
+}
^ permalink raw reply related [flat|nested] 24+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-lang/julia/, dev-lang/julia/files/
@ 2016-09-20 6:36 Matthias Maier
0 siblings, 0 replies; 24+ messages in thread
From: Matthias Maier @ 2016-09-20 6:36 UTC (permalink / raw
To: gentoo-commits
commit: 21617b930342efc1429e2386c42d51e41cb1604c
Author: Matthias Maier <tamiko <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 20 06:27:09 2016 +0000
Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org>
CommitDate: Tue Sep 20 06:36:03 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=21617b93
dev-lang/julia: version bump to 0.5.0
Package-Manager: portage-2.2.28
dev-lang/julia/Manifest | 2 +
.../julia/files/julia-0.5.0-fix_build_system.patch | 85 ++++++++++
dev-lang/julia/julia-0.5.0.ebuild | 188 +++++++++++++++++++++
3 files changed, 275 insertions(+)
diff --git a/dev-lang/julia/Manifest b/dev-lang/julia/Manifest
index 07327ed..aa23d93 100644
--- a/dev-lang/julia/Manifest
+++ b/dev-lang/julia/Manifest
@@ -2,3 +2,5 @@ DIST julia-0.4.3-bundled.tar.gz 2678787 SHA256 9451160add4c1fa537762627abcd3dd5f
DIST julia-0.4.3.tar.gz 5563437 SHA256 b2c12b267c0d8eb380f6628e7be48c7ec46d2cfb5c585ecb3ca4cc442650e4e0 SHA512 7d5180c69573452c00563c7b98514fc9e4f0f70762912cf4f90cbf632e4b23ec149295ff1955164833ab94efd1feab992067996e3d60f795850542cf2f18f67f WHIRLPOOL 75c3ebf8cb1af67158896872e098bf66a8073eba3daf6cf5903471d34201e1605458e59f14c19ff5177413daee5aac102ec69a0afe9a93a219698a4640acaf33
DIST julia-0.4.6-bundled.tar.gz 2678787 SHA256 9451160add4c1fa537762627abcd3dd5fecca9ce44f71c4140d89a4bb6b23392 SHA512 919ca7b99a6eb17a651ce24fe07e5c12bfcee54ce86fac8f744765195002e8f3330df9059fadd5af3408c1f7e067e247ad4bb135879ae4ae43e1457245f90db9 WHIRLPOOL 94bb022d4f1586dfdc2f52286db423cb09898a3a5dff2f2086ca111b9117dca808758351dada23cea1056a8e5c3b33f6919410c34af96a92a4a9f8b0e0758783
DIST julia-0.4.6.tar.gz 5548248 SHA256 e5d12b5a8ddff0131e460612ecf222ddf16014fc64c4fc3d8b021da7ebbd9a9f SHA512 744fbae14f7b38d5f7ef1c39d05c66f42833ee0e07b3f4be2ae377f2c997872777c6f7e9e667f52e5a33879032b2d02d76b00fab59f81ba6552f1fd4165953da WHIRLPOOL 3403364fc13bd8012da1ee333cc51fd0a957e94920bbd3f951fad4a689469f514e19a661bf2bdfdd29afbcadac1c9d6948638fd9d4201780a1aa7c0fd2995dee
+DIST julia-0.5.0-bundled.tar.gz 3461547 SHA256 3f4887fc2c0112666eb28b99f86bd8f7bd50615325e03135c546127885d46fbf SHA512 f8df589edf7d6b0e1e6553583c81d26fd256a79cacd79fbdd0ea1a9eea46b2466e3cbf055b5b7aa2d5c08318a5c35b9c09a30ac46a48689cc5c7245954b615c8 WHIRLPOOL b0137b2ed55aef7dc2c1a8693043ce63305bd2bbb5c2f959b2752fdb68189a506b027b467bfc0bb443fa4202f3735dd9410a257adec08302dfcaa0c9e4bfed98
+DIST julia-0.5.0.tar.gz 6326490 SHA256 bb62a14806e58f079ecd4941d4a18d1f1c1d89ab33c826d3a58a2244e364112e SHA512 6d76c5050da5050cd541c8407c35c8ecd60ad2ba61c4defcc5c084aaeb09e82ffed09be79a3453000bdf88efe56039948335bab21c8389389ffb8b29806568de WHIRLPOOL 7f0066cc7fa912fe7ce5b6bf43449d828b0b9dcf2ab57df6c13a0df17ee53351c6deb30e7b998dc00ff53c548074d79ed6288bc79507afebc4fd827b3e3c032f
diff --git a/dev-lang/julia/files/julia-0.5.0-fix_build_system.patch b/dev-lang/julia/files/julia-0.5.0-fix_build_system.patch
new file mode 100644
index 00000000..e54b9a4
--- /dev/null
+++ b/dev-lang/julia/files/julia-0.5.0-fix_build_system.patch
@@ -0,0 +1,85 @@
+diff --git a/Make.inc b/Make.inc
+index 651c9df..ff01872 100644
+--- a/Make.inc
++++ b/Make.inc
+@@ -389,7 +389,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)
+@@ -400,7 +400,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)
+ CC += -stdlib=libc++ -mmacosx-version-min=10.7
+@@ -427,7 +427,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 0749d73..f4d49ec 100644
+--- a/doc/Makefile
++++ b/doc/Makefile
+@@ -62,7 +62,7 @@ help:
+ @echo " doctest to run all doctests embedded in the documentation (if enabled)"
+
+ clean:
+- -rm -rf _build/*
++ @echo "Do not clean doc/_build/html. Just use it..."
+
+ cleanall: clean
+
+diff --git a/src/Makefile b/src/Makefile
+index d7ec864..61d2470 100644
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -66,20 +66,8 @@ HEADERS := $(addprefix $(SRCDIR)/,julia.h julia_threads.h julia_internal.h optio
+
+ # 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
+-ifeq ($(LLVM_USE_CMAKE),1)
+-LLVMLINK += $(shell $(LLVM_CONFIG_HOST) --ldflags) -lLLVM
+-else
+-ifeq ($(OS),WINNT)
+-LLVMLINK += $(shell $(LLVM_CONFIG_HOST) --ldflags) -lLLVM-$(LLVM_VER_SHORT)
+-else
+-LLVMLINK += $(shell $(LLVM_CONFIG_HOST) --ldflags) -lLLVM-$(shell $(LLVM_CONFIG_HOST) --version)
+-endif # OS == WINNT
+-endif # LLVM_USE_CMAKE == 1
++LLVMLINK = $(call exec,$(LLVM_CONFIG) --ldflags) $(call exec,$(LLVM_CONFIG) --libs) $(call exec,$(LLVM_CONFIG) --ldflags) $(call exec,$(LLVM_CONFIG) --system-libs)
+ FLAGS += -DLLVM_SHLIB
+-endif # USE_LLVM_SHLIB == 1
+
+ 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/deps/tools/jldownload
++++ b/deps/tools/jldownload
+@@ -5,9 +5,9 @@
+
+ CACHE_HOST=https://cache.julialang.org
+
+-WGET=$(which wget 2>/dev/null)
+-CURL=$(which curl 2>/dev/null)
+-FETCH=$(which fetch 2>/dev/null)
++WGET=/bin/true
++CURL=/bin/true
++FETCH=/bin/true
+
+ TIMEOUT=15 # seconds
+ WGET_OPTS="--no-check-certificate --tries=1 --timeout=$TIMEOUT"
diff --git a/dev-lang/julia/julia-0.5.0.ebuild b/dev-lang/julia/julia-0.5.0.ebuild
new file mode 100644
index 00000000..10bce00
--- /dev/null
+++ b/dev-lang/julia/julia-0.5.0.ebuild
@@ -0,0 +1,188 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+RESTRICT="test"
+
+inherit elisp-common eutils multilib pax-utils toolchain-funcs
+
+DESCRIPTION="High-performance programming language for technical computing"
+HOMEPAGE="http://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
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="emacs"
+
+RDEPEND="
+ dev-lang/R:0=
+ dev-libs/double-conversion:0=
+ dev-libs/gmp:0=
+ dev-libs/libgit2:0=
+ dev-libs/mpfr:0=
+ dev-libs/openspecfun
+ sci-libs/arpack:0=
+ sci-libs/camd:0=
+ sci-libs/cholmod:0=
+ sci-libs/fftw:3.0=[threads]
+ sci-libs/openlibm:0=
+ sci-libs/spqr:0=
+ sci-libs/umfpack:0=
+ sci-mathematics/glpk:0=
+ >=sys-devel/llvm-3.5:0=
+ >=sys-libs/libunwind-1.1:7=
+ sys-libs/readline:0=
+ sys-libs/zlib:0=
+ virtual/blas
+ virtual/lapack
+ emacs? ( app-emacs/ess )"
+
+DEPEND="${RDEPEND}
+ dev-util/patchelf
+ virtual/pkgconfig"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-0.5.0-fix_build_system.patch
+)
+
+src_prepare() {
+ mkdir deps/srccache || die
+ mv "${WORKDIR}"/bundled/* deps/srccache || die
+ rmdir "${WORKDIR}"/bundled || die
+
+ epatch "${PATCHES[@]}"
+
+ eapply_user
+
+ # 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|$(JLDOWNLOAD)|${EPREFIX}/bin/true|' \
+ -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|\(JULIA_EXECUTABLE = \)\(\$(JULIAHOME)/julia\)|\1 LD_LIBRARY_PATH=\$(BUILD)/$(get_libdir) \2|" \
+ -e "s|GENTOOCFLAGS|${CFLAGS}|g" \
+ -e "s|LIBDIR = lib|LIBDIR = $(get_libdir)|" \
+ -e "s|/usr/lib|${EPREFIX}/usr/$(get_libdir)|" \
+ -e "s|/usr/include|${EPREFIX}/usr/include|" \
+ -e "s|\$(BUILD)/lib|\$(BUILD)/$(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
+}
+
+src_configure() {
+ # julia does not play well with the system versions of
+ # dsfmt, libuv, pcre2 and utf8proc
+ cat <<-EOF > Make.user
+ USE_SYSTEM_DSFMT=0
+ USE_SYSTEM_LIBUV=0
+ USE_SYSTEM_PCRE=0
+ USE_SYSTEM_RMATH=0
+ USE_SYSTEM_UTF8PROC=0
+ USE_LLVM_SHLIB=1
+ 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=1
+ 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
+ EOF
+
+}
+
+src_compile() {
+
+ # Julia accesses /proc/self/mem on Linux
+ addpredict /proc/self/mem
+
+ emake cleanall
+ emake julia-release \
+ prefix="/usr" DESTDIR="${D}" CC="$(tc-getCC)" CXX="$(tc-getCXX)"
+ pax-mark m $(file usr/bin/julia-* | awk -F : '/ELF/ {print $1}')
+ emake
+ use emacs && elisp-compile contrib/julia-mode.el
+}
+
+src_test() {
+ emake test
+}
+
+src_install() {
+ emake install \
+ prefix="/usr" DESTDIR="${D}" CC="$(tc-getCC)" CXX="$(tc-getCXX)"
+ cat > 99julia <<-EOF
+ LDPATH=${EROOT%/}/usr/$(get_libdir)/julia
+ EOF
+ doenvd 99julia
+
+ if use emacs; then
+ elisp-install "${PN}" contrib/julia-mode.el
+ elisp-site-file-install "${FILESDIR}"/63julia-gentoo.el
+ fi
+ dodoc README.md
+
+ mv "${ED}"/usr/etc/julia "${ED}"/etc || die
+ rmdir "${ED}"/usr/etc || die
+ rmdir "${ED}"/usr/libexec || die
+ mv "${ED}"/usr/share/doc/julia/{examples,html} \
+ "${ED}"/usr/share/doc/${P} || die
+ rmdir "${ED}"/usr/share/doc/julia || die
+ if [[ $(get_libdir) != lib ]]; then
+ mkdir -p "${ED}"/usr/$(get_libdir) || die
+ mv "${ED}"/usr/lib/julia "${ED}"/usr/$(get_libdir)/julia || die
+ fi
+}
+
+pkg_postinst() {
+ use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+ use emacs && elisp-site-regen
+}
^ permalink raw reply related [flat|nested] 24+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-lang/julia/, dev-lang/julia/files/
@ 2016-09-09 5:46 Matthias Maier
0 siblings, 0 replies; 24+ messages in thread
From: Matthias Maier @ 2016-09-09 5:46 UTC (permalink / raw
To: gentoo-commits
commit: b620c2db81b11d3e63069512fbcc855b53cfb26a
Author: Matthias Maier <tamiko <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 9 05:45:35 2016 +0000
Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org>
CommitDate: Fri Sep 9 05:46:34 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b620c2db
dev-lang/julia: version bump to 0.4.6
Package-Manager: portage-2.2.28
dev-lang/julia/Manifest | 2 +
dev-lang/julia/files/julia-0.4.6-llvm-3.8.patch | 56 +++++++
dev-lang/julia/julia-0.4.6.ebuild | 186 ++++++++++++++++++++++++
3 files changed, 244 insertions(+)
diff --git a/dev-lang/julia/Manifest b/dev-lang/julia/Manifest
index 034069d..07327ed 100644
--- a/dev-lang/julia/Manifest
+++ b/dev-lang/julia/Manifest
@@ -1,2 +1,4 @@
DIST julia-0.4.3-bundled.tar.gz 2678787 SHA256 9451160add4c1fa537762627abcd3dd5fecca9ce44f71c4140d89a4bb6b23392 SHA512 919ca7b99a6eb17a651ce24fe07e5c12bfcee54ce86fac8f744765195002e8f3330df9059fadd5af3408c1f7e067e247ad4bb135879ae4ae43e1457245f90db9 WHIRLPOOL 94bb022d4f1586dfdc2f52286db423cb09898a3a5dff2f2086ca111b9117dca808758351dada23cea1056a8e5c3b33f6919410c34af96a92a4a9f8b0e0758783
DIST julia-0.4.3.tar.gz 5563437 SHA256 b2c12b267c0d8eb380f6628e7be48c7ec46d2cfb5c585ecb3ca4cc442650e4e0 SHA512 7d5180c69573452c00563c7b98514fc9e4f0f70762912cf4f90cbf632e4b23ec149295ff1955164833ab94efd1feab992067996e3d60f795850542cf2f18f67f WHIRLPOOL 75c3ebf8cb1af67158896872e098bf66a8073eba3daf6cf5903471d34201e1605458e59f14c19ff5177413daee5aac102ec69a0afe9a93a219698a4640acaf33
+DIST julia-0.4.6-bundled.tar.gz 2678787 SHA256 9451160add4c1fa537762627abcd3dd5fecca9ce44f71c4140d89a4bb6b23392 SHA512 919ca7b99a6eb17a651ce24fe07e5c12bfcee54ce86fac8f744765195002e8f3330df9059fadd5af3408c1f7e067e247ad4bb135879ae4ae43e1457245f90db9 WHIRLPOOL 94bb022d4f1586dfdc2f52286db423cb09898a3a5dff2f2086ca111b9117dca808758351dada23cea1056a8e5c3b33f6919410c34af96a92a4a9f8b0e0758783
+DIST julia-0.4.6.tar.gz 5548248 SHA256 e5d12b5a8ddff0131e460612ecf222ddf16014fc64c4fc3d8b021da7ebbd9a9f SHA512 744fbae14f7b38d5f7ef1c39d05c66f42833ee0e07b3f4be2ae377f2c997872777c6f7e9e667f52e5a33879032b2d02d76b00fab59f81ba6552f1fd4165953da WHIRLPOOL 3403364fc13bd8012da1ee333cc51fd0a957e94920bbd3f951fad4a689469f514e19a661bf2bdfdd29afbcadac1c9d6948638fd9d4201780a1aa7c0fd2995dee
diff --git a/dev-lang/julia/files/julia-0.4.6-llvm-3.8.patch b/dev-lang/julia/files/julia-0.4.6-llvm-3.8.patch
new file mode 100644
index 00000000..c301f96
--- /dev/null
+++ b/dev-lang/julia/files/julia-0.4.6-llvm-3.8.patch
@@ -0,0 +1,56 @@
+Description: LLVM 3.8 compatibility
+ These fixes come straight from upstream's git.
+Origin: Upstream, https://github.com/JuliaLang/julia/commit/b67609b988febe062e6709d8972c4f869c82cfc0
+Origin: Upstream, https://github.com/JuliaLang/julia/commit/3f6abadc9d12bb9d59ec775db4277b3841395d0b
+Origin: Upstream, https://github.com/JuliaLang/julia/commit/caf3c74426696d43101d9607b1a2cd3a5e05bc0f
+Author: Graham Inggs <ginggs@debian.org>
+Last-Update: 2016-02-03
+--- a/src/cgutils.cpp
++++ b/src/cgutils.cpp
+@@ -219,7 +219,11 @@
+ }
+ }
+
++#ifdef LLVM38
++ virtual Value *materializeDeclFor(Value *V)
++#else
+ virtual Value *materializeValueFor (Value *V)
++#endif
+ {
+ Function *F = dyn_cast<Function>(V);
+ if (F) {
+@@ -492,7 +496,11 @@
+
+ // now copy the module, since PM.run may modify it
+ ValueToValueMapTy VMap;
++#ifdef LLVM38
++ Module *clone = CloneModule(shadow_module, VMap).release();
++#else
+ Module *clone = CloneModule(shadow_module, VMap);
++#endif
+ #ifdef LLVM37
+ // Reset the target triple to make sure it matches the new target machine
+ clone->setTargetTriple(TM->getTargetTriple().str());
+--- a/src/intrinsics.cpp
++++ b/src/intrinsics.cpp
+@@ -780,12 +780,20 @@
+ jl_options.fast_math == JL_OPTIONS_FAST_MATH_ON)) {
+ FastMathFlags fmf;
+ fmf.setUnsafeAlgebra();
++#ifdef LLVM38
++ builder.setFastMathFlags(fmf);
++#else
+ builder.SetFastMathFlags(fmf);
++#endif
+ }
+ }
+ IRBuilder<>& operator()() const { return builder; }
+ ~math_builder() {
++#ifdef LLVM38
++ builder.setFastMathFlags(old_fmf);
++#else
+ builder.SetFastMathFlags(old_fmf);
++#endif
+ }
+ };
+
diff --git a/dev-lang/julia/julia-0.4.6.ebuild b/dev-lang/julia/julia-0.4.6.ebuild
new file mode 100644
index 00000000..6f10200
--- /dev/null
+++ b/dev-lang/julia/julia-0.4.6.ebuild
@@ -0,0 +1,186 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+RESTRICT="test"
+
+inherit elisp-common eutils multilib pax-utils toolchain-funcs
+
+DESCRIPTION="High-performance programming language for technical computing"
+HOMEPAGE="http://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
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="emacs"
+
+RDEPEND="
+ dev-lang/R:0=
+ dev-libs/double-conversion:0=
+ dev-libs/gmp:0=
+ dev-libs/libgit2:0=
+ dev-libs/mpfr:0=
+ dev-libs/openspecfun
+ sci-libs/arpack:0=
+ sci-libs/camd:0=
+ sci-libs/cholmod:0=
+ sci-libs/fftw:3.0=[threads]
+ sci-libs/openlibm:0=
+ sci-libs/spqr:0=
+ sci-libs/umfpack:0=
+ sci-mathematics/glpk:0=
+ >=sys-devel/llvm-3.5:0=
+ >=sys-libs/libunwind-1.1:7=
+ sys-libs/readline:0=
+ sys-libs/zlib:0=
+ virtual/blas
+ virtual/lapack
+ emacs? ( app-emacs/ess )"
+
+DEPEND="${RDEPEND}
+ dev-util/patchelf
+ virtual/pkgconfig"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-0.4.3-fix_build_system.patch
+ "${FILESDIR}"/${P}-llvm-3.8.patch
+)
+
+src_prepare() {
+ mv "${WORKDIR}"/bundled/dsfmt-2.2.3.tar.gz deps/ || die
+ mv "${WORKDIR}"/bundled/libuv-efb40768b7c7bd9f173a7868f74b92b1c5a61a0e.tar.gz deps/ || die
+ mv "${WORKDIR}"/bundled/pcre2-10.20.tar.bz2 deps/ || die
+ mv "${WORKDIR}"/bundled/Rmath-julia-0.1.tar.gz deps/ || die
+ mv "${WORKDIR}"/bundled/utf8proc-85789180158ac7fff85b9f008828d6ac44f072ea.tar.gz deps/ || die
+ rmdir "${WORKDIR}"/bundled || die
+
+ epatch "${PATCHES[@]}"
+
+ # 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|$(JLDOWNLOAD)|${EPREFIX}/bin/true|' \
+ -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|\(JULIA_EXECUTABLE = \)\(\$(JULIAHOME)/julia\)|\1 LD_LIBRARY_PATH=\$(BUILD)/$(get_libdir) \2|" \
+ -e "s|GENTOOCFLAGS|${CFLAGS}|g" \
+ -e "s|LIBDIR = lib|LIBDIR = $(get_libdir)|" \
+ -e "s|/usr/lib|${EPREFIX}/usr/$(get_libdir)|" \
+ -e "s|/usr/include|${EPREFIX}/usr/include|" \
+ -e "s|\$(BUILD)/lib|\$(BUILD)/$(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
+}
+
+src_configure() {
+ # julia does not play well with the system versions of
+ # dsfmt, libuv, pcre2 and utf8proc
+ cat <<-EOF > Make.user
+ USE_SYSTEM_DSFMT=0
+ USE_SYSTEM_LIBUV=0
+ USE_SYSTEM_PCRE=0
+ USE_SYSTEM_RMATH=0
+ USE_SYSTEM_UTF8PROC=0
+ USE_LLVM_SHLIB=1
+ 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=1
+ 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
+ EOF
+
+}
+
+src_compile() {
+ emake cleanall
+ emake julia-release \
+ prefix="/usr" DESTDIR="${D}" CC="$(tc-getCC)" CXX="$(tc-getCXX)"
+ pax-mark m $(file usr/bin/julia-* | awk -F : '/ELF/ {print $1}')
+ emake
+ use emacs && elisp-compile contrib/julia-mode.el
+}
+
+src_test() {
+ emake test
+}
+
+src_install() {
+ emake install \
+ prefix="/usr" DESTDIR="${D}" CC="$(tc-getCC)" CXX="$(tc-getCXX)"
+ cat > 99julia <<-EOF
+ LDPATH=${EROOT%/}/usr/$(get_libdir)/julia
+ EOF
+ doenvd 99julia
+
+ if use emacs; then
+ elisp-install "${PN}" contrib/julia-mode.el
+ elisp-site-file-install "${FILESDIR}"/63julia-gentoo.el
+ fi
+ dodoc README.md
+
+ mv "${ED}"/usr/etc/julia "${ED}"/etc || die
+ rmdir "${ED}"/usr/etc || die
+ rmdir "${ED}"/usr/libexec || die
+ mv "${ED}"/usr/share/doc/julia/{examples,html} \
+ "${ED}"/usr/share/doc/${P} || die
+ rmdir "${ED}"/usr/share/doc/julia || die
+ if [[ $(get_libdir) != lib ]]; then
+ mkdir -p "${ED}"/usr/$(get_libdir) || die
+ mv "${ED}"/usr/lib/julia "${ED}"/usr/$(get_libdir)/julia || die
+ fi
+}
+
+pkg_postinst() {
+ use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+ use emacs && elisp-site-regen
+}
^ permalink raw reply related [flat|nested] 24+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-lang/julia/, dev-lang/julia/files/
@ 2016-01-16 11:39 Matthias Maier
0 siblings, 0 replies; 24+ messages in thread
From: Matthias Maier @ 2016-01-16 11:39 UTC (permalink / raw
To: gentoo-commits
commit: 9f85644c4b07c3b4340594082da6e3d317e9bea9
Author: Matthias Maier <tamiko <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 16 11:25:10 2016 +0000
Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org>
CommitDate: Sat Jan 16 11:33:12 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9f85644c
dev-lang/julia: version bump to 0.4.3 (bug 564338)
Package-Manager: portage-2.2.26
dev-lang/julia/Manifest | 2 +
.../julia/files/julia-0.4.3-fix_build_system.patch | 140 ++++++++++++++++
dev-lang/julia/julia-0.4.3.ebuild | 183 +++++++++++++++++++++
3 files changed, 325 insertions(+)
diff --git a/dev-lang/julia/Manifest b/dev-lang/julia/Manifest
index 0316e95..f7fb6e1 100644
--- a/dev-lang/julia/Manifest
+++ b/dev-lang/julia/Manifest
@@ -4,6 +4,8 @@ DIST dsfmt-2.2.tar.gz 291253 SHA256 bc3947a9b2253a869fcbab8ff395416cb12958be9dba
DIST julia-0.2.0.tar.bz2 4393404 SHA256 fecde7b4fbd26093dedd04564ce12b47a232525bf036c7b5f392f369ddc9a514 SHA512 3e0718c69936959dc717cf511f8fd7086eedb2fd4996519fcdb54a0b0c38d09b5b1c7d239e9e42234aab869446feec88bfd40b5419ae74c9f15bf523a757e898 WHIRLPOOL 265650e99028260d1dfe76c504468eca23bad0881790893d8b4b6cd98b0b5a936dc064ee1b661a04c762e2d78d4d23243158f594afef27001c8b4a0de259afff
DIST julia-0.2.1.tar.gz 1899534 SHA256 be07283635b1bd73085f0152d3433762c1aaf115faa0e663a94d63f09c34f1b0 SHA512 67f89d88b2fca355482b2c979d50b865c9a772883bcec3b5cb82d0e096e168153972ada517d078fca1c13352b118ce9f031da162432308025f4437340d5d6635 WHIRLPOOL 22c12397e7bd217b628c3ba4e99f5e252011af1106c12abb4f796bcae544972e2d548f4858b30c7c5dfb6ef935fbc4181e3d5dbe3cc8a4bcac922f0b52d75fb3
DIST julia-0.3.0.tar.gz 2271301 SHA256 1e9778129231aeff4e5f6100b0b71d2dbc4306cfc92cf533e527907d4a7a9aa1 SHA512 1f5affffc24a62ba791af5edfd1051435a20866fb5c46796e6ddb5037b0bea482a79b86bf77cf76565fd7833d87a9b8f3f03df7d5f537b72c5655bddaaf3e033 WHIRLPOOL b908a2c0bfbe649d102071b6a3207a60cafa38370c3ab7bb10eec3fe258f6d7da76f30bd71f8deba7ab3d40068816ddbf6c7ee42c6b154c0f873c5c67e975d4c
+DIST julia-0.4.3-bundled.tar.gz 2678787 SHA256 9451160add4c1fa537762627abcd3dd5fecca9ce44f71c4140d89a4bb6b23392 SHA512 919ca7b99a6eb17a651ce24fe07e5c12bfcee54ce86fac8f744765195002e8f3330df9059fadd5af3408c1f7e067e247ad4bb135879ae4ae43e1457245f90db9 WHIRLPOOL 94bb022d4f1586dfdc2f52286db423cb09898a3a5dff2f2086ca111b9117dca808758351dada23cea1056a8e5c3b33f6919410c34af96a92a4a9f8b0e0758783
+DIST julia-0.4.3.tar.gz 5563437 SHA256 b2c12b267c0d8eb380f6628e7be48c7ec46d2cfb5c585ecb3ca4cc442650e4e0 SHA512 7d5180c69573452c00563c7b98514fc9e4f0f70762912cf4f90cbf632e4b23ec149295ff1955164833ab94efd1feab992067996e3d60f795850542cf2f18f67f WHIRLPOOL 75c3ebf8cb1af67158896872e098bf66a8073eba3daf6cf5903471d34201e1605458e59f14c19ff5177413daee5aac102ec69a0afe9a93a219698a4640acaf33
DIST libuv-julia-0.2.1.tar.gz 652078 SHA256 60a98962ab7e10c924604ccd3373083e8c376a01fcac4bf568058b1f6b026f81 SHA512 73cc9903d1d9d8b8aa8c02543058f4c407aa6b125eb26506f55115cab212bcb7c1af0d215c2b9ca771f135d3913c1490a510294d658bf8d5a6dbee3dd397226f WHIRLPOOL 42b204b8cb071919b796ed745150b848fabe94668d7fb92a39505c86fefa98f52812ac2bec05821214c7e2c7120b06a47eb66e4a1a2a3acc209264244773faa3
DIST libuv-julia-0.3.0.tar.bz2 13541514 SHA256 8bd7461a316ed67928f9bd0a83e9c45083500c9784561647f12bc05629519e26 SHA512 405df88e102d7a9700ff5c691059283b0509c5236855cba1cccd042493a4deda9397d010e4d6d8a2df8dd03cb6e82597471271bb6f2a58855c6bc6fe84caffcd WHIRLPOOL a4610ff4382767e02b24922ec8a5e8f7c2df7f53f7710a9270f0b32f53b5b015de64d8f1f466066fe4ce2305adb2bf996c903edb58345ea8e232bd9dd5bc6cfb
DIST rmath-0_p20140821.tar.bz2 455123 SHA256 39ea3c27d757b811caeb36d3f5c40ba908365752fbf74e5fdeed42964df09947 SHA512 22442852e6042fe8ce78252af7e88718a33774d0f34f26dafcd4313bb077f718801d207dded7c5c3368bc7554074fdf5975c615dc35ea0b28b071f2d8f91baf8 WHIRLPOOL dd6de751c46a8e5ca84cf00ba19951b4f1fcc6b80375861f9eeaeea6d15f48cec77661318edc6542ec0bafeb9b05b2be27f5c97173171427c84f48eb24310d7e
diff --git a/dev-lang/julia/files/julia-0.4.3-fix_build_system.patch b/dev-lang/julia/files/julia-0.4.3-fix_build_system.patch
new file mode 100644
index 0000000..c83f043
--- /dev/null
+++ b/dev-lang/julia/files/julia-0.4.3-fix_build_system.patch
@@ -0,0 +1,140 @@
+diff --git a/Make.inc b/Make.inc
+index da01e38..c751607 100644
+--- a/Make.inc
++++ b/Make.inc
+@@ -297,7 +297,7 @@ JCFLAGS = -std=gnu99 -pipe $(fPIC) -fno-strict-aliasing -D_FILE_OFFSET_BITS=64
+ JCPPFLAGS =
+ JCXXFLAGS = -pipe $(fPIC) -fno-rtti
+ DEBUGFLAGS = -O0 -ggdb3 -DJL_DEBUG_BUILD -fstack-protector-all
+-SHIPFLAGS = -O3 -ggdb3 -falign-functions
++SHIPFLAGS = GENTOOCFLAGS
+ endif
+
+ ifeq ($(USECLANG),1)
+@@ -307,7 +307,7 @@ JCFLAGS = -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
++SHIPFLAGS = GENTOOCFLAGS
+ ifeq ($(OS), Darwin)
+ ifeq ($(USE_LIBCPP), 1)
+ CC += -stdlib=libc++ -mmacosx-version-min=10.7
+@@ -334,7 +334,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/deps/Makefile b/deps/Makefile
+index 051b23d..881ba68 100644
+--- a/deps/Makefile
++++ b/deps/Makefile
+@@ -862,7 +862,7 @@ OPENSPECFUN_TAR_URL = https://api.github.com/repos/JuliaLang/openspecfun/tarball
+ $(eval $(call git-external,openspecfun,OPENSPECFUN,Makefile,libopenspecfun.$(SHLIB_EXT)))
+
+ # issue 8799
+-OPENSPECFUN_CFLAGS = -O3 -std=c99
++OPENSPECFUN_CFLAGS = GENTOOCFLAGS -std=c99
+ ifeq ($(USEICC),1)
+ OPENSPECFUN_CFLAGS += -fp-model precise
+ endif
+@@ -902,7 +902,7 @@ DSFMT_OBJ_SOURCE = dsfmt-$(DSFMT_VER)/libdSFMT.$(SHLIB_EXT)
+
+ DSFMT_CFLAGS = $(CFLAGS) -DNDEBUG -DDSFMT_MEXP=19937 $(fPIC) -DDSFMT_DO_NOT_USE_OLD_NAMES
+ ifneq ($(USEMSVC), 1)
+-DSFMT_CFLAGS += -O3 -finline-functions -fomit-frame-pointer -fno-strict-aliasing \
++DSFMT_CFLAGS += GENTOOCFLAGS -finline-functions -fno-strict-aliasing \
+ --param max-inline-insns-single=1800 -Wmissing-prototypes -Wall -std=c99 -shared
+ else
+ DSFMT_CFLAGS += -Wl,-dll,-def:../libdSFMT.def
+@@ -1181,7 +1181,7 @@ endif
+ endif
+
+ libgfortblas.$(SHLIB_EXT): gfortblas.c gfortblas.alias
+- $(CC) -Wall -O3 $(CPPFLAGS) $(CFLAGS) $(fPIC) -shared $< -o $@ -pipe \
++ $(CC) -Wall GENTOOCFLAGS $(CPPFLAGS) $(CFLAGS) $(fPIC) -shared $< -o $@ -pipe \
+ -Wl,-reexport_framework,Accelerate -Wl,-alias_list,gfortblas.alias
+ $(build_shlibdir)/libgfortblas.$(SHLIB_EXT): libgfortblas.$(SHLIB_EXT)
+ cp -f $< $@
+@@ -1607,10 +1607,10 @@ install-suitesparse: $(SUITESPARSE_OBJ_TARGET) install-suitesparse-wrapper
+ # SUITESPARSE WRAPPER
+
+ ifeq ($(USE_SYSTEM_SUITESPARSE), 1)
+-SUITESPARSE_INC = -I /usr/include/suitesparse
++
+ SUITESPARSE_LIB = -lumfpack -lcholmod -lamd -lcamd -lcolamd -lspqr
+ else
+-SUITESPARSE_INC = -I SuiteSparse-$(SUITESPARSE_VER)/CHOLMOD/Include -I SuiteSparse-$(SUITESPARSE_VER)/SuiteSparse_config -I SuiteSparse-$(SUITESPARSE_VER)/SPQR/Include
++
+ SUITESPARSE_LIB = -L$(build_shlibdir) -lcholmod -lumfpack -lspqr $(RPATH_ORIGIN)
+ $(build_shlibdir)/libsuitesparse_wrapper.$(SHLIB_EXT): $(SUITESPARSE_OBJ_TARGET)
+ endif
+diff --git a/deps/checksums/Rmath-julia-0.1.tar.gz/sha512 b/deps/checksums/Rmath-julia-0.1.tar.gz/sha512
+index 6a64d44..6bbeb34 100644
+--- a/deps/checksums/Rmath-julia-0.1.tar.gz/sha512
++++ b/deps/checksums/Rmath-julia-0.1.tar.gz/sha512
+@@ -1 +1 @@
+-1dd94eca05bc06c3f33e8be5087d3b1742d01c8b38588e0fa79b8f6b9998760bca21bee1b65873825c4dde2d994a8271166bc21f670a34810fa9db598473a887
++15da0b3ff16113d5ad44c7ec42a1c8e260973883dd85ee174b3526f01137a94136cb03d4bbecb9267b7ca20d5ffc10670496d589cf60b86930f869a9fe219794
+diff --git a/doc/Makefile b/doc/Makefile
+index 08ba8dd..078d725 100644
+--- a/doc/Makefile
++++ b/doc/Makefile
+@@ -56,7 +56,7 @@ help:
+ @echo " doctest to run all doctests embedded in the documentation (if enabled)"
+
+ clean:
+- -rm -rf _build/*
++ @echo "Do not clean doc/_build/html. Just use it..."
+
+ cleanall: clean
+
+diff --git a/src/Makefile b/src/Makefile
+index 98fa704..b566791 100644
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -26,15 +26,8 @@ endif
+
+ # 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.
+-LLVMLINK = $(call exec,$(LLVM_CONFIG) --ldflags) $(call exec,$(LLVM_CONFIG) --libs) $(call exec,$(LLVM_CONFIG) --ldflags) $(call exec,$(LLVM_CONFIG) --system-libs 2> /dev/null)
+-ifeq ($(USE_LLVM_SHLIB),1)
+-ifeq ($(LLVM_USE_CMAKE),1)
+-LLVMLINK = $(call exec,$(LLVM_CONFIG) --ldflags) -lLLVM
+-else
+-LLVMLINK = $(call exec,$(LLVM_CONFIG) --ldflags) -lLLVM-$(call exec,$(LLVM_CONFIG) --version)
+-endif
++LLVMLINK = $(call exec,$(LLVM_CONFIG) --ldflags) $(call exec,$(LLVM_CONFIG) --libs) $(call exec,$(LLVM_CONFIG) --ldflags) $(call exec,$(LLVM_CONFIG) --system-libs)
+ FLAGS += -DLLVM_SHLIB
+-endif
+
+ 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/ui/Makefile b/ui/Makefile
+index c9b5d0e..557a38c 100644
+--- a/ui/Makefile
++++ b/ui/Makefile
+@@ -20,15 +20,10 @@ OBJS = $(SRCS:%=%.o)
+ DOBJS = $(SRCS:%=%.dbg.obj)
+ DEBUGFLAGS += $(FLAGS)
+ SHIPFLAGS += $(FLAGS)
+-ifeq ($(USE_LLVM_SHLIB),1)
+-ifeq ($(LLVM_USE_CMAKE),1)
+-LLVMLINK = $(call exec,$(LLVM_CONFIG) --ldflags) -lLLVM
+-else
+-LLVMLINK = $(call exec,$(LLVM_CONFIG) --ldflags) -lLLVM-$(call exec,$(LLVM_CONFIG) --version)
+-endif
+-else
+-LLVMLINK =
+-endif
++
++LLVMLINK = $(call exec,$(LLVM_CONFIG) --ldflags) $(call exec,$(LLVM_CONFIG) --libs) $(call exec,$(LLVM_CONFIG) --ldflags) $(call exec,$(LLVM_CONFIG) --system-libs)
++FLAGS += -DLLVM_SHLIB
++
+ JLDFLAGS += $(LDFLAGS) $(NO_WHOLE_ARCHIVE) $(OSLIBS) $(LLVMLINK) $(RPATH)
+
+ ifeq ($(USE_SYSTEM_LIBM),0)
diff --git a/dev-lang/julia/julia-0.4.3.ebuild b/dev-lang/julia/julia-0.4.3.ebuild
new file mode 100644
index 0000000..108dc30
--- /dev/null
+++ b/dev-lang/julia/julia-0.4.3.ebuild
@@ -0,0 +1,183 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+RESTRICT="test"
+
+inherit elisp-common eutils multilib pax-utils toolchain-funcs
+
+DESCRIPTION="High-performance programming language for technical computing"
+HOMEPAGE="http://julialang.org/"
+SRC_URI="
+ https://github.com/JuliaLang/${PN}/releases/download/v${PV}/${P}.tar.gz
+ https://dev.gentoo.org/~tamiko/${P}-bundled.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="emacs"
+
+RDEPEND="
+ dev-lang/R:0=
+ dev-libs/double-conversion:0=
+ dev-libs/gmp:0=
+ dev-libs/libgit2:0=
+ dev-libs/mpfr:0=
+ dev-libs/openspecfun
+ sci-libs/arpack:0=
+ sci-libs/camd:0=
+ sci-libs/cholmod:0=
+ sci-libs/fftw:3.0=
+ sci-libs/openlibm:0=
+ sci-libs/spqr:0=
+ sci-libs/umfpack:0=
+ sci-mathematics/glpk:0=
+ >=sys-devel/llvm-3.5:0=
+ >=sys-libs/libunwind-1.1:7=
+ sys-libs/readline:0=
+ sys-libs/zlib:0=
+ virtual/blas
+ virtual/lapack
+ emacs? ( app-emacs/ess )"
+
+DEPEND="${RDEPEND}
+ dev-util/patchelf
+ virtual/pkgconfig"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-fix_build_system.patch
+)
+
+src_prepare() {
+ mv "${WORKDIR}"/bundled/dsfmt-2.2.3.tar.gz deps/ || die
+ mv "${WORKDIR}"/bundled/libuv-efb40768b7c7bd9f173a7868f74b92b1c5a61a0e.tar.gz deps/ || die
+ mv "${WORKDIR}"/bundled/pcre2-10.20.tar.bz2 deps/ || die
+ mv "${WORKDIR}"/bundled/Rmath-julia-0.1.tar.gz deps/ || die
+ mv "${WORKDIR}"/bundled/utf8proc-85789180158ac7fff85b9f008828d6ac44f072ea.tar.gz deps/ || die
+ rmdir "${WORKDIR}"/bundled || die
+
+ epatch "${PATCHES[@]}"
+
+ # 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|$(JLDOWNLOAD)|${EPREFIX}/bin/true|' \
+ -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 lblas="$($(tc-getPKG_CONFIG) --libs blas)"
+ lblas=${lblas%% *}
+ local llapack="$($(tc-getPKG_CONFIG) --libs lapack)"
+ llapack=${llapack%% *}
+
+ sed -i \
+ -e "s|\(JULIA_EXECUTABLE = \)\(\$(JULIAHOME)/julia\)|\1 LD_LIBRARY_PATH=\$(BUILD)/$(get_libdir) \2|" \
+ -e "s|GENTOOCFLAGS|${CFLAGS}|g" \
+ -e "s|LIBDIR = lib|LIBDIR = $(get_libdir)|" \
+ -e "s|/usr/lib|${EPREFIX}/usr/$(get_libdir)|" \
+ -e "s|/usr/include|${EPREFIX}/usr/include|" \
+ -e "s|\$(BUILD)/lib|\$(BUILD)/$(get_libdir)|" \
+ -e "s|^JULIA_COMMIT = .*|JULIA_COMMIT = v${PV}|" \
+ -e "s|-lblas|${lblas}|" \
+ -e "s|= libblas|= lib${lblas#-l}|" \
+ -e "s|-llapack|${llapack}|" \
+ -e "s|= liblapack|= lib${llapack#-l}|" \
+ 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
+}
+
+src_configure() {
+ # julia does not play well with the system versions of
+ # dsfmt, libuv, pcre2 and utf8proc
+ cat <<-EOF > Make.user
+ USE_SYSTEM_DSFMT=0
+ USE_SYSTEM_LIBUV=0
+ USE_SYSTEM_PCRE=0
+ USE_SYSTEM_RMATH=0
+ USE_SYSTEM_UTF8PROC=0
+ USE_LLVM_SHLIB=1
+ 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=1
+ 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
+ EOF
+
+}
+
+src_compile() {
+ emake cleanall
+ emake julia-release \
+ prefix="/usr" DESTDIR="${D}" CC="$(tc-getCC)" CXX="$(tc-getCXX)"
+ pax-mark m $(file usr/bin/julia-* | awk -F : '/ELF/ {print $1}')
+ emake
+ use emacs && elisp-compile contrib/julia-mode.el
+}
+
+src_test() {
+ emake test
+}
+
+src_install() {
+ emake install \
+ prefix="/usr" DESTDIR="${D}" CC="$(tc-getCC)" CXX="$(tc-getCXX)"
+ cat > 99julia <<-EOF
+ LDPATH=${EROOT%/}/usr/$(get_libdir)/julia
+ EOF
+ doenvd 99julia
+
+ if use emacs; then
+ elisp-install "${PN}" contrib/julia-mode.el
+ elisp-site-file-install "${FILESDIR}"/63julia-gentoo.el
+ fi
+ dodoc README.md
+
+ mv "${ED}"/usr/etc/julia "${ED}"/etc || die
+ rmdir "${ED}"/usr/etc || die
+ rmdir "${ED}"/usr/libexec || die
+ mv "${ED}"/usr/share/doc/julia/{examples,html} \
+ "${ED}"/usr/share/doc/${P} || die
+ rmdir "${ED}"/usr/share/doc/julia || die
+ if [[ $(get_libdir) != lib ]]; then
+ mkdir -p "${ED}"/usr/$(get_libdir) || die
+ mv "${ED}"/usr/lib/julia "${ED}"/usr/$(get_libdir)/julia || die
+ fi
+}
+
+pkg_postinst() {
+ use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+ use emacs && elisp-site-regen
+}
^ permalink raw reply related [flat|nested] 24+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-lang/julia/, dev-lang/julia/files/
@ 2016-01-16 11:39 Matthias Maier
0 siblings, 0 replies; 24+ messages in thread
From: Matthias Maier @ 2016-01-16 11:39 UTC (permalink / raw
To: gentoo-commits
commit: b98522085a371374df2b878fda7494bec8140591
Author: Matthias Maier <tamiko <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 16 11:26:39 2016 +0000
Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org>
CommitDate: Sat Jan 16 11:33:13 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b9852208
dev-lang/julia: drop old 0.2* versions
Package-Manager: portage-2.2.26
dev-lang/julia/Manifest | 5 -
dev-lang/julia/files/julia-0.2.1-patchelf.patch | 16 ---
dev-lang/julia/files/julia-0.2.1-readline63.patch | 17 ---
dev-lang/julia/julia-0.2.0-r1.ebuild | 106 ---------------
dev-lang/julia/julia-0.2.0.ebuild | 79 -----------
dev-lang/julia/julia-0.2.1-r2.ebuild | 152 ----------------------
6 files changed, 375 deletions(-)
diff --git a/dev-lang/julia/Manifest b/dev-lang/julia/Manifest
index f7fb6e1..453f540 100644
--- a/dev-lang/julia/Manifest
+++ b/dev-lang/julia/Manifest
@@ -1,12 +1,7 @@
DIST dSFMT-src-2.2.tar.gz 291253 SHA256 bc3947a9b2253a869fcbab8ff395416cb12958be9dba10793db2cd7e37b26899 SHA512 e59d54166dc2df9f6e6abd68658c3624082feabe445215256fead47a8944c41578d11c2b4ba57eac174587a45e445b2aabd867db24fd9e951842513cf914f60b WHIRLPOOL 986b24d8c302f21e305a6bbc6b33e42678c27018c71c566d3f052ce7600fd06c81d77375d08b2b40c0c4aa93ca74cad819a34d0350e33a61f5837f27de7cf193
-DIST double-conversion-1.1.1.tar.gz 7012946 SHA256 e1cabb73fd69e74f145aea91100cde483aef8b79dc730fcda0a34466730d4d1d SHA512 e116196eb60077565050995b060049747a3c72e743eea21c6c9fb68414adc533d456d19e1ca241f08895cca97a38511477bdc7d2e0cae38d149c83cb9d6896ad WHIRLPOOL d69604fbb6e1b5cac8d4dd0f8cf0af4621e32548e9e5061dcb843067a3f821c6f52e918e3e367988076b9ccf0be0ab68107cc6a21b02f4de424a1d98b399fc33
-DIST dsfmt-2.2.tar.gz 291253 SHA256 bc3947a9b2253a869fcbab8ff395416cb12958be9dba10793db2cd7e37b26899 SHA512 e59d54166dc2df9f6e6abd68658c3624082feabe445215256fead47a8944c41578d11c2b4ba57eac174587a45e445b2aabd867db24fd9e951842513cf914f60b WHIRLPOOL 986b24d8c302f21e305a6bbc6b33e42678c27018c71c566d3f052ce7600fd06c81d77375d08b2b40c0c4aa93ca74cad819a34d0350e33a61f5837f27de7cf193
-DIST julia-0.2.0.tar.bz2 4393404 SHA256 fecde7b4fbd26093dedd04564ce12b47a232525bf036c7b5f392f369ddc9a514 SHA512 3e0718c69936959dc717cf511f8fd7086eedb2fd4996519fcdb54a0b0c38d09b5b1c7d239e9e42234aab869446feec88bfd40b5419ae74c9f15bf523a757e898 WHIRLPOOL 265650e99028260d1dfe76c504468eca23bad0881790893d8b4b6cd98b0b5a936dc064ee1b661a04c762e2d78d4d23243158f594afef27001c8b4a0de259afff
-DIST julia-0.2.1.tar.gz 1899534 SHA256 be07283635b1bd73085f0152d3433762c1aaf115faa0e663a94d63f09c34f1b0 SHA512 67f89d88b2fca355482b2c979d50b865c9a772883bcec3b5cb82d0e096e168153972ada517d078fca1c13352b118ce9f031da162432308025f4437340d5d6635 WHIRLPOOL 22c12397e7bd217b628c3ba4e99f5e252011af1106c12abb4f796bcae544972e2d548f4858b30c7c5dfb6ef935fbc4181e3d5dbe3cc8a4bcac922f0b52d75fb3
DIST julia-0.3.0.tar.gz 2271301 SHA256 1e9778129231aeff4e5f6100b0b71d2dbc4306cfc92cf533e527907d4a7a9aa1 SHA512 1f5affffc24a62ba791af5edfd1051435a20866fb5c46796e6ddb5037b0bea482a79b86bf77cf76565fd7833d87a9b8f3f03df7d5f537b72c5655bddaaf3e033 WHIRLPOOL b908a2c0bfbe649d102071b6a3207a60cafa38370c3ab7bb10eec3fe258f6d7da76f30bd71f8deba7ab3d40068816ddbf6c7ee42c6b154c0f873c5c67e975d4c
DIST julia-0.4.3-bundled.tar.gz 2678787 SHA256 9451160add4c1fa537762627abcd3dd5fecca9ce44f71c4140d89a4bb6b23392 SHA512 919ca7b99a6eb17a651ce24fe07e5c12bfcee54ce86fac8f744765195002e8f3330df9059fadd5af3408c1f7e067e247ad4bb135879ae4ae43e1457245f90db9 WHIRLPOOL 94bb022d4f1586dfdc2f52286db423cb09898a3a5dff2f2086ca111b9117dca808758351dada23cea1056a8e5c3b33f6919410c34af96a92a4a9f8b0e0758783
DIST julia-0.4.3.tar.gz 5563437 SHA256 b2c12b267c0d8eb380f6628e7be48c7ec46d2cfb5c585ecb3ca4cc442650e4e0 SHA512 7d5180c69573452c00563c7b98514fc9e4f0f70762912cf4f90cbf632e4b23ec149295ff1955164833ab94efd1feab992067996e3d60f795850542cf2f18f67f WHIRLPOOL 75c3ebf8cb1af67158896872e098bf66a8073eba3daf6cf5903471d34201e1605458e59f14c19ff5177413daee5aac102ec69a0afe9a93a219698a4640acaf33
-DIST libuv-julia-0.2.1.tar.gz 652078 SHA256 60a98962ab7e10c924604ccd3373083e8c376a01fcac4bf568058b1f6b026f81 SHA512 73cc9903d1d9d8b8aa8c02543058f4c407aa6b125eb26506f55115cab212bcb7c1af0d215c2b9ca771f135d3913c1490a510294d658bf8d5a6dbee3dd397226f WHIRLPOOL 42b204b8cb071919b796ed745150b848fabe94668d7fb92a39505c86fefa98f52812ac2bec05821214c7e2c7120b06a47eb66e4a1a2a3acc209264244773faa3
DIST libuv-julia-0.3.0.tar.bz2 13541514 SHA256 8bd7461a316ed67928f9bd0a83e9c45083500c9784561647f12bc05629519e26 SHA512 405df88e102d7a9700ff5c691059283b0509c5236855cba1cccd042493a4deda9397d010e4d6d8a2df8dd03cb6e82597471271bb6f2a58855c6bc6fe84caffcd WHIRLPOOL a4610ff4382767e02b24922ec8a5e8f7c2df7f53f7710a9270f0b32f53b5b015de64d8f1f466066fe4ce2305adb2bf996c903edb58345ea8e232bd9dd5bc6cfb
DIST rmath-0_p20140821.tar.bz2 455123 SHA256 39ea3c27d757b811caeb36d3f5c40ba908365752fbf74e5fdeed42964df09947 SHA512 22442852e6042fe8ce78252af7e88718a33774d0f34f26dafcd4313bb077f718801d207dded7c5c3368bc7554074fdf5975c615dc35ea0b28b071f2d8f91baf8 WHIRLPOOL dd6de751c46a8e5ca84cf00ba19951b4f1fcc6b80375861f9eeaeea6d15f48cec77661318edc6542ec0bafeb9b05b2be27f5c97173171427c84f48eb24310d7e
DIST utf8proc-v1.1.6.tar.gz 105825 SHA256 fedc8fa78022eb8f0584fbc85c9f9571bcd7fd510de0ce16955289c42f4199e7 SHA512 3bec2388298c201d9d6992cdd36330f1109d26a37b3411ba633f006f40da9e494ba0565051b763a7d3014e6113cd1e7754e6b95d5cbb2d7b50cee55193f0fdc1 WHIRLPOOL c211419407e80893b66fa7586a8148e9b2e45c89d2d31878658a4ae7f0b1ca72e269cef234ca8b30e27e4bac5a48715520dd546f6605af773d6e165ef76f81b0
diff --git a/dev-lang/julia/files/julia-0.2.1-patchelf.patch b/dev-lang/julia/files/julia-0.2.1-patchelf.patch
deleted file mode 100644
index 663cf04..0000000
--- a/dev-lang/julia/files/julia-0.2.1-patchelf.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- deps/Makefile 2014-06-25 15:57:04.618463213 +0800
-+++ deps/Makefile.new 2014-06-25 16:06:36.342318418 +0800
-@@ -42,14 +42,7 @@
- endif
- endif
-
--ifeq ($(OS), Linux)
--ifneq ($(shell patchelf --version 2>/dev/null), patchelf 0.6)
--STAGE1_DEPS += patchelf
--PATCHELF=$(BUILD)/bin/patchelf
--else
- PATCHELF=patchelf
--endif
--endif
-
- ## USE_SYSTEM_LIBS options
diff --git a/dev-lang/julia/files/julia-0.2.1-readline63.patch b/dev-lang/julia/files/julia-0.2.1-readline63.patch
deleted file mode 100644
index cc9ede5..0000000
--- a/dev-lang/julia/files/julia-0.2.1-readline63.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Description: Fix FTBFS against readline 6.3
-Origin: backport, https://github.com/JuliaLang/julia/commit/d2552e0f03d1dc23d6bb0c89c39da3d73c7aa4e5
-Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=741824
-Last-Update: 2014-03-16
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/ui/repl-readline.c
-+++ b/ui/repl-readline.c
-@@ -831,7 +831,7 @@ void jl_init_repl(int history)
- rl_instream = fopen("/dev/null","r");
- prompt_length = 7; // == strlen("julia> ")
- init_history();
-- rl_startup_hook = (Function*)init_rl;
-+ rl_startup_hook = (rl_hook_func_t*)init_rl;
- }
-
- static char *prompt_string=NULL;
diff --git a/dev-lang/julia/julia-0.2.0-r1.ebuild b/dev-lang/julia/julia-0.2.0-r1.ebuild
deleted file mode 100644
index 02596c5..0000000
--- a/dev-lang/julia/julia-0.2.0-r1.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-EAPI=5
-
-inherit eutils multilib pax-utils
-
-DESCRIPTION="High-level, high-performance dynamic programming language for technical computing"
-
-HOMEPAGE="http://julialang.org/"
-
-# uses gfortran in some places, dependencies don't reflect that yet
-
-# tarball remade because upstream lacks submodules, so it's not able to build
-# soo ... they bundle a split out part of v8 that has no build system that makes sense
-# double-conversion nailed in to make build system happy
-# dSFMT is not meant to be packaged
-SRC_URI="http://gentooexperimental.org/~patrick/${P}.tar.bz2
- http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/SFMT/dSFMT-src-2.2.tar.gz -> dsfmt-2.2.tar.gz
- https://double-conversion.googlecode.com/files/double-conversion-1.1.1.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-
-KEYWORDS="~amd64 ~x86"
-
-IUSE=""
-
-S="${WORKDIR}"
-
-# Avoid fragile duplication - see compile and install phases
-JULIAMAKEARGS="QUIET_MAKE= USE_SYSTEM_LLVM=1 USE_SYSTEM_READLINE=1 USE_SYSTEM_PCRE=1 USE_SYSTEM_LIBM=1 \
- USE_SYSTEM_GMP=1 USE_SYSTEM_LIBUNWIND=1 USE_SYSTEM_PATCHELF=1 USE_SYSTEM_FFTW=1 USE_SYSTEM_ZLIB=1 \
- USE_SYSTEM_MPFR=1 USE_SYSTEM_SUITESPARSE=1 USE_SYSTEM_ARPACK=1 USE_SYSTEM_BLAS=1 USE_SYSTEM_LAPACK=1 \
- LLVM_CONFIG=/usr/bin/llvm-config USE_BLAS64=0"
-
-# Disabling use of 64-bit integers. If you want 64-bit integers then you need to use a BLAS implementation from the
-# science overlay, and julia-9999 also from the science overlay.
-
-# scons is a dep of double-conversion
-DEPEND="
- =sys-devel/llvm-3.3*
- dev-lang/perl
- sys-libs/readline
- dev-libs/libpcre
- dev-util/scons
- dev-libs/gmp
- sys-libs/libunwind
- dev-util/patchelf
- sci-libs/fftw
- sys-libs/zlib
- dev-libs/mpfr
- sci-libs/suitesparse
- sci-libs/arpack
- virtual/lapack
- virtual/blas
- "
-RDEPEND="sys-libs/readline"
-
-src_prepare() {
- #uurgh, no fetching in ebuild
- sed -i -e 's~$(JLDOWNLOAD)~/bin/true~' deps/Makefile || die "Oopsie"
- sed -i -e 's~git submodule~/bin/true~g' deps/Makefile || die "Ooopsie"
- # and we need to build stuff, so ... let's just copy around and pray!
- mkdir -p deps/random
- cp "${DISTDIR}/dsfmt-2.2.tar.gz" deps/random/
- cp "${DISTDIR}/double-conversion-1.1.1.tar.gz" deps/
- # Detect what BLAS and LAPACK implementations are being used
- local BLAS_LIB="$($(tc-getPKG_CONFIG) --libs-only-l blas | sed 's/ .*$//')"
- local LAPACK_LIB="$($(tc-getPKG_CONFIG) --libs-only-l lapack | sed 's/ .*$//')"
- sed -e "s|-lblas|${BLAS_LIB}|" -i Make.inc || die
- sed -e "s|libblas|${BLAS_LIB/-l/lib}.so|" -i Make.inc || die
- sed -e "s|-llapack|${LAPACK_LIB}|" -i Make.inc || die
- sed -e "s|liblapack|${LAPACK_LIB/-l/lib}.so|" -i Make.inc || die
- sed -e "s|JL_PRIVATE_LIBDIR = lib/julia|JL_PRIVATE_LIBDIR = $(get_libdir)/julia|" \
- -e "s|JL_LIBDIR = lib|JL_LIBDIR = $(get_libdir)|" \
- -e "s|/usr/lib|/usr/$(get_libdir)|" \
- -e "s|\$(BUILD)/lib|\$(BUILD)/$(get_libdir)|g" \
- -i Make.inc || die
- # Set version to package version instead of git commit number
- sed -e "s|^JULIA_COMMIT = .*|JULIA_COMMIT = v${PV}|" -i Make.inc || die
- sed -e "s|\$(BUILD)/lib|\$(BUILD)/$(get_libdir)|g" \
- -i Makefile || die
-}
-
-src_compile() {
- mkdir -p usr/$(get_libdir) || die
- pushd usr || die
- ln -s $(get_libdir) lib || die
- popd
- emake $JULIAMAKEARGS julia-release || die
- for i in usr/bin/julia-*
- do
- if file ${i} | grep ELF >/dev/null; then
- pax-mark m ${i}
- fi
- done
- emake $JULIAMAKEARGS || die
- # makefile weirdness - avoid compile in src_install
- emake $JULIAMAKEARGS debug || die
-}
-
-src_install() {
- # config goes to /usr/etc/ - should be fixed
- emake $JULIAMAKEARGS PREFIX="${D}/usr" install || die
-}
diff --git a/dev-lang/julia/julia-0.2.0.ebuild b/dev-lang/julia/julia-0.2.0.ebuild
deleted file mode 100644
index 26bb1b8..0000000
--- a/dev-lang/julia/julia-0.2.0.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-EAPI=5
-
-inherit eutils
-
-DESCRIPTION="High-level, high-performance dynamic programming language for technical computing"
-
-HOMEPAGE="http://julialang.org/"
-
-# uses gfortran in some places, dependencies don't reflect that yet
-
-# tarball remade because upstream lacks submodules, so it's not able to build
-# soo ... they bundle a split out part of v8 that has no build system that makes sense
-# double-conversion nailed in to make build system happy
-# dSFMT is not meant to be packaged
-SRC_URI="http://gentooexperimental.org/~patrick/${P}.tar.bz2
- http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/SFMT/dSFMT-src-2.2.tar.gz -> dsfmt-2.2.tar.gz
- https://double-conversion.googlecode.com/files/double-conversion-1.1.1.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-
-KEYWORDS="~amd64 ~x86"
-
-IUSE=""
-
-S="${WORKDIR}"
-
-# Avoid fragile duplication - see compile and install phases
-JULIAMAKEARGS="QUIET_MAKE= USE_SYSTEM_LLVM=1 USE_SYSTEM_READLINE=1 USE_SYSTEM_PCRE=1 USE_SYSTEM_LIBM=1 \
- USE_SYSTEM_GMP=1 USE_SYSTEM_LIBUNWIND=1 USE_SYSTEM_PATCHELF=1 USE_SYSTEM_FFTW=1 USE_SYSTEM_ZLIB=1 \
- USE_SYSTEM_MPFR=1 USE_SYSTEM_SUITESPARSE=1 USE_SYSTEM_ARPACK=1 USE_SYSTEM_BLAS=1 USE_SYSTEM_LAPACK=1 \
- LLVM_CONFIG=/usr/bin/llvm-config"
-
-# scons is a dep of double-conversion
-DEPEND="
- =sys-devel/llvm-3.3*
- dev-lang/perl
- sys-libs/readline
- dev-libs/libpcre
- dev-util/scons
- dev-libs/gmp
- sys-libs/libunwind
- dev-util/patchelf
- sci-libs/fftw
- sys-libs/zlib
- dev-libs/mpfr
- sci-libs/suitesparse
- sci-libs/arpack
- virtual/lapack
- virtual/blas
- "
-RDEPEND="sys-libs/readline"
-
-src_prepare() {
- #uurgh, no fetching in ebuild
- sed -i -e 's~$(JLDOWNLOAD)~/bin/true~' deps/Makefile || die "Oopsie"
- sed -i -e 's~git submodule~/bin/true~g' deps/Makefile || die "Ooopsie"
- # and we need to build stuff, so ... let's just copy around and pray!
- mkdir -p deps/random
- cp "${DISTDIR}/dsfmt-2.2.tar.gz" deps/random/
- cp "${DISTDIR}/double-conversion-1.1.1.tar.gz" deps/
- # Some cleanups to avoid an OpenBlas dep, and remove some useless git errors
- sed -e "s|-lblas|$($(tc-getPKG_CONFIG) --libs blas)|" Make.inc || die
- sed -e 's/$(shell git rev-parse --short=10 HEAD)/v0.2.0/' Make.inc || die
-}
-
-src_compile() {
- emake $JULIAMAKEARGS || die
- # makefile weirdness - avoid compile in src_install
- emake $JULIAMAKEARGS debug || die
-}
-
-src_install() {
- # config goes to /usr/etc/ - should be fixed
- emake $JULIAMAKEARGS PREFIX="${D}/usr" install || die
-}
diff --git a/dev-lang/julia/julia-0.2.1-r2.ebuild b/dev-lang/julia/julia-0.2.1-r2.ebuild
deleted file mode 100644
index 642fd79..0000000
--- a/dev-lang/julia/julia-0.2.1-r2.ebuild
+++ /dev/null
@@ -1,152 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit elisp-common eutils multilib pax-utils toolchain-funcs
-
-PDSFMT=dSFMT-src-2.2
-
-DESCRIPTION="High-performance programming language for technical computing"
-HOMEPAGE="http://julialang.org/"
-SRC_URI="
- https://github.com/JuliaLang/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
- http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/SFMT/${PDSFMT}.tar.gz
- https://dev.gentoo.org/~bicatali/distfiles/libuv-${P}.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="emacs"
-
-RDEPEND="
- dev-lang/R:0=
- dev-libs/double-conversion:0=
- dev-libs/gmp:0=
- dev-libs/libpcre:3=
- dev-libs/mpfr:0=
- sci-libs/arpack:0=
- sci-libs/camd:0=
- sci-libs/cholmod:0=
- sci-libs/fftw:3.0=
- sci-libs/openlibm:0=
- sci-libs/spqr:0=
- sci-libs/umfpack:0=
- sci-mathematics/glpk:0=
- =sys-devel/llvm-3.3*
- >=sys-libs/libunwind-1.1:7=
- sys-libs/readline:0=
- sys-libs/zlib:0=
- virtual/blas
- virtual/lapack
- emacs? ( app-emacs/ess )"
-
-DEPEND="${RDEPEND}
- dev-util/patchelf
- virtual/pkgconfig"
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-readline63.patch
- epatch "${FILESDIR}"/${P}-patchelf.patch
-
- ln -s "${DISTDIR}"/${PDSFMT}.tar.gz deps/random/dsfmt-2.2.tar.gz || die
- rmdir deps/libuv && ln -s "${WORKDIR}"/libuv deps/libuv
- # no fetching in ebuild
- # /usr/include/suitesparse is for debian only
- # respect prefix, flags
- sed -i \
- -e 's|$(JLDOWNLOAD)|${EPREFIX}/bin/true|' \
- -e 's|git submodule|${EPREFIX}/bin/true|g' \
- -e 's|^\(SUITESPARSE_INC\s*=\).*||g' \
- -e "s|-O3|${CFLAGS}|g" \
- -e 's|/usr/bin/||g' \
- -e "s|/usr/include|${EPREFIX%/}/usr/include|g" \
- deps/Makefile || die
-
- sed -i \
- -e "s|\(JULIA_EXECUTABLE = \)\(\$(JULIAHOME)/julia\)|\1 LD_LIBRARY_PATH=\$(BUILD)/$(get_libdir) \2|" \
- -e "s|-O3|${CFLAGS}|g" \
- -e "s|LIBDIR = lib|LIBDIR = $(get_libdir)|" \
- -e "s|/usr/lib|${EPREFIX}/usr/$(get_libdir)|" \
- -e "s|/usr/include|${EPREFIX}/usr/include|" \
- -e "s|\$(BUILD)/lib|\$(BUILD)/$(get_libdir)|" \
- -e "s|^JULIA_COMMIT = .*|JULIA_COMMIT = v${PV}|" \
- 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
-}
-
-src_configure() {
- # libuv is an incompatible fork from upstream, so don't use system one
- cat <<-EOF > Make.user
- LIBLAPACK=$($(tc-getPKG_CONFIG) --libs lapack)
- LIBLAPACKNAME=$($(tc-getPKG_CONFIG) --libs lapack | sed -e "s/-l\([a-z0-9]*\).*/lib\1/")
- USE_LLVM_SHLIB=1
- 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_LIBM=1
- USE_SYSTEM_LIBUNWIND=1
- USE_SYSTEM_LIBUV=0
- USE_SYSTEM_LLVM=1
- USE_SYSTEM_MPFR=1
- USE_SYSTEM_OPENLIBM=1
- USE_SYSTEM_PCRE=1
- USE_SYSTEM_READLINE=1
- USE_SYSTEM_RMATH=1
- USE_SYSTEM_SUITESPARSE=1
- USE_SYSTEM_ZLIB=1
- VERBOSE=1
- EOF
-}
-
-src_compile() {
- # Not parallel-safe, #514882
- emake -j1 cleanall
- if [[ $(get_libdir) != lib ]]; then
- mkdir -p usr/$(get_libdir) || die
- ln -s $(get_libdir) usr/lib || die
- fi
- emake -j1 julia-release
- pax-mark m $(file usr/bin/julia-* | awk -F : '/ELF/ {print $1}')
- emake
- use emacs && elisp-compile contrib/julia-mode.el
-}
-
-src_test() {
- emake test
-}
-
-src_install() {
- emake install PREFIX="${ED}/usr"
- cat > 99julia <<-EOF
- LDPATH=${EROOT%/}/usr/$(get_libdir)/julia
- EOF
- doenvd 99julia
-
- if use emacs; then
- elisp-install "${PN}" contrib/julia-mode.el
- elisp-site-file-install "${FILESDIR}"/63julia-gentoo.el
- fi
- dodoc README.md
-}
-
-pkg_postinst() {
- use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
- use emacs && elisp-site-regen
-}
^ permalink raw reply related [flat|nested] 24+ messages in thread
end of thread, other threads:[~2023-12-17 21:45 UTC | newest]
Thread overview: 24+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-01-07 21:38 [gentoo-commits] repo/gentoo:master commit in: dev-lang/julia/, dev-lang/julia/files/ Matthias Maier
-- strict thread matches above, loose matches on Subject: below --
2023-12-17 21:45 Maciej Barć
2023-05-02 0:39 Maciej Barć
2022-10-28 10:43 Sam James
2022-06-06 5:17 Matthias Maier
2022-04-24 14:41 Michał Górny
2022-01-05 11:00 Matthias Maier
2022-01-05 11:00 Matthias Maier
2022-01-05 11:00 Matthias Maier
2022-01-03 21:37 Matthias Maier
2021-04-08 2:31 Matthias Maier
2021-04-05 9:05 罗百科
2019-01-07 21:38 Matthias Maier
2019-01-07 21:38 Matthias Maier
2018-09-04 1:20 Matthias Maier
2018-07-01 4:49 Matthias Maier
2018-07-01 4:49 Matthias Maier
2017-09-16 5:01 Matthias Maier
2017-07-18 19:39 Matthias Maier
2016-09-24 21:25 Matthias Maier
2016-09-20 6:36 Matthias Maier
2016-09-09 5:46 Matthias Maier
2016-01-16 11:39 Matthias Maier
2016-01-16 11:39 Matthias Maier
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox