diff options
| author |   Aron Griffis <agriffis@gentoo.org> | 2005-08-02 12:46:27 +0000 |
|---|---|---|
| committer | Aron Griffis <agriffis@gentoo.org> | 2005-08-02 12:46:27 +0000 |
| commit | a7fc69d97bdca54af0526c7ff84a98a06ec6173a (patch) | |
| tree | efd4258953da799640d3876c6315822bf1c0b1bb /www-client | |
| parent | Added to ~ppc (diff) | |
| download | gentoo-2-a7fc69d97bdca54af0526c7ff84a98a06ec6173a.tar.gz gentoo-2-a7fc69d97bdca54af0526c7ff84a98a06ec6173a.tar.bz2 gentoo-2-a7fc69d97bdca54af0526c7ff84a98a06ec6173a.zip | |
Move GENTOO_NSPLUGINS_DIR and GENTOO_NSBROWSER_PLUGINS_DIR from the eclass
prior to econf, to the ebuild prior to emake, since ./configure chokes on
the definitions
(Portage version: 2.0.51.22-r2)
Diffstat (limited to 'www-client')
| -rw-r--r-- | www-client/mozilla/ChangeLog | 7 | ||||
| -rw-r--r-- | www-client/mozilla/mozilla-1.7.10-r3.ebuild | 8 |
2 files changed, 13 insertions, 2 deletions
diff --git a/www-client/mozilla/ChangeLog b/www-client/mozilla/ChangeLog index acb5a1cc5df6..f679e3535e1c 100644 --- a/www-client/mozilla/ChangeLog +++ b/www-client/mozilla/ChangeLog @@ -1,6 +1,11 @@ # 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.50 2005/08/02 03:15:27 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla/ChangeLog,v 1.51 2005/08/02 12:46:27 agriffis Exp $ + + 02 Aug 2005; Aron Griffis <agriffis@gentoo.org> mozilla-1.7.10-r3.ebuild: + Move GENTOO_NSPLUGINS_DIR and GENTOO_NSBROWSER_PLUGINS_DIR from the eclass + prior to econf, to the ebuild prior to emake, since ./configure chokes on + the definitions *mozilla-1.7.10-r3 (02 Aug 2005) diff --git a/www-client/mozilla/mozilla-1.7.10-r3.ebuild b/www-client/mozilla/mozilla-1.7.10-r3.ebuild index d7a28f8e8461..0e45c291c27c 100644 --- a/www-client/mozilla/mozilla-1.7.10-r3.ebuild +++ b/www-client/mozilla/mozilla-1.7.10-r3.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.10-r3.ebuild,v 1.2 2005/08/02 03:19:37 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla/mozilla-1.7.10-r3.ebuild,v 1.3 2005/08/02 12:46:27 agriffis Exp $ unset ALLOWED_FLAGS # stupid extra-functions.sh ... bug 49179 inherit flag-o-matic toolchain-funcs eutils mozconfig mozilla-launcher makeedit multilib @@ -203,9 +203,15 @@ src_compile() { # #################################### + CPPFLAGS="${CPPFLAGS} -DARON_WAS_HERE" \ CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \ econf || die + # It would be great if we could pass these in via CPPFLAGS or CFLAGS prior + # to econf, but the quotes cause configure to fail. + grep -Flre -DARON_WAS_HERE --exclude=config.\* . | xargs sed -i -e \ + 's|-DARON_WAS_HERE|-DGENTOO_NSPLUGINS_DIR=\\\"/usr/'"$(get_libdir)"'/nsplugins\\\" -DGENTOO_NSBROWSER_PLUGINS_DIR=\\\"/usr/'"$(get_libdir)"'/nsbrowser/plugins\\\"|' + # This removes extraneous CFLAGS from the Makefiles to reduce RAM # requirements while compiling edit_makefiles |