From ce73d3b86bd7196870792059216ade2106694b19 Mon Sep 17 00:00:00 2001 From: Alexis Ballier Date: Sun, 25 Jul 2010 10:28:53 +0000 Subject: bump to rc1 (Portage version: 2.2_rc67/cvs/Linux x86_64) --- dev-lang/ocaml/ChangeLog | 8 +- dev-lang/ocaml/ocaml-3.12.0_beta1.ebuild | 130 ------------------------------- dev-lang/ocaml/ocaml-3.12.0_rc1.ebuild | 130 +++++++++++++++++++++++++++++++ 3 files changed, 137 insertions(+), 131 deletions(-) delete mode 100644 dev-lang/ocaml/ocaml-3.12.0_beta1.ebuild create mode 100644 dev-lang/ocaml/ocaml-3.12.0_rc1.ebuild (limited to 'dev-lang/ocaml') diff --git a/dev-lang/ocaml/ChangeLog b/dev-lang/ocaml/ChangeLog index a7c952673886..797d927e1441 100644 --- a/dev-lang/ocaml/ChangeLog +++ b/dev-lang/ocaml/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for dev-lang/ocaml # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/ocaml/ChangeLog,v 1.178 2010/06/17 08:41:53 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/ocaml/ChangeLog,v 1.179 2010/07/25 10:28:53 aballier Exp $ + +*ocaml-3.12.0_rc1 (25 Jul 2010) + + 25 Jul 2010; Alexis Ballier + -ocaml-3.12.0_beta1.ebuild, +ocaml-3.12.0_rc1.ebuild: + bump to rc1 *ocaml-3.12.0_beta1 (17 Jun 2010) diff --git a/dev-lang/ocaml/ocaml-3.12.0_beta1.ebuild b/dev-lang/ocaml/ocaml-3.12.0_beta1.ebuild deleted file mode 100644 index ff48d9959fa9..000000000000 --- a/dev-lang/ocaml/ocaml-3.12.0_beta1.ebuild +++ /dev/null @@ -1,130 +0,0 @@ -# Copyright 1999-2010 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_beta1.ebuild,v 1.1 2010/06/17 08:41:53 aballier Exp $ - -EAPI="1" - -inherit flag-o-matic eutils multilib versionator toolchain-funcs - -PATCHLEVEL="2" -MY_P="${P/_/+}" -DESCRIPTION="Fast modern type-inferring functional programming language descended from the ML family" -HOMEPAGE="http://www.ocaml.org/" -SRC_URI="ftp://ftp.inria.fr/INRIA/Projects/cristal/ocaml/ocaml-$(get_version_component_range 1-2)/${MY_P}.tar.bz2 - mirror://gentoo/${PN}-patches-${PATCHLEVEL}.tar.bz2" - -LICENSE="QPL-1.0 LGPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" -IUSE="emacs gdbm latex ncurses +ocamlopt tk X xemacs" - -DEPEND="tk? ( >=dev-lang/tk-3.3.3 ) - ncurses? ( sys-libs/ncurses ) - X? ( x11-libs/libX11 x11-proto/xproto ) - gdbm? ( sys-libs/gdbm )" -RDEPEND="${DEPEND}" - -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_unpack() { - unpack ${A} - cd "${S}" - EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches" -} - -src_compile() { - 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" - # Fails to build on arm if >O0 is used - use arm && replace-flags "-O?" -O0 - - use tk || myconf="${myconf} -no-tk" - use ncurses || myconf="${myconf} -no-curses" - use X || myconf="${myconf} -no-graph" - use gdbm || myconf="${myconf} -no-dbm" - - # ocaml uses a home-brewn configure script, preventing it to use econf. - RAW_LDFLAGS="$(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="${D}"/usr/bin \ - LIBDIR="${D}"/usr/$(get_libdir)/ocaml \ - MANDIR="${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 into - # CONTENT and not in pkg_postinst. - if use latex ; then - echo "TEXINPUTS=/usr/$(get_libdir)/ocaml/ocamldoc:" > "${T}"/99ocamldoc - doenvd "${T}"/99ocamldoc - fi - - # Install ocaml-rebuild.sh script rather than keeping it in $PORTDIR - dosbin "${FILESDIR}/ocaml-rebuild.sh" -} - -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 "/usr/sbin/ocaml-rebuild.sh [-h | emerge options]" - ewarn "Which will call emerge on all old packages with the given options" - echo -} diff --git a/dev-lang/ocaml/ocaml-3.12.0_rc1.ebuild b/dev-lang/ocaml/ocaml-3.12.0_rc1.ebuild new file mode 100644 index 000000000000..60bb50334074 --- /dev/null +++ b/dev-lang/ocaml/ocaml-3.12.0_rc1.ebuild @@ -0,0 +1,130 @@ +# Copyright 1999-2010 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_rc1.ebuild,v 1.1 2010/07/25 10:28:53 aballier Exp $ + +EAPI="1" + +inherit flag-o-matic eutils multilib versionator toolchain-funcs + +PATCHLEVEL="2" +MY_P="${P/_/+}" +DESCRIPTION="Fast modern type-inferring functional programming language descended from the ML family" +HOMEPAGE="http://www.ocaml.org/" +SRC_URI="ftp://ftp.inria.fr/INRIA/Projects/cristal/ocaml/ocaml-$(get_version_component_range 1-2)/${MY_P}.tar.bz2 + mirror://gentoo/${PN}-patches-${PATCHLEVEL}.tar.bz2" + +LICENSE="QPL-1.0 LGPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" +IUSE="emacs gdbm latex ncurses +ocamlopt tk X xemacs" + +DEPEND="tk? ( >=dev-lang/tk-3.3.3 ) + ncurses? ( sys-libs/ncurses ) + X? ( x11-libs/libX11 x11-proto/xproto ) + gdbm? ( sys-libs/gdbm )" +RDEPEND="${DEPEND}" + +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_unpack() { + unpack ${A} + cd "${S}" + EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches" +} + +src_compile() { + 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" + # Fails to build on arm if >O0 is used + use arm && replace-flags "-O?" -O0 + + use tk || myconf="${myconf} -no-tk" + use ncurses || myconf="${myconf} -no-curses" + use X || myconf="${myconf} -no-graph" + use gdbm || myconf="${myconf} -no-dbm" + + # ocaml uses a home-brewn configure script, preventing it to use econf. + RAW_LDFLAGS="$(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="${D}"/usr/bin \ + LIBDIR="${D}"/usr/$(get_libdir)/ocaml \ + MANDIR="${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 into + # CONTENT and not in pkg_postinst. + if use latex ; then + echo "TEXINPUTS=/usr/$(get_libdir)/ocaml/ocamldoc:" > "${T}"/99ocamldoc + doenvd "${T}"/99ocamldoc + fi + + # Install ocaml-rebuild.sh script rather than keeping it in $PORTDIR + dosbin "${FILESDIR}/ocaml-rebuild.sh" +} + +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 "/usr/sbin/ocaml-rebuild.sh [-h | emerge options]" + ewarn "Which will call emerge on all old packages with the given options" + echo +} -- cgit v1.2.3-65-gdbad