| 1 |
aballier 08/01/03 17:41:59 |
| 2 |
|
| 3 |
Modified: coq-8.1_p3.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
Add support for building without ocamlopt, import smimou's patches from debian to allow it. Fix desktop entry categories. |
| 6 |
(Portage version: 2.1.4_rc14) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.3 sci-mathematics/coq/coq-8.1_p3.ebuild |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-mathematics/coq/coq-8.1_p3.ebuild?rev=1.3&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-mathematics/coq/coq-8.1_p3.ebuild?rev=1.3&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-mathematics/coq/coq-8.1_p3.ebuild?r1=1.2&r2=1.3 |
| 14 |
|
| 15 |
Index: coq-8.1_p3.ebuild |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/sci-mathematics/coq/coq-8.1_p3.ebuild,v |
| 18 |
retrieving revision 1.2 |
| 19 |
retrieving revision 1.3 |
| 20 |
diff -u -r1.2 -r1.3 |
| 21 |
--- coq-8.1_p3.ebuild 19 Dec 2007 20:08:01 -0000 1.2 |
| 22 |
+++ coq-8.1_p3.ebuild 3 Jan 2008 17:41:59 -0000 1.3 |
| 23 |
@@ -1,10 +1,12 @@ |
| 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/sci-mathematics/coq/coq-8.1_p3.ebuild,v 1.2 2007/12/19 20:08:01 aballier Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/coq/coq-8.1_p3.ebuild,v 1.3 2008/01/03 17:41:59 aballier Exp $ |
| 29 |
|
| 30 |
inherit eutils multilib |
| 31 |
|
| 32 |
-IUSE="norealanalysis ide debug" |
| 33 |
+EAPI="1" |
| 34 |
+ |
| 35 |
+IUSE="norealanalysis ide debug +ocamlopt" |
| 36 |
|
| 37 |
RESTRICT="strip" |
| 38 |
|
| 39 |
@@ -25,6 +27,30 @@ |
| 40 |
|
| 41 |
S="${WORKDIR}/${MY_P}" |
| 42 |
|
| 43 |
+coq_need_ocamlopt() { |
| 44 |
+ if use ocamlopt && ! built_with_use --missing true $1 ocamlopt; then |
| 45 |
+ eerror "In order to build ${PN} with native code support from ocaml" |
| 46 |
+ eerror "You first need to have a native code ocaml compiler and the related libraries." |
| 47 |
+ eerror "You need to install $1 with ocamlopt useflag on." |
| 48 |
+ die "Please install $1 with ocamlopt useflag" |
| 49 |
+ fi |
| 50 |
+} |
| 51 |
+ |
| 52 |
+ |
| 53 |
+pkg_setup() { |
| 54 |
+ coq_need_ocamlopt 'dev-lang/ocaml' |
| 55 |
+ use ide && coq_need_ocamlopt 'dev-ml/lablgtk' |
| 56 |
+ has_version '>=dev-lang/ocaml-3.10.0' && coq_need_ocamlopt 'dev-ml/camlp5' |
| 57 |
+} |
| 58 |
+ |
| 59 |
+src_unpack() { |
| 60 |
+ unpack ${A} |
| 61 |
+ cd "${S}" |
| 62 |
+ |
| 63 |
+ epatch "${FILESDIR}/${P}-noocamlopt.patch" |
| 64 |
+ epatch "${FILESDIR}/${P}-cmxa-install.dpatch" |
| 65 |
+} |
| 66 |
+ |
| 67 |
src_compile() { |
| 68 |
local myconf="--prefix /usr \ |
| 69 |
--bindir /usr/bin \ |
| 70 |
@@ -38,10 +64,12 @@ |
| 71 |
use norealanalysis || myconf="$myconf --reals all" |
| 72 |
|
| 73 |
if use ide; then |
| 74 |
- myconf="$myconf --coqide opt" |
| 75 |
+ use ocamlopt && myconf="$myconf --coqide opt" |
| 76 |
+ use ocamlopt || myconf="$myconf --coqide byte" |
| 77 |
else |
| 78 |
myconf="$myconf --coqide no" |
| 79 |
fi |
| 80 |
+ use ocamlopt || myconf="$myconf -byte-only" |
| 81 |
|
| 82 |
./configure $myconf || die "configure failed" |
| 83 |
|
| 84 |
|
| 85 |
|
| 86 |
|
| 87 |
1.24 sci-mathematics/coq/ChangeLog |
| 88 |
|
| 89 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-mathematics/coq/ChangeLog?rev=1.24&view=markup |
| 90 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-mathematics/coq/ChangeLog?rev=1.24&content-type=text/plain |
| 91 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-mathematics/coq/ChangeLog?r1=1.23&r2=1.24 |
| 92 |
|
| 93 |
Index: ChangeLog |
| 94 |
=================================================================== |
| 95 |
RCS file: /var/cvsroot/gentoo-x86/sci-mathematics/coq/ChangeLog,v |
| 96 |
retrieving revision 1.23 |
| 97 |
retrieving revision 1.24 |
| 98 |
diff -u -r1.23 -r1.24 |
| 99 |
--- ChangeLog 19 Dec 2007 20:08:01 -0000 1.23 |
| 100 |
+++ ChangeLog 3 Jan 2008 17:41:59 -0000 1.24 |
| 101 |
@@ -1,6 +1,12 @@ |
| 102 |
# ChangeLog for sci-mathematics/coq |
| 103 |
-# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2 |
| 104 |
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/coq/ChangeLog,v 1.23 2007/12/19 20:08:01 aballier Exp $ |
| 105 |
+# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2 |
| 106 |
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/coq/ChangeLog,v 1.24 2008/01/03 17:41:59 aballier Exp $ |
| 107 |
+ |
| 108 |
+ 03 Jan 2008; Alexis Ballier <aballier@g.o> |
| 109 |
+ +files/coq-8.1_p3-cmxa-install.dpatch, +files/coq-8.1_p3-noocamlopt.patch, |
| 110 |
+ files/coqide.desktop, coq-8.1_p3.ebuild: |
| 111 |
+ Add support for building without ocamlopt, import smimou's patches from |
| 112 |
+ debian to allow it. Fix desktop entry categories. |
| 113 |
|
| 114 |
19 Dec 2007; Alexis Ballier <aballier@g.o> coq-8.1_p2.ebuild, |
| 115 |
coq-8.1_p3.ebuild: |
| 116 |
|
| 117 |
|
| 118 |
|
| 119 |
-- |
| 120 |
gentoo-commits@g.o mailing list |
Archives