diff options
| author |   Donnie Berkholz <dberkholz@gentoo.org> | 2006-04-21 06:58:52 +0000 |
|---|---|---|
| committer | Donnie Berkholz <dberkholz@gentoo.org> | 2006-04-21 06:58:52 +0000 |
| commit | e05f3fd2896ce36b6e890f174ea467129a98c688 (patch) | |
| tree | a647b0abb98e5be51d2914e3cb922eb0b18189e0 /eclass/x-modular.eclass | |
| parent | 2.1_pre9-r2 bug fix revbump (diff) | |
| download | historical-e05f3fd2896ce36b6e890f174ea467129a98c688.tar.gz historical-e05f3fd2896ce36b6e890f174ea467129a98c688.tar.bz2 historical-e05f3fd2896ce36b6e890f174ea467129a98c688.zip | |
Move the check for gcc vanilla specs into a separate function, x-modular_specs_check. This makes it easier for ebuilds to modify their src_unpack() and reuse functions from x-modular_src_unpack(). Do the same with elibtoolize, moving it into x-modular_reconf_source().
Diffstat (limited to 'eclass/x-modular.eclass')
| -rw-r--r-- | eclass/x-modular.eclass | 28 |
1 files changed, 15 insertions, 13 deletions
diff --git a/eclass/x-modular.eclass b/eclass/x-modular.eclass index db889e71c707..3a50ba59c47d 100644 --- a/eclass/x-modular.eclass +++ b/eclass/x-modular.eclass @@ -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/eclass/x-modular.eclass,v 1.53 2006/04/20 23:43:48 spyderous Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/x-modular.eclass,v 1.54 2006/04/21 06:58:52 spyderous Exp $ # # Author: Donnie Berkholz <spyderous@gentoo.org> # @@ -175,6 +175,16 @@ RDEPEND="${RDEPEND} # Provides virtual/x11 for temporary use until packages are ported # x11-base/x11-env" +x-modular_specs_check() { + if [[ ${PN:0:11} = "xorg-server" ]] || [[ -n "${DRIVER}" ]]; then + if gcc-specs-now; then + msg="${PN} does not work with hardened gcc specs. Switch to vanilla gcc specs to emerge ${PN}." + eerror "$msg" + die "$msg" + fi + fi +} + x-modular_unpack_source() { # (#120057) Enabling DRI in drivers requires that the server was built with # support for it @@ -236,24 +246,16 @@ x-modular_reconf_source() { fi fi + # Joshua Baergen - October 23, 2005 + # Fix shared lib issues on MIPS, FBSD, etc etc + elibtoolize } x-modular_src_unpack() { - if [[ ${PN:0:11} = "xorg-server" ]] || [[ -n "${DRIVER}" ]]; then - if gcc-specs-now; then - msg="${PN} does not work with hardened gcc specs. Switch to vanilla gcc specs to emerge ${PN}." - eerror "$msg" - die "$msg" - fi - fi - + x-modular_specs_check x-modular_unpack_source x-modular_patch_source x-modular_reconf_source - - # Joshua Baergen - October 23, 2005 - # Fix shared lib issues on MIPS, FBSD, etc etc - elibtoolize } x-modular_font_configure() { |