diff options
| author |   Matthieu Sozeau <mattam@gentoo.org> | 2004-07-02 09:30:45 +0000 |
|---|---|---|
| committer | Matthieu Sozeau <mattam@gentoo.org> | 2004-07-02 09:30:45 +0000 |
| commit | 9092d81dd10a27e95fde3e2ccc09ba5e7c9bcdab (patch) | |
| tree | 1e89ae1ce0f1251254693419572b4dfbdc1fa01c /dev-ml/lablgl | |
| parent | Stable on x86 (Manifest recommit) (diff) | |
| download | gentoo-2-9092d81dd10a27e95fde3e2ccc09ba5e7c9bcdab.tar.gz gentoo-2-9092d81dd10a27e95fde3e2ccc09ba5e7c9bcdab.tar.bz2 gentoo-2-9092d81dd10a27e95fde3e2ccc09ba5e7c9bcdab.zip | |
fixing +tcltk -glut building, see bug #55782
Diffstat (limited to 'dev-ml/lablgl')
| -rw-r--r-- | dev-ml/lablgl/ChangeLog | 5 | ||||
| -rw-r--r-- | dev-ml/lablgl/lablgl-1.00.ebuild | 14 |
2 files changed, 13 insertions, 6 deletions
diff --git a/dev-ml/lablgl/ChangeLog b/dev-ml/lablgl/ChangeLog index 631882c33212..551f020d810e 100644 --- a/dev-ml/lablgl/ChangeLog +++ b/dev-ml/lablgl/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-ml/lablgl # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-ml/lablgl/ChangeLog,v 1.22 2004/06/29 21:53:28 mattam Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-ml/lablgl/ChangeLog,v 1.23 2004/07/02 09:30:45 mattam Exp $ + + 02 Jul 2004; Matthieu Sozeau <mattam@gentoo.org> lablgl-1.00.ebuild: + Fix building rules when glut is not set and tcltk is. 29 Jun 2004; Matthieu Sozeau <mattam@gentoo.org> lablgl-1.00.ebuild: Fix makefile, when glut flag is not set, there's no need to link with glut. diff --git a/dev-ml/lablgl/lablgl-1.00.ebuild b/dev-ml/lablgl/lablgl-1.00.ebuild index 989e56216c6c..f02b2cdbc89d 100644 --- a/dev-ml/lablgl/lablgl-1.00.ebuild +++ b/dev-ml/lablgl/lablgl-1.00.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-ml/lablgl/lablgl-1.00.ebuild,v 1.9 2004/06/29 21:53:28 mattam Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-ml/lablgl/lablgl-1.00.ebuild,v 1.10 2004/07/02 09:30:45 mattam Exp $ IUSE="tcltk glut doc" @@ -43,11 +43,15 @@ src_compile() { sed -i "s/-lglut//" Makefile.config fi - use tcltk && make && make opt - - use glut && make glut glutopt + if use tcltk; then + make togl toglopt + fi - make lib libopt || die + if use glut; then + make glut glutopt + else + make lib libopt + fi } src_install () { |