diff options
| author |   Grant Goodyear <g2boojum@gentoo.org> | 2003-08-15 09:22:53 +0000 |
|---|---|---|
| committer | Grant Goodyear <g2boojum@gentoo.org> | 2003-08-15 09:22:53 +0000 |
| commit | c2ebc3049400c1b6fbc08ccb45e2155e9d7785a1 (patch) | |
| tree | b4718b42a77dc245dc14f02c585cbaaf728c6e08 /x11-libs/fltk | |
| parent | version bump (diff) | |
| download | historical-c2ebc3049400c1b6fbc08ccb45e2155e9d7785a1.tar.gz historical-c2ebc3049400c1b6fbc08ccb45e2155e9d7785a1.tar.bz2 historical-c2ebc3049400c1b6fbc08ccb45e2155e9d7785a1.zip | |
Added nptl to IUSE. Should address bug #26569
Diffstat (limited to 'x11-libs/fltk')
| -rw-r--r-- | x11-libs/fltk/ChangeLog | 6 | ||||
| -rw-r--r-- | x11-libs/fltk/Manifest | 4 | ||||
| -rw-r--r-- | x11-libs/fltk/fltk-1.1.4_rc2.ebuild | 13 |
3 files changed, 16 insertions, 7 deletions
diff --git a/x11-libs/fltk/ChangeLog b/x11-libs/fltk/ChangeLog index 4c32ed82b299..44dda5d6e9da 100644 --- a/x11-libs/fltk/ChangeLog +++ b/x11-libs/fltk/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-libs/fltk # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/fltk/ChangeLog,v 1.24 2003/08/14 20:13:32 g2boojum Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/fltk/ChangeLog,v 1.25 2003/08/15 09:22:49 g2boojum Exp $ + + 15 Aug 2003; Nick Hadaway <raker@gentoo.org> fltk-1.1.4_rc2.ebuild: + Added nptl to IUSE. Only enable threading if nptl isn't in use. + See bug #26569. *fltk-1.1.4_rc2 (14 Aug 2003) diff --git a/x11-libs/fltk/Manifest b/x11-libs/fltk/Manifest index 34b73423aa6d..5529c7512dea 100644 --- a/x11-libs/fltk/Manifest +++ b/x11-libs/fltk/Manifest @@ -1,13 +1,13 @@ MD5 f00591dea2bd2aa68ac8dde6892db899 fltk-1.1.1.ebuild 1300 MD5 80af2d99e9922762e5f3f693f6b5139f fltk-1.1.2-r2.ebuild 1975 MD5 89a2d657da5a9c4d704d420d09ea9aab fltk-1.0.11-r3.ebuild 1221 -MD5 492f6374b46a73d8445085a71aa349c3 fltk-1.1.4_rc2.ebuild 1814 +MD5 ecbf8423c2f7db24918c9e1fcada92ea fltk-1.1.4_rc2.ebuild 1968 MD5 f1baef02e4f14acab5f70184ff509d07 fltk-1.1.3.ebuild 2006 MD5 57759ff97f81f83e675ed84ec57ed774 fltk-1.1.2-r1.ebuild 1818 MD5 793e017a3d16dbb10585a62625eea81b fltk-1.1.4_rc1.ebuild 2033 MD5 01f86150585510c9774a559ef8a74ab0 fltk-1.1.2.ebuild 1299 MD5 7741b5bb78c150bdb17298433b54d185 fltk-1.1.0_rc7.ebuild 1313 -MD5 d88bfba6da2fd096c82ad8654e416a06 ChangeLog 4674 +MD5 46182a1683a56882f09103b420022efe ChangeLog 4830 MD5 d8bcde3e8eb3edad07403bd5cdc633e3 files/libs.diff 830 MD5 66e9fc032d679befebde2ff1709eaa21 files/digest-fltk-1.0.11-r3 71 MD5 74fc94981d92895e653f46d93575b4a0 files/digest-fltk-1.1.0_rc7 74 diff --git a/x11-libs/fltk/fltk-1.1.4_rc2.ebuild b/x11-libs/fltk/fltk-1.1.4_rc2.ebuild index e480193887a9..42533860c923 100644 --- a/x11-libs/fltk/fltk-1.1.4_rc2.ebuild +++ b/x11-libs/fltk/fltk-1.1.4_rc2.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2003 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/fltk/fltk-1.1.4_rc2.ebuild,v 1.1 2003/08/14 20:13:32 g2boojum Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/fltk/fltk-1.1.4_rc2.ebuild,v 1.2 2003/08/15 09:22:49 g2boojum Exp $ -IUSE="opengl debug" +IUSE="opengl debug nptl" inherit eutils @@ -29,13 +29,18 @@ src_unpack() { } src_compile() { - local myconf="--enable-shared --enable-threads \ - --enable-xdbe --enable-xft --enable-static" + local myconf + myconf="--enable-shared --enable-xdbe --enable-xft --enable-static" use debug && myconf="${myconf} --enable-debug" use opengl || myconf="${myconf} --disable-gl" + # The fltk threading code doesn't work with nptl + # See bug #26569 + use nptl && myconf="${myconf} --disable-threads" \ + || myconf="${myconf} --enable-threads" + # needed for glibc-2.3.1 (as far as i can test) # otherwise libstdc++ won't be linked. #17894 and #15572 # doesn't happen for glibc-2.3.2 - <liquidx@gentoo.org> |