| 1 |
aballier 09/10/27 11:54:52 |
| 2 |
|
| 3 |
Modified: omake-0.9.8.5.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
eapi2ify, add build fixes for gcc 4.4 by Barry Schwartz <barryschwartz124@×××××××.net>, bug #289819 |
| 6 |
(Portage version: 2.2_rc46/cvs/Linux x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.7 dev-util/omake/omake-0.9.8.5.ebuild |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/omake/omake-0.9.8.5.ebuild?rev=1.7&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/omake/omake-0.9.8.5.ebuild?rev=1.7&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/omake/omake-0.9.8.5.ebuild?r1=1.6&r2=1.7 |
| 14 |
|
| 15 |
Index: omake-0.9.8.5.ebuild |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/dev-util/omake/omake-0.9.8.5.ebuild,v |
| 18 |
retrieving revision 1.6 |
| 19 |
retrieving revision 1.7 |
| 20 |
diff -u -r1.6 -r1.7 |
| 21 |
--- omake-0.9.8.5.ebuild 12 Oct 2009 07:55:16 -0000 1.6 |
| 22 |
+++ omake-0.9.8.5.ebuild 27 Oct 2009 11:54:51 -0000 1.7 |
| 23 |
@@ -1,8 +1,8 @@ |
| 24 |
# Copyright 1999-2009 Gentoo Foundation |
| 25 |
# Distributed under the terms of the GNU General Public License v2 |
| 26 |
-# $Header: /var/cvsroot/gentoo-x86/dev-util/omake/omake-0.9.8.5.ebuild,v 1.6 2009/10/12 07:55:16 ssuominen Exp $ |
| 27 |
+# $Header: /var/cvsroot/gentoo-x86/dev-util/omake/omake-0.9.8.5.ebuild,v 1.7 2009/10/27 11:54:51 aballier Exp $ |
| 28 |
|
| 29 |
-EAPI=1 |
| 30 |
+EAPI=2 |
| 31 |
inherit eutils toolchain-funcs multilib |
| 32 |
|
| 33 |
RESTRICT="installsources" |
| 34 |
@@ -15,20 +15,11 @@ |
| 35 |
SLOT="0" |
| 36 |
KEYWORDS="~amd64 ppc x86" |
| 37 |
IUSE="doc fam ncurses +ocamlopt readline" |
| 38 |
-DEPEND=">=dev-lang/ocaml-3.0.8 |
| 39 |
+DEPEND=">=dev-lang/ocaml-3.10.2[ocamlopt?] |
| 40 |
ncurses? ( >=sys-libs/ncurses-5.3 ) |
| 41 |
fam? ( virtual/fam ) |
| 42 |
readline? ( >=sys-libs/readline-4.3 )" |
| 43 |
|
| 44 |
-pkg_setup() { |
| 45 |
- if use ocamlopt && ! built_with_use --missing true dev-lang/ocaml ocamlopt; then |
| 46 |
- eerror "In order to build ${PN} with native code support from ocaml" |
| 47 |
- eerror "You first need to have a native code ocaml compiler." |
| 48 |
- eerror "You need to install dev-lang/ocaml with ocamlopt useflag on." |
| 49 |
- die "Please install ocaml with ocamlopt useflag" |
| 50 |
- fi |
| 51 |
-} |
| 52 |
- |
| 53 |
use_boolean() { |
| 54 |
if use $1; then |
| 55 |
echo "true" |
| 56 |
@@ -37,7 +28,12 @@ |
| 57 |
fi |
| 58 |
} |
| 59 |
|
| 60 |
-src_compile() { |
| 61 |
+src_prepare() { |
| 62 |
+ epatch "${FILESDIR}/${P}-caml_sync.patch" |
| 63 |
+ epatch "${FILESDIR}/${P}-lm_printf.patch" |
| 64 |
+} |
| 65 |
+ |
| 66 |
+src_configure() { |
| 67 |
# Configuration steps... |
| 68 |
echo "PREFIX = \$(dir \$\"/usr\")" > .config |
| 69 |
echo "BINDIR = \$(dir \$\"\$(PREFIX)/bin\")" >> .config |
| 70 |
@@ -64,7 +60,9 @@ |
| 71 |
echo "DEFAULT_SAVE_INTERVAL = 60" >> .config |
| 72 |
|
| 73 |
echo "OCAMLDEP_MODULES_ENABLED = false" >> .config |
| 74 |
+} |
| 75 |
|
| 76 |
+src_compile() { |
| 77 |
emake all || die "compilation failed" |
| 78 |
} |
| 79 |
|
| 80 |
|
| 81 |
|
| 82 |
|
| 83 |
1.21 dev-util/omake/ChangeLog |
| 84 |
|
| 85 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/omake/ChangeLog?rev=1.21&view=markup |
| 86 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/omake/ChangeLog?rev=1.21&content-type=text/plain |
| 87 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/omake/ChangeLog?r1=1.20&r2=1.21 |
| 88 |
|
| 89 |
Index: ChangeLog |
| 90 |
=================================================================== |
| 91 |
RCS file: /var/cvsroot/gentoo-x86/dev-util/omake/ChangeLog,v |
| 92 |
retrieving revision 1.20 |
| 93 |
retrieving revision 1.21 |
| 94 |
diff -u -r1.20 -r1.21 |
| 95 |
--- ChangeLog 13 Apr 2008 18:21:06 -0000 1.20 |
| 96 |
+++ ChangeLog 27 Oct 2009 11:54:51 -0000 1.21 |
| 97 |
@@ -1,6 +1,12 @@ |
| 98 |
# ChangeLog for dev-util/omake |
| 99 |
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 |
| 100 |
-# $Header: /var/cvsroot/gentoo-x86/dev-util/omake/ChangeLog,v 1.20 2008/04/13 18:21:06 aballier Exp $ |
| 101 |
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 |
| 102 |
+# $Header: /var/cvsroot/gentoo-x86/dev-util/omake/ChangeLog,v 1.21 2009/10/27 11:54:51 aballier Exp $ |
| 103 |
+ |
| 104 |
+ 27 Oct 2009; Alexis Ballier <aballier@g.o> omake-0.9.8.5.ebuild, |
| 105 |
+ +files/omake-0.9.8.5-caml_sync.patch, |
| 106 |
+ +files/omake-0.9.8.5-lm_printf.patch: |
| 107 |
+ eapi2ify, add build fixes for gcc 4.4 by Barry Schwartz |
| 108 |
+ <barryschwartz124@×××××××.net>, bug #289819 |
| 109 |
|
| 110 |
13 Apr 2008; Alexis Ballier <aballier@g.o> -files/omake-config, |
| 111 |
-omake-0.9.6.5.ebuild, -omake-0.9.8.4.ebuild: |
Archives