[gentoo-commits] gentoo-x86 commit in dev-ml/findlib: ChangeLog findlib-1.2.1.ebuild

[Alexis Ballier (aballier)]

aballier    08/01/02 19:24:38

  Modified:             ChangeLog findlib-1.2.1.ebuild
  Log:
  Add support to build without ocamlopt
  (Portage version: 2.1.4_rc14)

Revision  Changes    Path
1.27                 dev-ml/findlib/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-ml/findlib/ChangeLog?rev=1.27&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-ml/findlib/ChangeLog?rev=1.27&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-ml/findlib/ChangeLog?r1=1.26&r2=1.27

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-ml/findlib/ChangeLog,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- ChangeLog	13 Nov 2007 13:49:15 -0000	1.26
+++ ChangeLog	2 Jan 2008 19:24:38 -0000	1.27
@@ -1,6 +1,9 @@
 # ChangeLog for dev-ml/findlib
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/findlib/ChangeLog,v 1.26 2007/11/13 13:49:15 aballier Exp $
+# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/findlib/ChangeLog,v 1.27 2008/01/02 19:24:38 aballier Exp $
+
+  02 Jan 2008; Alexis Ballier <aballier@g.o> findlib-1.2.1.ebuild:
+  Add support to build without ocamlopt
 
 *findlib-1.2.1 (13 Nov 2007)
 



1.2                  dev-ml/findlib/findlib-1.2.1.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-ml/findlib/findlib-1.2.1.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-ml/findlib/findlib-1.2.1.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-ml/findlib/findlib-1.2.1.ebuild?r1=1.1&r2=1.2

Index: findlib-1.2.1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-ml/findlib/findlib-1.2.1.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- findlib-1.2.1.ebuild	13 Nov 2007 13:49:15 -0000	1.1
+++ findlib-1.2.1.ebuild	2 Jan 2008 19:24:38 -0000	1.2
@@ -1,10 +1,12 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/findlib/findlib-1.2.1.ebuild,v 1.1 2007/11/13 13:49:15 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/findlib/findlib-1.2.1.ebuild,v 1.2 2008/01/02 19:24:38 aballier Exp $
 
 inherit multilib eutils
 
-IUSE="doc tk"
+EAPI="1"
+
+IUSE="doc +ocamlopt tk"
 
 DESCRIPTION="OCaml tool to find/use non-standard packages."
 HOMEPAGE="http://www.ocaml-programming.de/packages/"
@@ -29,6 +31,12 @@
 		eerror ""
 		die "Please make sure that ocaml is installed with tk support or remove the USE flag"
 	fi
+	if use ocamlopt && ! built_with_use --missing true dev-lang/ocaml ocamlopt; then
+		eerror "In order to build ${PN} with native code support from ocaml"
+		eerror "You first need to have a native code ocaml compiler."
+		eerror "You need to install dev-lang/ocaml with ocamlopt useflag on."
+		die "Please install ocaml with ocamlopt useflag"
+	fi
 }
 
 src_compile() {
@@ -37,7 +45,13 @@
 		-config ${ocamlfind_destdir}/findlib/findlib.conf || die "configure failed"
 
 	emake all || die
-	emake opt || die # optimized code
+	if use ocamlopt; then
+		emake opt || die # optimized code
+	else
+		# If using bytecode we dont want to strip the binary as it would remove the
+		# bytecode and only leave ocamlrun...
+		export STRIP_MASK="*/bin/*"
+	fi
 }
 
 src_install() {



-- 
gentoo-commits@g.o mailing list