patrick     14/07/04 03:22:41

  Modified:             ChangeLog
  Added:                julia-0.2.1-r2.ebuild
  Removed:              julia-0.2.1.ebuild julia-0.2.1-r1.ebuild
  Log:
  Remove things that break compilation #515068
  
  (Portage version: 2.2.10/cvs/Linux x86_64, unsigned Manifest commit)

Revision  Changes    Path
1.14                 dev-lang/julia/ChangeLog

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/julia/ChangeLog?rev=1.14&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/julia/ChangeLog?rev=1.14&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/julia/ChangeLog?r1=1.13&r2=1.14

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-lang/julia/ChangeLog,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- ChangeLog   3 Jul 2014 16:29:52 -0000       1.13
+++ ChangeLog   4 Jul 2014 03:22:41 -0000       1.14
@@ -1,6 +1,12 @@
 # ChangeLog for dev-lang/julia
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/julia/ChangeLog,v 1.13 2014/07/03 
16:29:52 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/julia/ChangeLog,v 1.14 2014/07/04 
03:22:41 patrick Exp $
+
+*julia-0.2.1-r2 (04 Jul 2014)
+
+  04 Jul 2014; Patrick Lauer <patr...@gentoo.org> +julia-0.2.1-r2.ebuild,
+  -julia-0.2.1-r1.ebuild, -julia-0.2.1.ebuild:
+  Remove things that break compilation #515068
 
   03 Jul 2014; Sébastien Fabbro <bicat...@gentoo.org> julia-0.2.1-r1.ebuild:
   Install properly for prefix



1.1                  dev-lang/julia/julia-0.2.1-r2.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/julia/julia-0.2.1-r2.ebuild?rev=1.1&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/julia/julia-0.2.1-r2.ebuild?rev=1.1&content-type=text/plain

Index: julia-0.2.1-r2.ebuild
===================================================================
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-lang/julia/julia-0.2.1-r2.ebuild,v 1.1 
2014/07/04 03:22:41 patrick Exp $

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
        http://dev.gentoo.org/~bicatali/distfiles/libuv-${P}.tar.gz
"

LICENSE="MIT"
SLOT="0"
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
IUSE="emacs"

RDEPEND="${CDEPEND}
        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
}




Reply via email to