summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthieu Sozeau <mattam@gentoo.org>2004-06-29 21:53:28 +0000
committerMatthieu Sozeau <mattam@gentoo.org>2004-06-29 21:53:28 +0000
commita7ac3001a107f37a0537fa40cd6d84569b243c2a (patch)
tree07fa905bc13c07595e490177a9927c2c77343b12 /dev-ml/lablgl
parentBump (diff)
downloadhistorical-a7ac3001a107f37a0537fa40cd6d84569b243c2a.tar.gz
historical-a7ac3001a107f37a0537fa40cd6d84569b243c2a.tar.bz2
historical-a7ac3001a107f37a0537fa40cd6d84569b243c2a.zip
Fix compile error when glut flag is not set (bug #41761)
Diffstat (limited to 'dev-ml/lablgl')
-rw-r--r--dev-ml/lablgl/ChangeLog5
-rw-r--r--dev-ml/lablgl/Manifest16
-rw-r--r--dev-ml/lablgl/lablgl-1.00.ebuild6
3 files changed, 17 insertions, 10 deletions
diff --git a/dev-ml/lablgl/ChangeLog b/dev-ml/lablgl/ChangeLog
index 631298527d4a..631882c33212 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.21 2004/06/25 00:01:50 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/lablgl/ChangeLog,v 1.22 2004/06/29 21:53:28 mattam Exp $
+
+ 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.
08 Jun 2004; Bryan Østergaard <kloeri@gentoo.org> lablgl-1.00.ebuild:
Stable on alpha.
diff --git a/dev-ml/lablgl/Manifest b/dev-ml/lablgl/Manifest
index ca79faaece6c..cb4f6092fa4c 100644
--- a/dev-ml/lablgl/Manifest
+++ b/dev-ml/lablgl/Manifest
@@ -1,17 +1,17 @@
-MD5 3da1e56511eff1322c6d6ae053e5df9b lablgl-1.00.ebuild 2075
+MD5 83c7876ae11cfe531e7f46316a4bd6c1 ChangeLog 3659
+MD5 44d06b8990b263084cdf59271e6ff9d9 lablgl-0.97.ebuild 1073
MD5 7bdde20b892e27723d5308268029592f lablgl-0.98.ebuild 1732
MD5 777d7f6881f24f0259e42b5d210f7150 lablgl-0.99-r1.ebuild 1926
-MD5 44d06b8990b263084cdf59271e6ff9d9 lablgl-0.97.ebuild 1073
-MD5 448d07118012d70fd29070d380bc4b3d ChangeLog 3511
-MD5 648a541494aceee26dbcfd76164f37ea metadata.xml 157
MD5 ec65ff3a949f2b91246e58f166445aa9 lablgl-0.99.ebuild 1828
-MD5 e3f4fb9b86db4b15b2a117e604d4c43e files/digest-lablgl-0.99-r1 210
-MD5 7b95aa62137ce4a457a8603803892bcd files/LablGL-0.98-Makefile.config 1422
-MD5 007f6ebc610ac1d9f52d6396f5b430e1 files/LablGL-0.98-Makefile-destdir.patch 1540
+MD5 30aa9090608bbde45a488f949cb2196a lablgl-1.00.ebuild 2139
+MD5 648a541494aceee26dbcfd76164f37ea metadata.xml 157
MD5 b5f4f06ceeac8ce19b70d33f538b885a files/LablGL-0.97-Makefile-destdir.patch 1350
-MD5 fe2f6d4854f565091bda3022e0a62b31 files/lablgl-1.00-Makefile.config 371
MD5 7b95aa62137ce4a457a8603803892bcd files/LablGL-0.97-Makefile.config 1422
+MD5 007f6ebc610ac1d9f52d6396f5b430e1 files/LablGL-0.98-Makefile-destdir.patch 1540
+MD5 7b95aa62137ce4a457a8603803892bcd files/LablGL-0.98-Makefile.config 1422
MD5 6ef239cb00bd6b3b6b60356f31adea47 files/digest-lablgl-0.97 63
MD5 904f1e50c4866c5810ed0ddfe6eacb16 files/digest-lablgl-0.98 63
MD5 e3f4fb9b86db4b15b2a117e604d4c43e files/digest-lablgl-0.99 210
+MD5 e3f4fb9b86db4b15b2a117e604d4c43e files/digest-lablgl-0.99-r1 210
MD5 e70e3957c7832b0cce13db8cd8b33272 files/digest-lablgl-1.00 210
+MD5 fe2f6d4854f565091bda3022e0a62b31 files/lablgl-1.00-Makefile.config 371
diff --git a/dev-ml/lablgl/lablgl-1.00.ebuild b/dev-ml/lablgl/lablgl-1.00.ebuild
index 0d5cf2518cab..989e56216c6c 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.8 2004/06/25 00:01:50 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/lablgl/lablgl-1.00.ebuild,v 1.9 2004/06/29 21:53:28 mattam Exp $
IUSE="tcltk glut doc"
@@ -39,6 +39,10 @@ src_compile() {
# make configuration file
cp ${FILESDIR}/${P}-Makefile.config ${S}/Makefile.config || die
+ if ! (use glut); then
+ sed -i "s/-lglut//" Makefile.config
+ fi
+
use tcltk && make && make opt
use glut && make glut glutopt