summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTavis Ormandy <taviso@gentoo.org>2003-05-21 15:09:43 +0000
committerTavis Ormandy <taviso@gentoo.org>2003-05-21 15:09:43 +0000
commitabf3a90f9f12fb618edd7bb46d6a786317a94ed3 (patch)
tree053c6a9766f8620b89f1a00410c4843186024f1b /media-libs/fontconfig
parentChanged ~sparc keyword to sparc. (diff)
downloadhistorical-abf3a90f9f12fb618edd7bb46d6a786317a94ed3.tar.gz
historical-abf3a90f9f12fb618edd7bb46d6a786317a94ed3.tar.bz2
historical-abf3a90f9f12fb618edd7bb46d6a786317a94ed3.zip
dont use ccc to compile fontconfig on Alpha.
Diffstat (limited to 'media-libs/fontconfig')
-rw-r--r--media-libs/fontconfig/ChangeLog6
-rw-r--r--media-libs/fontconfig/Manifest6
-rw-r--r--media-libs/fontconfig/fontconfig-2.1-r1.ebuild5
-rw-r--r--media-libs/fontconfig/fontconfig-2.2.0-r2.ebuild6
4 files changed, 17 insertions, 6 deletions
diff --git a/media-libs/fontconfig/ChangeLog b/media-libs/fontconfig/ChangeLog
index 1fafd5a7f9b0..60feda1f3153 100644
--- a/media-libs/fontconfig/ChangeLog
+++ b/media-libs/fontconfig/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for media-libs/fontconfig
# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/fontconfig/ChangeLog,v 1.32 2003/05/17 16:03:23 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/fontconfig/ChangeLog,v 1.33 2003/05/21 15:09:35 taviso Exp $
+
+ 21 May 2003; Tavis Ormandy <taviso@gentoo.org> fontconfig-2.1-r1.ebuild,
+ fontconfig-2.2.0-r2.ebuild:
+ die if using ccc.
*fontconfig-2.2.0-r2 (14 May 2003)
diff --git a/media-libs/fontconfig/Manifest b/media-libs/fontconfig/Manifest
index 65e7b8ff851d..63a27a48cd11 100644
--- a/media-libs/fontconfig/Manifest
+++ b/media-libs/fontconfig/Manifest
@@ -1,6 +1,6 @@
-MD5 d35168948d28ccdf0660706e7a9595b1 fontconfig-2.1-r1.ebuild 2530
-MD5 9dfa568f0822e6d64316a06f04fee294 ChangeLog 5205
-MD5 619c966fb45be13022be4675a3ef2cf5 fontconfig-2.2.0-r2.ebuild 3206
+MD5 8b980cca6f63a65fd34a516fb9dc6870 fontconfig-2.1-r1.ebuild 2650
+MD5 78c09f48b6fb8c581ac21d09fcf3b5bd ChangeLog 5332
+MD5 cd5bfe748759635762ceab1055a48519 fontconfig-2.2.0-r2.ebuild 3328
MD5 9d8a6b53e0aa951959a3026fb4d8deef files/digest-fontconfig-2.1-r1 65
MD5 be6ad03d595378054511740d1eeb5e8a files/digest-fontconfig-2.2.0-r2 68
MD5 8791cc317d1e601f2cff7218460fb5fc files/patch/fontconfig-2.1-x11fontpath-date-configure.patch 585
diff --git a/media-libs/fontconfig/fontconfig-2.1-r1.ebuild b/media-libs/fontconfig/fontconfig-2.1-r1.ebuild
index 7cfb5517de49..33956aee0747 100644
--- a/media-libs/fontconfig/fontconfig-2.1-r1.ebuild
+++ b/media-libs/fontconfig/fontconfig-2.1-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2003 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/fontconfig/fontconfig-2.1-r1.ebuild,v 1.11 2003/04/08 15:29:44 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/fontconfig/fontconfig-2.1-r1.ebuild,v 1.12 2003/05/21 15:09:35 taviso Exp $
inherit debug eutils
@@ -47,6 +47,9 @@ src_unpack() {
src_compile() {
fc_setup
+ [ "${ARCH}" == "alpha" -a "${CC}" == "ccc" ] && \
+ die "Dont compile fontconfig with ccc, it doesnt work very well"
+
econf \
--x-includes=/usr/X11R6/include \
--x-libraries=/usr/X11R6/lib || die
diff --git a/media-libs/fontconfig/fontconfig-2.2.0-r2.ebuild b/media-libs/fontconfig/fontconfig-2.2.0-r2.ebuild
index 442e187b1a9e..1ec87450c883 100644
--- a/media-libs/fontconfig/fontconfig-2.2.0-r2.ebuild
+++ b/media-libs/fontconfig/fontconfig-2.2.0-r2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2003 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/fontconfig/fontconfig-2.2.0-r2.ebuild,v 1.5 2003/05/19 13:28:29 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/fontconfig/fontconfig-2.2.0-r2.ebuild,v 1.6 2003/05/21 15:09:35 taviso Exp $
inherit eutils
@@ -50,6 +50,10 @@ src_unpack() {
src_compile() {
# FIXME : docs switch doesn't seem to work
+
+ [ "${ARCH}" == "alpha" -a "${CC}" == "ccc" ] && \
+ die "Dont compile fontconfig with ccc, it doesnt work very well"
+
econf `use_enable doc docs` \
--with-docdir=${D}/usr/share/doc/${PF} \
--x-includes=/usr/X11R6/include \