diff options
| author |   Nirbheek Chauhan <nirbheek@gentoo.org> | 2009-08-21 15:42:09 +0000 |
|---|---|---|
| committer | Nirbheek Chauhan <nirbheek@gentoo.org> | 2009-08-21 15:42:09 +0000 |
| commit | 19b30e31520cb450c514a0b7632931919c9eba0a (patch) | |
| tree | deb8e9bc70ab97937eb90b381290328d9f511f93 /dev-util/devhelp | |
| parent | old (diff) | |
| download | gentoo-2-19b30e31520cb450c514a0b7632931919c9eba0a.tar.gz gentoo-2-19b30e31520cb450c514a0b7632931919c9eba0a.tar.bz2 gentoo-2-19b30e31520cb450c514a0b7632931919c9eba0a.zip | |
Fix botched gecko-home value from previous commit
(Portage version: 2.2_rc38/cvs/Linux i686)
Diffstat (limited to 'dev-util/devhelp')
| -rw-r--r-- | dev-util/devhelp/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-util/devhelp/devhelp-0.21-r1.ebuild | 18 |
2 files changed, 21 insertions, 3 deletions
diff --git a/dev-util/devhelp/ChangeLog b/dev-util/devhelp/ChangeLog index ab908a4e7c07..9bcacf87dae5 100644 --- a/dev-util/devhelp/ChangeLog +++ b/dev-util/devhelp/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-util/devhelp # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/devhelp/ChangeLog,v 1.95 2009/08/21 15:24:42 nirbheek Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/devhelp/ChangeLog,v 1.96 2009/08/21 15:42:09 nirbheek Exp $ + + 21 Aug 2009; Nirbheek Chauhan <nirbheek@gentoo.org> + devhelp-0.21-r1.ebuild: + Fix botched gecko-home value from previous commit 21 Aug 2009; Nirbheek Chauhan <nirbheek@gentoo.org> devhelp-0.21-r1.ebuild: diff --git a/dev-util/devhelp/devhelp-0.21-r1.ebuild b/dev-util/devhelp/devhelp-0.21-r1.ebuild index dc0e8fdeba15..e2d874b15031 100644 --- a/dev-util/devhelp/devhelp-0.21-r1.ebuild +++ b/dev-util/devhelp/devhelp-0.21-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/devhelp/devhelp-0.21-r1.ebuild,v 1.7 2009/08/21 15:24:42 nirbheek Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/devhelp/devhelp-0.21-r1.ebuild,v 1.8 2009/08/21 15:42:09 nirbheek Exp $ EAPI="2" GCONF_DEBUG="no" @@ -48,8 +48,22 @@ pkg_setup() { fi G2CONF="$(use_with zlib) - --with-gecko=libxul + --with-gecko=libxul" + + # Properly detect dir for libxul.so etc. + # No, really, don't ask. + if has_version "=net-libs/xulrunner-1.9.0*"; then + # xulrunner-1.9.0* dir structure is broken + G2CONF="${G2CONF} + --with-gecko-home=/usr/$(get_libdir)/xulrunner-1.9" + elif has_version "=net-libs/xulrunner-1.9.1*"; then + # xulrunner-1.9.1 dir structure is fine, but the build system pukes on + # auto-detect + G2CONF="${G2CONF} --with-gecko-home=$(pkg-config --variable=sdkdir libxul)/bin" + else + die "Unknown xulrunner version, unable to auto-detect gecko-home" + fi # ICC is crazy, silence warnings (bug #154010) if [[ $(tc-getCC) == "icc" ]] ; then |