diff options
author | Aron Griffis <agriffis@gentoo.org> | 2004-08-06 13:29:38 +0000 |
---|---|---|
committer | Aron Griffis <agriffis@gentoo.org> | 2004-08-06 13:29:38 +0000 |
commit | 3a0070835bf2236a7909e5640e40aa89a60cff16 (patch) | |
tree | cfd024061352ba60a604c6f942b9fc0ac73c9861 /eclass | |
parent | new upstream release (Manifest recommit) (diff) | |
download | gentoo-2-3a0070835bf2236a7909e5640e40aa89a60cff16.tar.gz gentoo-2-3a0070835bf2236a7909e5640e40aa89a60cff16.tar.bz2 gentoo-2-3a0070835bf2236a7909e5640e40aa89a60cff16.zip |
alpha no longer needs sed fixup. Add MOZ_ENABLE_XFT setting (might be historical)
Diffstat (limited to 'eclass')
-rw-r--r-- | eclass/mozilla.eclass | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/eclass/mozilla.eclass b/eclass/mozilla.eclass index 92744bec249c..d63e3bcefc3c 100644 --- a/eclass/mozilla.eclass +++ b/eclass/mozilla.eclass @@ -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/eclass/mozilla.eclass,v 1.3 2004/08/06 02:46:20 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/mozilla.eclass,v 1.4 2004/08/06 13:29:38 agriffis Exp $ ECLASS=mozilla INHERITED="$INHERITED $ECLASS" @@ -73,13 +73,6 @@ mozilla_conf() { # Additional ARCH support case "${ARCH}" in - alpha) - # Mozilla won't link with X11 on alpha, for some crazy reason. - # set it to link explicitly here. - sed -i 's/\(EXTRA_DSO_LDOPTS += $(MOZ_GTK_LDFLAGS).*$\)/\1 -L\/usr\/X11R6\/lib -lX11/' \ - ${S}/gfx/src/gtk/Makefile.in - ;; - ppc) # Fix to avoid gcc-3.3.x micompilation issues. if [[ $(gcc-major-version).$(gcc-minor-version) == 3.3 ]]; then @@ -203,6 +196,11 @@ mozilla_conf() { einfo "Building without Xft2.0 support (moznoxft)" myconf="${myconf} --disable-xft $(use_enable truetype freetype2)" fi + + if [[ ${myconf} == *--enable-xft* ]]; then + # This might just be an historical artifact... + export MOZ_ENABLE_XFT=1 + fi } # Simulate the silly csh makemake script |