diff options
| author |   Aron Griffis <agriffis@gentoo.org> | 2005-03-24 02:20:36 +0000 |
|---|---|---|
| committer | Aron Griffis <agriffis@gentoo.org> | 2005-03-24 02:20:36 +0000 |
| commit | 2793d55b0e16d1e1e7a5a0a846a8997e77894f93 (patch) | |
| tree | b812522dfe3486c6755d3b21f7d1a241ca57e811 /www-client/mozilla | |
| parent | stable on amd64, fixes #85102 (diff) | |
| download | gentoo-2-2793d55b0e16d1e1e7a5a0a846a8997e77894f93.tar.gz gentoo-2-2793d55b0e16d1e1e7a5a0a846a8997e77894f93.tar.bz2 gentoo-2-2793d55b0e16d1e1e7a5a0a846a8997e77894f93.zip | |
Backport fixes from 1.7.6-r1 for USE=ldap build #85648
(Portage version: 2.0.51.19)
Diffstat (limited to 'www-client/mozilla')
| -rw-r--r-- | www-client/mozilla/ChangeLog | 5 | ||||
| -rw-r--r-- | www-client/mozilla/mozilla-1.7.5-r1.ebuild | 18 |
2 files changed, 12 insertions, 11 deletions
diff --git a/www-client/mozilla/ChangeLog b/www-client/mozilla/ChangeLog index 9f25faf5352e..2e8214435095 100644 --- a/www-client/mozilla/ChangeLog +++ b/www-client/mozilla/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for www-client/mozilla # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla/ChangeLog,v 1.6 2005/03/23 22:41:20 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla/ChangeLog,v 1.7 2005/03/24 02:20:36 agriffis Exp $ + + 24 Mar 2005; <agriffis@gentoo.org> mozilla-1.7.5-r1.ebuild: + Backport fixes from 1.7.6-r1 for USE=ldap build #85648 23 Mar 2005; Aron Griffis <agriffis@gentoo.org> mozilla-1.7.6-r1.ebuild: Don't force CC, CXX, LD on the make cmdline so that we can build with diff --git a/www-client/mozilla/mozilla-1.7.5-r1.ebuild b/www-client/mozilla/mozilla-1.7.5-r1.ebuild index e2d673d780e8..235253df2e5a 100644 --- a/www-client/mozilla/mozilla-1.7.5-r1.ebuild +++ b/www-client/mozilla/mozilla-1.7.5-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla/mozilla-1.7.5-r1.ebuild,v 1.2 2005/03/23 21:42:40 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla/mozilla-1.7.5-r1.ebuild,v 1.3 2005/03/24 02:20:36 agriffis Exp $ unset ALLOWED_FLAGS # stupid extra-functions.sh ... bug 49179 inherit flag-o-matic gcc eutils nsplugins mozilla-launcher mozconfig makeedit multilib @@ -147,16 +147,14 @@ src_compile() { #################################### # ./configure picks up the mozconfig stuff - export LD="$(tc-getLD)" - export CC="$(tc-getCC)" - export CXX="$(tc-getCXX)" + CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \ ./configure || die "configure failed" # This removes extraneous CFLAGS from the Makefiles to reduce RAM # requirements while compiling edit_makefiles - emake CXX="$(tc-getCXX)" CC="$(tc-getCC)" LD="$(tc-getLD)" || die "emake failed" + emake || die "emake failed" #################################### # @@ -172,11 +170,11 @@ src_compile() { cd ${S}/security/coreconf || die "cd coreconf failed" echo 'INCLUDES += -I$(DIST)/include/nspr -I$(DIST)/include/dbm'\ >>headers.mk - emake -j1 CXX="$(tc-getCXX)" CC="$(tc-getCC)" LD="$(tc-getLD)" || die "make security headers failed" + emake -j1 || die "make security headers failed" cd ${S}/security/nss || die "cd nss failed" - emake -j1 CXX="$(tc-getCXX)" CC="$(tc-getCC)" LD="$(tc-getLD)" moz_import || die "make moz_import failed" - emake -j1 CXX="$(tc-getCXX)" CC="$(tc-getCC)" LD="$(tc-getLD)" || die "make nss failed" + emake -j1 moz_import || die "make moz_import failed" + emake -j1 || die "make nss failed" fi #################################### @@ -189,10 +187,10 @@ src_compile() { if use crypt && ! use moznomail; then einfo "Building Enigmail plugin..." cd ${S}/extensions/ipc || die "cd ipc failed" - emake CXX="$(tc-getCXX)" CC="$(tc-getCC)" LD="$(tc-getLD)" || die "make ipc failed" + emake || die "make ipc failed" cd ${S}/extensions/enigmail || die "cd enigmail failed" - emake CXX="$(tc-getCXX)" CC="$(tc-getCC)" LD="$(tc-getLD)" || die "make enigmail failed" + emake || die "make enigmail failed" fi } |