| 1 |
aballier 08/01/03 18:31:38 |
| 2 |
|
| 3 |
Modified: ocamlnet-2.2.9-r1.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
Allow to disable ocamlopt via an useflag |
| 6 |
(Portage version: 2.1.4_rc14) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.2 dev-ml/ocamlnet/ocamlnet-2.2.9-r1.ebuild |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-ml/ocamlnet/ocamlnet-2.2.9-r1.ebuild?rev=1.2&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-ml/ocamlnet/ocamlnet-2.2.9-r1.ebuild?rev=1.2&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-ml/ocamlnet/ocamlnet-2.2.9-r1.ebuild?r1=1.1&r2=1.2 |
| 14 |
|
| 15 |
Index: ocamlnet-2.2.9-r1.ebuild |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/dev-ml/ocamlnet/ocamlnet-2.2.9-r1.ebuild,v |
| 18 |
retrieving revision 1.1 |
| 19 |
retrieving revision 1.2 |
| 20 |
diff -u -r1.1 -r1.2 |
| 21 |
--- ocamlnet-2.2.9-r1.ebuild 17 Dec 2007 18:00:58 -0000 1.1 |
| 22 |
+++ ocamlnet-2.2.9-r1.ebuild 3 Jan 2008 18:31:37 -0000 1.2 |
| 23 |
@@ -1,9 +1,11 @@ |
| 24 |
-# Copyright 1999-2007 Gentoo Foundation |
| 25 |
+# Copyright 1999-2008 Gentoo Foundation |
| 26 |
# Distributed under the terms of the GNU General Public License v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/ocamlnet/ocamlnet-2.2.9-r1.ebuild,v 1.1 2007/12/17 18:00:58 aballier Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/ocamlnet/ocamlnet-2.2.9-r1.ebuild,v 1.2 2008/01/03 18:31:37 aballier Exp $ |
| 29 |
|
| 30 |
inherit eutils findlib |
| 31 |
|
| 32 |
+EAPI="1" |
| 33 |
+ |
| 34 |
DESCRIPTION="Modules for OCaml application-level Internet protocols" |
| 35 |
HOMEPAGE="http://ocamlnet.sourceforge.net" |
| 36 |
SRC_URI="mirror://sourceforge/ocamlnet/${P}.tar.gz" |
| 37 |
@@ -11,7 +13,7 @@ |
| 38 |
LICENSE="as-is GPL-2" |
| 39 |
SLOT="0" |
| 40 |
KEYWORDS="~amd64 ~ppc ~x86" |
| 41 |
-IUSE="gtk ssl tk httpd" |
| 42 |
+IUSE="gtk ssl tk httpd +ocamlopt" |
| 43 |
|
| 44 |
# the auth-dh compile flag has been disabled as well, since it depends on |
| 45 |
# ocaml-cryptgps, which is not available. |
| 46 |
@@ -30,6 +32,12 @@ |
| 47 |
if use tk && ! built_with_use 'dev-lang/ocaml' tk ; |
| 48 |
then die "If you want to enable tcl/tk, you need to rebuild dev-lang/ocaml with the 'tk' USE flag"; |
| 49 |
fi |
| 50 |
+ if use ocamlopt && ! built_with_use --missing true dev-lang/ocaml ocamlopt; then |
| 51 |
+ eerror "In order to build ${PN} with native code support from ocaml" |
| 52 |
+ eerror "You first need to have a native code ocaml compiler." |
| 53 |
+ eerror "You need to install dev-lang/ocaml with ocamlopt useflag on." |
| 54 |
+ die "Please install ocaml with ocamlopt useflag" |
| 55 |
+ fi |
| 56 |
} |
| 57 |
|
| 58 |
src_unpack() { |
| 59 |
@@ -65,9 +73,13 @@ |
| 60 |
$(ocamlnet_use_with httpd nethttpd) \ |
| 61 |
|| die "Error : econf failed!" |
| 62 |
|
| 63 |
- emake -j1 all opt || die "make failed" |
| 64 |
+ emake -j1 all || die "make failed" |
| 65 |
+ if use ocamlopt; then |
| 66 |
+ emake -j1 opt || die "make failed" |
| 67 |
+ fi |
| 68 |
} |
| 69 |
|
| 70 |
src_install() { |
| 71 |
+ export STRIP_MASK="*/bin/*" |
| 72 |
findlib_src_install |
| 73 |
} |
| 74 |
|
| 75 |
|
| 76 |
|
| 77 |
1.26 dev-ml/ocamlnet/ChangeLog |
| 78 |
|
| 79 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-ml/ocamlnet/ChangeLog?rev=1.26&view=markup |
| 80 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-ml/ocamlnet/ChangeLog?rev=1.26&content-type=text/plain |
| 81 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-ml/ocamlnet/ChangeLog?r1=1.25&r2=1.26 |
| 82 |
|
| 83 |
Index: ChangeLog |
| 84 |
=================================================================== |
| 85 |
RCS file: /var/cvsroot/gentoo-x86/dev-ml/ocamlnet/ChangeLog,v |
| 86 |
retrieving revision 1.25 |
| 87 |
retrieving revision 1.26 |
| 88 |
diff -u -r1.25 -r1.26 |
| 89 |
--- ChangeLog 31 Dec 2007 19:35:50 -0000 1.25 |
| 90 |
+++ ChangeLog 3 Jan 2008 18:31:37 -0000 1.26 |
| 91 |
@@ -1,6 +1,10 @@ |
| 92 |
# ChangeLog for dev-ml/ocamlnet |
| 93 |
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 |
| 94 |
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/ocamlnet/ChangeLog,v 1.25 2007/12/31 19:35:50 mabi Exp $ |
| 95 |
+# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 |
| 96 |
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/ocamlnet/ChangeLog,v 1.26 2008/01/03 18:31:37 aballier Exp $ |
| 97 |
+ |
| 98 |
+ 03 Jan 2008; Alexis Ballier <aballier@g.o> |
| 99 |
+ ocamlnet-2.2.9-r1.ebuild: |
| 100 |
+ Allow to disable ocamlopt via an useflag |
| 101 |
|
| 102 |
31 Dec 2007; Matti Bickel <mabi@g.o> ocamlnet-2.2.8.1.ebuild: |
| 103 |
ppc stable (bug #195535) |
| 104 |
|
| 105 |
|
| 106 |
|
| 107 |
-- |
| 108 |
gentoo-commits@g.o mailing list |
Archives