* [gentoo-commits] gentoo-x86 commit in dev-lang/ocaml: ChangeLog ocaml-3.11.0_beta1.ebuild
@ 2008-10-15 16:08 Alexis Ballier (aballier)
0 siblings, 0 replies; 3+ messages in thread
From: Alexis Ballier (aballier) @ 2008-10-15 16:08 UTC (permalink / raw
To: gentoo-commits
aballier 08/10/15 16:08:56
Modified: ChangeLog
Added: ocaml-3.11.0_beta1.ebuild
Log:
New upstream beta release
(Portage version: 2.2_rc12/cvs/Linux 2.6.26.6 x86_64)
Revision Changes Path
1.150 dev-lang/ocaml/ChangeLog
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/ocaml/ChangeLog?rev=1.150&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/ocaml/ChangeLog?rev=1.150&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/ocaml/ChangeLog?r1=1.149&r2=1.150
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-lang/ocaml/ChangeLog,v
retrieving revision 1.149
retrieving revision 1.150
diff -u -r1.149 -r1.150
--- ChangeLog 22 Sep 2008 18:56:34 -0000 1.149
+++ ChangeLog 15 Oct 2008 16:08:56 -0000 1.150
@@ -1,6 +1,15 @@
# ChangeLog for dev-lang/ocaml
# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ocaml/ChangeLog,v 1.149 2008/09/22 18:56:34 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ocaml/ChangeLog,v 1.150 2008/10/15 16:08:56 aballier Exp $
+
+*ocaml-3.11.0_beta1 (15 Oct 2008)
+
+ 15 Oct 2008; Alexis Ballier <aballier@gentoo.org>
+ +files/ocaml-3.11.0_beta1-call-ld-with-proper-ldflags.patch,
+ +files/ocaml-3.11.0_beta1-configure.patch,
+ +files/ocaml-3.11.0_beta1-exec-stack-fixes.patch,
+ +ocaml-3.11.0_beta1.ebuild:
+ New upstream beta release
22 Sep 2008; Raúl Porcel <armin76@gentoo.org> ocaml-3.10.2.ebuild:
Re-add ~arm wrt #178256
1.1 dev-lang/ocaml/ocaml-3.11.0_beta1.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/ocaml/ocaml-3.11.0_beta1.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/ocaml/ocaml-3.11.0_beta1.ebuild?rev=1.1&content-type=text/plain
Index: ocaml-3.11.0_beta1.ebuild
===================================================================
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-lang/ocaml/ocaml-3.11.0_beta1.ebuild,v 1.1 2008/10/15 16:08:56 aballier Exp $
inherit flag-o-matic eutils multilib versionator toolchain-funcs
EAPI="1"
MY_P="${P/_beta/+beta}"
DESCRIPTION="Fast modern type-inferring functional programming language descended from the ML family"
HOMEPAGE="http://www.ocaml.org/"
SRC_URI="http://caml.inria.fr/distrib/ocaml-$( get_version_component_range 1-2)/${MY_P}.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 )"
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}"
# Fix the EXEC_STACK in ocaml compiled binaries (#153382)
epatch "${FILESDIR}"/${PN}-3.11.0_beta1-exec-stack-fixes.patch
# The configure script doesn't inherit previous defined variables,
# overwriting previous declarations of bytecccompopts, bytecclinkopts,
# nativecccompopts and nativecclinkopts. Reported upstream as issue 0004267.
epatch "${FILESDIR}"/${PN}-3.11.0_beta1-configure.patch
# ocaml has automagics on libX11 and gdbm
# http://caml.inria.fr/mantis/view.php?id=4278
epatch "${FILESDIR}/${PN}-3.10.0-automagic.patch"
# Call ld with proper flags, different from gcc ones
# This happens when calling ocamlc -pack
# See comment in the patch
epatch "${FILESDIR}/${PN}-3.11.0_beta1-call-ld-with-proper-ldflags.patch"
}
src_compile() {
local myconf="--host ${CHOST}"
# It doesn't compile on alpha without this LDFLAGS
use alpha && append-ldflags "-Wl,--no-relax"
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 \
--with-pthread ${myconf} || die "configure failed!"
make world || die "make world failed!"
# Native code generation can be disabled now
if use ocamlopt ; then
make opt || die "make opt failed!"
make 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,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
}
^ permalink raw reply [flat|nested] 3+ messages in thread
* [gentoo-commits] gentoo-x86 commit in dev-lang/ocaml: ChangeLog ocaml-3.11.0_beta1.ebuild
@ 2008-11-07 9:59 Alexis Ballier (aballier)
0 siblings, 0 replies; 3+ messages in thread
From: Alexis Ballier (aballier) @ 2008-11-07 9:59 UTC (permalink / raw
To: gentoo-commits
aballier 08/11/07 09:59:10
Modified: ChangeLog ocaml-3.11.0_beta1.ebuild
Log:
merge similar patches and make it honour better ldflags
(Portage version: 2.2_rc13/cvs/Linux 2.6.27.4 x86_64)
Revision Changes Path
1.151 dev-lang/ocaml/ChangeLog
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/ocaml/ChangeLog?rev=1.151&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/ocaml/ChangeLog?rev=1.151&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/ocaml/ChangeLog?r1=1.150&r2=1.151
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-lang/ocaml/ChangeLog,v
retrieving revision 1.150
retrieving revision 1.151
diff -u -r1.150 -r1.151
--- ChangeLog 15 Oct 2008 16:08:56 -0000 1.150
+++ ChangeLog 7 Nov 2008 09:59:10 -0000 1.151
@@ -1,6 +1,11 @@
# ChangeLog for dev-lang/ocaml
# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ocaml/ChangeLog,v 1.150 2008/10/15 16:08:56 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ocaml/ChangeLog,v 1.151 2008/11/07 09:59:10 aballier Exp $
+
+ 07 Nov 2008; Alexis Ballier <aballier@gentoo.org>
+ -files/ocaml-3.11.0_beta1-call-ld-with-proper-ldflags.patch,
+ files/ocaml-3.11.0_beta1-configure.patch, ocaml-3.11.0_beta1.ebuild:
+ merge similar patches and make it honour better ldflags
*ocaml-3.11.0_beta1 (15 Oct 2008)
1.2 dev-lang/ocaml/ocaml-3.11.0_beta1.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/ocaml/ocaml-3.11.0_beta1.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/ocaml/ocaml-3.11.0_beta1.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/ocaml/ocaml-3.11.0_beta1.ebuild?r1=1.1&r2=1.2
Index: ocaml-3.11.0_beta1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-lang/ocaml/ocaml-3.11.0_beta1.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ocaml-3.11.0_beta1.ebuild 15 Oct 2008 16:08:56 -0000 1.1
+++ ocaml-3.11.0_beta1.ebuild 7 Nov 2008 09:59:10 -0000 1.2
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ocaml/ocaml-3.11.0_beta1.ebuild,v 1.1 2008/10/15 16:08:56 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ocaml/ocaml-3.11.0_beta1.ebuild,v 1.2 2008/11/07 09:59:10 aballier Exp $
inherit flag-o-matic eutils multilib versionator toolchain-funcs
@@ -51,11 +51,6 @@
# ocaml has automagics on libX11 and gdbm
# http://caml.inria.fr/mantis/view.php?id=4278
epatch "${FILESDIR}/${PN}-3.10.0-automagic.patch"
-
- # Call ld with proper flags, different from gcc ones
- # This happens when calling ocamlc -pack
- # See comment in the patch
- epatch "${FILESDIR}/${PN}-3.11.0_beta1-call-ld-with-proper-ldflags.patch"
}
src_compile() {
^ permalink raw reply [flat|nested] 3+ messages in thread
* [gentoo-commits] gentoo-x86 commit in dev-lang/ocaml: ChangeLog ocaml-3.11.0_beta1.ebuild
@ 2008-11-14 13:20 Alexis Ballier (aballier)
0 siblings, 0 replies; 3+ messages in thread
From: Alexis Ballier (aballier) @ 2008-11-14 13:20 UTC (permalink / raw
To: gentoo-commits
aballier 08/11/14 13:20:55
Modified: ChangeLog ocaml-3.11.0_beta1.ebuild
Log:
respect ldflags for ocamlyacc
(Portage version: 2.2_rc14/cvs/Linux 2.6.27.5 x86_64)
Revision Changes Path
1.152 dev-lang/ocaml/ChangeLog
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/ocaml/ChangeLog?rev=1.152&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/ocaml/ChangeLog?rev=1.152&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/ocaml/ChangeLog?r1=1.151&r2=1.152
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-lang/ocaml/ChangeLog,v
retrieving revision 1.151
retrieving revision 1.152
diff -u -r1.151 -r1.152
--- ChangeLog 7 Nov 2008 09:59:10 -0000 1.151
+++ ChangeLog 14 Nov 2008 13:20:55 -0000 1.152
@@ -1,6 +1,10 @@
# ChangeLog for dev-lang/ocaml
# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ocaml/ChangeLog,v 1.151 2008/11/07 09:59:10 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ocaml/ChangeLog,v 1.152 2008/11/14 13:20:55 aballier Exp $
+
+ 14 Nov 2008; Alexis Ballier <aballier@gentoo.org>
+ +files/ocaml-3.11.0_beta1-yaccldflags.patch, ocaml-3.11.0_beta1.ebuild:
+ respect ldflags for ocamlyacc
07 Nov 2008; Alexis Ballier <aballier@gentoo.org>
-files/ocaml-3.11.0_beta1-call-ld-with-proper-ldflags.patch,
1.3 dev-lang/ocaml/ocaml-3.11.0_beta1.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/ocaml/ocaml-3.11.0_beta1.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/ocaml/ocaml-3.11.0_beta1.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/ocaml/ocaml-3.11.0_beta1.ebuild?r1=1.2&r2=1.3
Index: ocaml-3.11.0_beta1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-lang/ocaml/ocaml-3.11.0_beta1.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ocaml-3.11.0_beta1.ebuild 7 Nov 2008 09:59:10 -0000 1.2
+++ ocaml-3.11.0_beta1.ebuild 14 Nov 2008 13:20:55 -0000 1.3
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ocaml/ocaml-3.11.0_beta1.ebuild,v 1.2 2008/11/07 09:59:10 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ocaml/ocaml-3.11.0_beta1.ebuild,v 1.3 2008/11/14 13:20:55 aballier Exp $
inherit flag-o-matic eutils multilib versionator toolchain-funcs
@@ -51,6 +51,9 @@
# ocaml has automagics on libX11 and gdbm
# http://caml.inria.fr/mantis/view.php?id=4278
epatch "${FILESDIR}/${PN}-3.10.0-automagic.patch"
+
+ # Respect LDFLAGS for ocamlyacc
+ epatch "${FILESDIR}"/${PN}-3.11.0_beta1-yaccldflags.patch
}
src_compile() {
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2008-11-14 13:20 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-10-15 16:08 [gentoo-commits] gentoo-x86 commit in dev-lang/ocaml: ChangeLog ocaml-3.11.0_beta1.ebuild Alexis Ballier (aballier)
-- strict thread matches above, loose matches on Subject: below --
2008-11-07 9:59 Alexis Ballier (aballier)
2008-11-14 13:20 Alexis Ballier (aballier)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox