commit: 1366cc917b7de5827a411b305827e363bcf95603 Author: Matthias Maier <tamiko <AT> gentoo <DOT> org> AuthorDate: Fri Apr 3 03:16:54 2020 +0000 Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org> CommitDate: Fri Apr 3 03:19:38 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1366cc91
dev-lang/julia: drop live ebuild Package-Manager: Portage-2.3.96, Repoman-2.3.22 Signed-off-by: Matthias Maier <tamiko <AT> gentoo.org> .../julia/files/julia-9999-fix_build_system.patch | 104 ------------ dev-lang/julia/julia-9999.ebuild | 176 --------------------- 2 files changed, 280 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 deleted file mode 100644 index 13cc8cb19da..00000000000 --- a/dev-lang/julia/files/julia-9999-fix_build_system.patch +++ /dev/null @@ -1,104 +0,0 @@ -diff --git a/Make.inc b/Make.inc -index e9cb241198..66f3e6afd7 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 -@@ -416,7 +416,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) -@@ -427,7 +427,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 -@@ -456,7 +456,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 acdd4bb9f8..4483149b2b 100644 ---- a/base/Makefile -+++ b/base/Makefile -@@ -216,7 +216,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 99e60ee665..2027fb5952 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/src/Makefile b/src/Makefile -index e4da8c6357..85a411d9b7 100644 ---- a/src/Makefile -+++ b/src/Makefile -@@ -50,33 +50,7 @@ ifeq ($(USEMSVC), 1) - SRCS += getopt - endif - --LLVMLINK := -- --ifeq ($(JULIACODEGEN),LLVM) --SRCS += codegen jitlayers disasm debuginfo llvm-simdloop llvm-ptls llvm-muladd \ -- llvm-late-gc-lowering llvm-lower-handlers llvm-gc-invariant-verifier \ -- llvm-propagate-addrspaces llvm-multiversioning llvm-alloc-opt cgmemmgr \ -- llvm-api --FLAGS += -I$(shell $(LLVM_CONFIG_HOST) --includedir) --LLVM_LIBS := all --ifeq ($(USE_POLLY),1) --LLVMLINK += -lPolly -lPollyISL --FLAGS += -I$(shell $(LLVM_CONFIG_HOST) --src-root)/tools/polly/include --FLAGS += -I$(shell $(LLVM_CONFIG_HOST) --obj-root)/tools/polly/include --FLAGS += -DUSE_POLLY --ifeq ($(USE_POLLY_OPENMP),1) --FLAGS += -fopenmp --endif --ifeq ($(USE_POLLY_ACC),1) --LLVMLINK += -lPollyPPCG -lGPURuntime --FLAGS += -DUSE_POLLY_ACC --FLAGS += -I$(shell $(LLVM_CONFIG_HOST) --src-root)/tools/polly/tools # Required to find GPURuntime/GPUJIT.h --endif --endif --else --SRCS += anticodegen --LLVM_LIBS := support --endif -+LLVMLINK = $(call exec,$(LLVM_CONFIG) --ldflags) $(call exec,$(LLVM_CONFIG) --libs) $(call exec,$(LLVM_CONFIG) --ldflags) $(call exec,$(LLVM_CONFIG) --system-libs) - - # headers are used for dependency tracking, while public headers will be part of the dist - UV_HEADERS := diff --git a/dev-lang/julia/julia-9999.ebuild b/dev-lang/julia/julia-9999.ebuild deleted file mode 100644 index fc5eddd7e62..00000000000 --- a/dev-lang/julia/julia-9999.ebuild +++ /dev/null @@ -1,176 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -RESTRICT="test" - -inherit git-r3 llvm pax-utils toolchain-funcs - -DESCRIPTION="High-performance programming language for technical computing" -HOMEPAGE="https://julialang.org/"; -SRC_URI="" -EGIT_REPO_URI="https://github.com/JuliaLang/julia.git"; - -LICENSE="MIT" -SLOT="0" -KEYWORDS="" -IUSE="" - -RDEPEND=" - >=sys-devel/llvm-6.0.0:= - >=sys-devel/clang-6.0.0:=" - -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: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}-9999-fix_build_system.patch -) - -src_prepare() { - default - - # Sledgehammer: - # - respect CFLAGS - # - respect EPREFIX and Gentoo specific paths - # - fix BLAS and LAPACK link interface - - sed -i \ - -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 -} - -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 - - # Create symlinks... - local libblas="$($(tc-getPKG_CONFIG) --libs-only-l blas)" - libblas="${libblas%% *}" - libblas="lib${libblas#-l}" - local liblapack="$($(tc-getPKG_CONFIG) --libs-only-l lapack)" - liblapack="${liblapack%% *}" - liblapack="lib${liblapack#-l}" - mkdir -p "${S}"/usr/lib/julia || die "mkdir failed" - for i in ${libblas}.so ${liblapack}.so libumfpack.so libspqr.so; do - ln -s "${EROOT}/usr/$(get_libdir)/${i}" "${S}"/usr/lib/julia/ || die "ln failed" - done - - emake VERBOSE=1 julia-release \ - prefix="${EPREFIX}/usr" DESTDIR="${D}" \ - CC="$(tc-getCC)" CXX="$(tc-getCXX)" - pax-mark m $(file usr/bin/julia-* | awk -F : '/ELF/ {print $1}') - emake -} - -src_test() { - emake test -} - -src_install() { - 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 -}
