From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1QVS9p-0003Lb-4T for garchives@archives.gentoo.org; Sat, 11 Jun 2011 17:39:37 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D55121C017; Sat, 11 Jun 2011 17:39:27 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 8E6571C017 for ; Sat, 11 Jun 2011 17:39:27 +0000 (UTC) Received: from flycatcher.gentoo.org (flycatcher.gentoo.org [81.93.255.6]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id CE5F51B4032 for ; Sat, 11 Jun 2011 17:39:26 +0000 (UTC) Received: by flycatcher.gentoo.org (Postfix, from userid 2139) id 85FF22004F; Sat, 11 Jun 2011 17:39:25 +0000 (UTC) From: "Alexis Ballier (aballier)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, aballier@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in dev-lang/ocaml: ChangeLog ocaml-3.12.0-r1.ebuild X-VCS-Repository: gentoo-x86 X-VCS-Files: ChangeLog ocaml-3.12.0-r1.ebuild X-VCS-Directories: dev-lang/ocaml X-VCS-Committer: aballier X-VCS-Committer-Name: Alexis Ballier Content-Type: text/plain; charset=utf8 Message-Id: <20110611173925.85FF22004F@flycatcher.gentoo.org> Date: Sat, 11 Jun 2011 17:39:25 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: df0f2cab9124de47e9d590f055f08f2e aballier 11/06/11 17:39:25 Modified: ChangeLog Added: ocaml-3.12.0-r1.ebuild Log: Install a portage set for @ocaml-rebuild to replace ocaml-rebuild.sh =20 (Portage version: 2.2.0_alpha39/cvs/Linux x86_64) Revision Changes Path 1.190 dev-lang/ocaml/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/ocaml/Cha= ngeLog?rev=3D1.190&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/ocaml/Cha= ngeLog?rev=3D1.190&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/ocaml/Cha= ngeLog?r1=3D1.189&r2=3D1.190 Index: ChangeLog =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /var/cvsroot/gentoo-x86/dev-lang/ocaml/ChangeLog,v retrieving revision 1.189 retrieving revision 1.190 diff -u -r1.189 -r1.190 --- ChangeLog 27 Feb 2011 13:09:10 -0000 1.189 +++ ChangeLog 11 Jun 2011 17:39:25 -0000 1.190 @@ -1,6 +1,12 @@ # ChangeLog for dev-lang/ocaml # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/ocaml/ChangeLog,v 1.189 2011= /02/27 13:09:10 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/ocaml/ChangeLog,v 1.190 2011= /06/11 17:39:25 aballier Exp $ + +*ocaml-3.12.0-r1 (11 Jun 2011) + + 11 Jun 2011; Alexis Ballier +ocaml-3.12.0-r1.ebu= ild, + +files/ocaml.conf: + Install a portage set for @ocaml-rebuild to replace ocaml-rebuild.sh =20 27 Feb 2011; Alexis Ballier ocaml-3.12.0.ebuild: Add a patch to pass libs as last argument to the linker when linking, = fixes 1.1 dev-lang/ocaml/ocaml-3.12.0-r1.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/ocaml/oca= ml-3.12.0-r1.ebuild?rev=3D1.1&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/ocaml/oca= ml-3.12.0-r1.ebuild?rev=3D1.1&content-type=3Dtext/plain Index: ocaml-3.12.0-r1.ebuild =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/dev-lang/ocaml/ocaml-3.12.0-r1.ebuild,= v 1.1 2011/06/11 17:39:25 aballier Exp $ EAPI=3D"1" inherit flag-o-matic eutils multilib versionator toolchain-funcs PATCHLEVEL=3D"3" MY_P=3D"${P/_/+}" DESCRIPTION=3D"Fast modern type-inferring functional programming language= descended from the ML family" HOMEPAGE=3D"http://www.ocaml.org/" SRC_URI=3D"ftp://ftp.inria.fr/INRIA/Projects/cristal/ocaml/ocaml-$(get_ve= rsion_component_range 1-2)/${MY_P}.tar.bz2 mirror://gentoo/${PN}-patches-${PATCHLEVEL}.tar.bz2" LICENSE=3D"QPL-1.0 LGPL-2" SLOT=3D"0" KEYWORDS=3D"~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-f= bsd" IUSE=3D"emacs gdbm latex ncurses +ocamlopt tk X xemacs" DEPEND=3D"tk? ( >=3Ddev-lang/tk-3.3.3 ) ncurses? ( sys-libs/ncurses ) X? ( x11-libs/libX11 x11-proto/xproto ) gdbm? ( sys-libs/gdbm )" RDEPEND=3D"${DEPEND}" PDEPEND=3D"emacs? ( app-emacs/ocaml-mode ) xemacs? ( app-xemacs/ocaml )" S=3D"${WORKDIR}/${MY_P}" pkg_setup() { # dev-lang/ocaml creates its own objects but calls gcc for linking, whic= h 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_unpack() { unpack ${A} cd "${S}" EPATCH_SUFFIX=3D"patch" epatch "${WORKDIR}/patches" } src_compile() { export LC_ALL=3DC local myconf=3D"" # 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" # Fails to build on arm if >O0 is used use arm && replace-flags "-O?" -O0 use tk || myconf=3D"${myconf} -no-tk" use ncurses || myconf=3D"${myconf} -no-curses" use X || myconf=3D"${myconf} -no-graph" use gdbm || myconf=3D"${myconf} -no-dbm" # ocaml uses a home-brewn configure script, preventing it to use econf. RAW_LDFLAGS=3D"$(raw-ldflags)" ./configure -prefix /usr \ --bindir /usr/bin \ --libdir /usr/$(get_libdir)/ocaml \ --mandir /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!" emake -j1 world || die "make world failed!" # Native code generation can be disabled now if use ocamlopt ; then # bug #279968 emake -j1 opt || die "make opt failed!" emake -j1 opt.opt || die "make opt.opt failed!" fi } src_install() { make BINDIR=3D"${D}"/usr/bin \ LIBDIR=3D"${D}"/usr/$(get_libdir)/ocaml \ MANDIR=3D"${D}"/usr/share/man \ install || die "make install failed!" # Install the compiler libs dodir /usr/$(get_libdir)/ocaml/compiler-libs insinto /usr/$(get_libdir)/ocaml/compiler-libs doins {utils,typing,parsing}/*.{mli,cmi,cmo} use ocamlopt && doins {utils,typing,parsing}/*.{cmx,o} # Symlink the headers to the right place dodir /usr/include dosym /usr/$(get_libdir)/ocaml/caml /usr/include/ # Remove ${D} from ld.conf, as the buildsystem isn't $(DESTDIR) aware dosed "s:${D}::g" /usr/$(get_libdir)/ocaml/ld.conf dodoc Changes INSTALL README Upgrading # Create and envd entry for latex input files (this definitely belongs i= nto # CONTENT and not in pkg_postinst. if use latex ; then echo "TEXINPUTS=3D/usr/$(get_libdir)/ocaml/ocamldoc:" > "${T}"/99ocamld= oc doenvd "${T}"/99ocamldoc fi # Install ocaml-rebuild portage set insinto /usr/share/portage/config/sets doins "${FILESDIR}/ocaml.conf" || die } pkg_postinst() { echo ewarn "OCaml is not binary compatible from version to version, so you" ewarn "need to rebuild all packages depending on it, that are actually" ewarn "installed on your system. To do so, you can run:" ewarn "emerge @ocaml-rebuild" echo }