[gentoo-commits] gentoo-x86 commit in eclass: oasis.eclass

[Alexis Ballier (aballier)]

aballier    14/10/29 14:21:52

  Modified:             oasis.eclass
  Log:
  Allow to override setup command from ebuilds; needed for deriving

Revision  Changes    Path
1.5                  eclass/oasis.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/oasis.eclass?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/oasis.eclass?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/oasis.eclass?r1=1.4&r2=1.5

Index: oasis.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/oasis.eclass,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- oasis.eclass	7 Feb 2013 13:42:12 -0000	1.4
+++ oasis.eclass	29 Oct 2014 14:21:52 -0000	1.5
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/oasis.eclass,v 1.4 2013/02/07 13:42:12 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/oasis.eclass,v 1.5 2014/10/29 14:21:52 aballier Exp $
 
 # @ECLASS: oasis.eclass
 # @MAINTAINER: 
@@ -77,7 +77,7 @@
 	local confargs=""
 	[ -n "${OASIS_BUILD_TESTS}" ] && confargs="${confargs} $(use_enable test tests)"
 	[ -n "${OASIS_NO_DEBUG}"    ] || confargs="${confargs} $(oasis_use_enable debug debug)"
-	ocaml setup.ml -configure \
+	${OASIS_SETUP_COMMAND:-ocaml setup.ml} -configure \
 		--prefix "${EPREFIX}/usr" \
 		--libdir "${EPREFIX}/usr/$(get_libdir)" \
 		--docdir "${EPREFIX}/usr/share/doc/${PF}/html" \
@@ -94,7 +94,7 @@
 # Will build documentation if OASIS_BUILD_DOCS is defined and the doc useflag is
 # enabled. 
 oasis_src_compile() {
-	ocaml setup.ml -build || die
+	${OASIS_SETUP_COMMAND:-ocaml setup.ml} -build || die
 	if [ -n "${OASIS_BUILD_DOCS}" ] && use doc; then
 		ocaml setup.ml -doc || die
 	fi
@@ -104,7 +104,7 @@
 # @DESCRIPTION:
 # Runs the testsuite of an oasis-based package.
 oasis_src_test() {
-	 LD_LIBRARY_PATH="${S}/_build/lib" ocaml setup.ml -test || die
+	 LD_LIBRARY_PATH="${S}/_build/lib" ${OASIS_SETUP_COMMAND:-ocaml setup.ml} -test || die
 }
 
 # @FUNCTION: oasis_src_install
@@ -114,7 +114,7 @@
 # DOCS variable.
 oasis_src_install() {
 	findlib_src_preinst
-	ocaml setup.ml -install || die
+	${OASIS_SETUP_COMMAND:-ocaml setup.ml} -install || die
 	base_src_install_docs
 }