aballier    14/11/28 15:42:01

  Modified:             ChangeLog
  Added:                ocaml-4.02.1.ebuild
  Log:
  version bump
  
  Signed-off-by: [email protected]
  (Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key 
160F534A)

Revision  Changes    Path
1.220                dev-lang/ocaml/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-lang/ocaml/ChangeLog,v
retrieving revision 1.219
retrieving revision 1.220
diff -u -r1.219 -r1.220
--- ChangeLog   18 Jan 2014 13:12:48 -0000      1.219
+++ ChangeLog   28 Nov 2014 15:42:01 -0000      1.220
@@ -1,6 +1,11 @@
 # ChangeLog for dev-lang/ocaml
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ocaml/ChangeLog,v 1.219 2014/01/18 
13:12:48 gienah Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ocaml/ChangeLog,v 1.220 2014/11/28 
15:42:01 aballier Exp $
+
+*ocaml-4.02.1 (28 Nov 2014)
+
+  28 Nov 2014; Alexis Ballier <[email protected]> +ocaml-4.02.1.ebuild:
+  version bump
 
   18 Jan 2014; Mark Wright <[email protected]>
   +files/ocaml-3.11.2-Fix-ocamlopt-w.r.t.-binutils-2.21.patch,



1.1                  dev-lang/ocaml/ocaml-4.02.1.ebuild

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

Index: ocaml-4.02.1.ebuild
===================================================================
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-lang/ocaml/ocaml-4.02.1.ebuild,v 1.1 
2014/11/28 15:42:01 aballier Exp $

EAPI="5"

inherit flag-o-matic eutils multilib versionator toolchain-funcs

PATCHLEVEL="6"
MY_P="${P/_/+}"
DESCRIPTION="Fast modern type-inferring functional programming language 
descended from the ML family"
HOMEPAGE="http://www.ocaml.org/";
SRC_URI="http://caml.inria.fr/pub/distrib/ocaml-$(get_version_component_range 
1-2)/${MY_P}.tar.xz
        mirror://gentoo/${PN}-patches-${PATCHLEVEL}.tar.bz2"

LICENSE="QPL-1.0 LGPL-2"
# Everytime ocaml is updated to a new version, everything ocaml must be rebuilt,
# so here we go with the subslot.
SLOT="0/${PV}"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 
~amd64-fbsd ~amd64-linux ~x86-fbsd ~x86-linux"
IUSE="emacs latex ncurses +ocamlopt X xemacs"

RDEPEND="
        ncurses? ( sys-libs/ncurses )
        X? ( x11-libs/libX11 x11-proto/xproto )"
DEPEND="${RDEPEND}
        virtual/pkgconfig"

PDEPEND="emacs? ( app-emacs/ocaml-mode )
        xemacs? ( app-xemacs/ocaml )"

S="${WORKDIR}/${MY_P}"
pkg_setup() {
        # dev-lang/ocaml creates its own objects but calls gcc for linking, 
which will
        # results in relocations if gcc wants to create a PIE executable
        if gcc-specs-pie ; then
                append-ldflags -nopie
                ewarn "Ocaml generates its own native asm, you're using a PIE 
compiler"
                ewarn "We have appended -nopie to ocaml build options"
                ewarn "because linking an executable with pie while the objects 
are not pic will not work"
        fi
}

src_prepare() {
        EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches"
}

src_configure() {
        export LC_ALL=C
        local myconf=""

        # Causes build failures because it builds some programs with -pg,
        # bug #270920
        filter-flags -fomit-frame-pointer
        # Bug #285993
        filter-mfpmath sse

        # It doesn't compile on alpha without this LDFLAGS
        use alpha && append-ldflags "-Wl,--no-relax"

        use ncurses || myconf="${myconf} -no-curses"
        use X || myconf="${myconf} -no-graph"

        # ocaml uses a home-brewn configure script, preventing it to use econf.
        RAW_LDFLAGS="$(raw-ldflags)" ./configure -prefix "${EPREFIX}"/usr \
                --bindir "${EPREFIX}"/usr/bin \
                --libdir "${EPREFIX}"/usr/$(get_libdir)/ocaml \
                --mandir "${EPREFIX}"/usr/share/man \
                -host "${CHOST}" \
                -cc "$(tc-getCC)" \
                -as "$(tc-getAS)" \
                -aspp "$(tc-getCC) -c" \
                -partialld "$(tc-getLD) -r" \
                --with-pthread ${myconf} || die "configure failed!"

        # http://caml.inria.fr/mantis/view.php?id=4698
        export CCLINKFLAGS="${LDFLAGS}"
}

src_compile() {
        emake world

        # Native code generation can be disabled now
        if use ocamlopt ; then
                # bug #279968
                emake opt
                emake opt.opt
        fi
}

src_install() {
        emake BINDIR="${ED}"/usr/bin \
                LIBDIR="${ED}"/usr/$(get_libdir)/ocaml \
                MANDIR="${ED}"/usr/share/man \
                install

        # Symlink the headers to the right place
        dodir /usr/include
        dosym /usr/$(get_libdir)/ocaml/caml /usr/include/caml

        dodoc Changes INSTALL README

        # Create and envd entry for latex input files
        if use latex ; then
                echo "TEXINPUTS=${EPREFIX}/usr/$(get_libdir)/ocaml/ocamldoc:" > 
"${T}"/99ocamldoc
                doenvd "${T}"/99ocamldoc
        fi

        # Install ocaml-rebuild portage set
        insinto /usr/share/portage/config/sets
        doins "${FILESDIR}/ocaml.conf"
}




Reply via email to