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 | d087e81b7f4b501f2d2b7cc54f1ae31c0811cd74 (patch) | |
| tree | c2a99acf537abcfd6fd4ceb9a18b287269b3e79c /www-client/mozilla | |
| parent | Added to ~ppc (diff) | |
| download | historical-d087e81b7f4b501f2d2b7cc54f1ae31c0811cd74.tar.gz historical-d087e81b7f4b501f2d2b7cc54f1ae31c0811cd74.tar.bz2 historical-d087e81b7f4b501f2d2b7cc54f1ae31c0811cd74.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
Package-Manager: portage-2.0.51.22-r2
Diffstat (limited to 'www-client/mozilla')
| -rw-r--r-- | www-client/mozilla/ChangeLog | 7 | ||||
| -rw-r--r-- | www-client/mozilla/Manifest | 4 | ||||
| -rw-r--r-- | www-client/mozilla/mozilla-1.7.10-r3.ebuild | 8 |
3 files changed, 15 insertions, 4 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/Manifest b/www-client/mozilla/Manifest index dd6d66a6280e..3f00782eb8b1 100644 --- a/www-client/mozilla/Manifest +++ b/www-client/mozilla/Manifest @@ -4,9 +4,9 @@ MD5 2629a6429172f0f52ed0aaca1e0d7051 mozilla-1.7.7.ebuild 11699 MD5 9a1d1ff8920e1e63f730c07062aaddd0 mozilla-1.7.8-r2.ebuild 12360 MD5 c4755b0e4a2d90e9b0a42e4f8d7324d5 mozilla-1.7.10-r1.ebuild 12669 MD5 4ea3d1895061904b61b76550541c64b0 mozilla-1.7.7-r2.ebuild 11778 -MD5 e1bfb529f6ed50e95c78c89e619c432c ChangeLog 47725 +MD5 1d88ccc49e081f0b0f5ca48e12274c5e ChangeLog 47973 MD5 ce23390351fe8020387d93ee29e09a3d metadata.xml 160 -MD5 807c9b7a2576db34887e78ab0745db54 mozilla-1.7.10-r3.ebuild 11904 +MD5 570f1e1441e077fbcb1efb16a8cd6ce2 mozilla-1.7.10-r3.ebuild 12312 MD5 31adb1c8bd099f61d5c68f7e6e446440 mozilla-1.7.8-r1.ebuild 12236 MD5 dda9d34fd8970334058d801c524a027c files/digest-mozilla-1.7.7 203 MD5 5d946445ba7bba30fb129f941bc7e84b files/digest-mozilla-1.7.8 203 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 |