| 1 |
aballier 08/01/12 19:13:19 |
| 2 |
|
| 3 |
Modified: lablgl-1.03.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
Readd more modularity, bug #204121 |
| 6 |
(Portage version: 2.1.4) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.3 dev-ml/lablgl/lablgl-1.03.ebuild |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-ml/lablgl/lablgl-1.03.ebuild?rev=1.3&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-ml/lablgl/lablgl-1.03.ebuild?rev=1.3&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-ml/lablgl/lablgl-1.03.ebuild?r1=1.2&r2=1.3 |
| 14 |
|
| 15 |
Index: lablgl-1.03.ebuild |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/dev-ml/lablgl/lablgl-1.03.ebuild,v |
| 18 |
retrieving revision 1.2 |
| 19 |
retrieving revision 1.3 |
| 20 |
diff -u -r1.2 -r1.3 |
| 21 |
--- lablgl-1.03.ebuild 2 Jan 2008 20:13:06 -0000 1.2 |
| 22 |
+++ lablgl-1.03.ebuild 12 Jan 2008 19:13:19 -0000 1.3 |
| 23 |
@@ -1,12 +1,12 @@ |
| 24 |
# Copyright 1999-2008 Gentoo Foundation |
| 25 |
# Distributed under the terms of the GNU General Public License v2 |
| 26 |
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/lablgl/lablgl-1.03.ebuild,v 1.2 2008/01/02 20:13:06 aballier Exp $ |
| 27 |
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/lablgl/lablgl-1.03.ebuild,v 1.3 2008/01/12 19:13:19 aballier Exp $ |
| 28 |
|
| 29 |
inherit multilib eutils toolchain-funcs |
| 30 |
|
| 31 |
EAPI="1" |
| 32 |
|
| 33 |
-IUSE="doc +ocamlopt" |
| 34 |
+IUSE="doc glut +ocamlopt tk" |
| 35 |
|
| 36 |
DESCRIPTION="Objective CAML interface for OpenGL" |
| 37 |
HOMEPAGE="http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/lablgl.html" |
| 38 |
@@ -17,16 +17,16 @@ |
| 39 |
x11-libs/libXext |
| 40 |
x11-libs/libXmu |
| 41 |
x11-libs/libX11 |
| 42 |
- virtual/glut |
| 43 |
- >=dev-lang/tcl-8.3 |
| 44 |
- >=dev-lang/tk-8.3" |
| 45 |
+ glut? ( virtual/glut ) |
| 46 |
+ tk? ( >=dev-lang/tcl-8.3 |
| 47 |
+ >=dev-lang/tk-8.3 )" |
| 48 |
|
| 49 |
SRC_URI="http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/dist/${P}.tar.gz" |
| 50 |
SLOT="0" |
| 51 |
KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~sparc ~x86 ~x86-fbsd" |
| 52 |
|
| 53 |
pkg_setup() { |
| 54 |
- if ! built_with_use dev-lang/ocaml tk ; then |
| 55 |
+ if use tk && ! built_with_use dev-lang/ocaml tk ; then |
| 56 |
eerror "You don't have ocaml compiled with tk support" |
| 57 |
eerror "" |
| 58 |
eerror "lablgl requires ocaml be built with tk support." |
| 59 |
@@ -47,15 +47,33 @@ |
| 60 |
# make configuration file |
| 61 |
echo "BINDIR=/usr/bin" > Makefile.config |
| 62 |
echo "GLLIBS = -lGL -lGLU" >> Makefile.config |
| 63 |
- echo "GLUTLIBS = -lglut" >> Makefile.config |
| 64 |
+ if use glut; then |
| 65 |
+ echo "GLUTLIBS = -lglut" >> Makefile.config |
| 66 |
+ else |
| 67 |
+ echo "GLUTLIBS = " >> Makefile.config |
| 68 |
+ fi |
| 69 |
echo "XLIBS = -lXext -lXmu -lX11" >> Makefile.config |
| 70 |
echo "RANLIB = $(tc-getRANLIB)" >> Makefile.config |
| 71 |
echo 'COPTS = -c -O $(CFLAGS)' >> Makefile.config |
| 72 |
echo 'INCLUDES = $(TKINCLUDES) $(GLINCLUDES) $(XINCLUDES)' >> Makefile.config |
| 73 |
|
| 74 |
- emake -j1 || die "failed to build" |
| 75 |
- if use ocamlopt; then |
| 76 |
- emake -j1 opt || die "failed to build opt" |
| 77 |
+ if use tk; then |
| 78 |
+ emake -j1 togl || die "failed to build togl" |
| 79 |
+ if use ocamlopt; then |
| 80 |
+ emake -j1 toglopt || die "failed to build native code togl" |
| 81 |
+ fi |
| 82 |
+ fi |
| 83 |
+ |
| 84 |
+ emake -j1 lib || die "failed to build the library" |
| 85 |
+ if useocamlopt; then |
| 86 |
+ emake -j1 libopt || die "failed to build native code library" |
| 87 |
+ fi |
| 88 |
+ |
| 89 |
+ if use glut; then |
| 90 |
+ emake -j1 glut || die "failed to build glut" |
| 91 |
+ if use ocamlopt; then |
| 92 |
+ emake -j1 glutopt || die "failed to build native code glutopt" |
| 93 |
+ fi |
| 94 |
fi |
| 95 |
} |
| 96 |
|
| 97 |
|
| 98 |
|
| 99 |
|
| 100 |
1.43 dev-ml/lablgl/ChangeLog |
| 101 |
|
| 102 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-ml/lablgl/ChangeLog?rev=1.43&view=markup |
| 103 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-ml/lablgl/ChangeLog?rev=1.43&content-type=text/plain |
| 104 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-ml/lablgl/ChangeLog?r1=1.42&r2=1.43 |
| 105 |
|
| 106 |
Index: ChangeLog |
| 107 |
=================================================================== |
| 108 |
RCS file: /var/cvsroot/gentoo-x86/dev-ml/lablgl/ChangeLog,v |
| 109 |
retrieving revision 1.42 |
| 110 |
retrieving revision 1.43 |
| 111 |
diff -u -r1.42 -r1.43 |
| 112 |
--- ChangeLog 2 Jan 2008 20:13:06 -0000 1.42 |
| 113 |
+++ ChangeLog 12 Jan 2008 19:13:19 -0000 1.43 |
| 114 |
@@ -1,6 +1,9 @@ |
| 115 |
# ChangeLog for dev-ml/lablgl |
| 116 |
# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 |
| 117 |
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/lablgl/ChangeLog,v 1.42 2008/01/02 20:13:06 aballier Exp $ |
| 118 |
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/lablgl/ChangeLog,v 1.43 2008/01/12 19:13:19 aballier Exp $ |
| 119 |
+ |
| 120 |
+ 12 Jan 2008; Alexis Ballier <aballier@g.o> lablgl-1.03.ebuild: |
| 121 |
+ Readd more modularity, bug #204121 |
| 122 |
|
| 123 |
02 Jan 2008; Alexis Ballier <aballier@g.o> lablgl-1.03.ebuild: |
| 124 |
Add support to not build with ocamlopt |
| 125 |
|
| 126 |
|
| 127 |
|
| 128 |
-- |
| 129 |
gentoo-commits@l.g.o mailing list |
Archives