/[gentoo-x86]/eclass/x-modular.eclass
Gentoo

Diff of /eclass/x-modular.eclass

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

Revision 1.61 Revision 1.71
1# Copyright 1999-2005 Gentoo Foundation 1# Copyright 1999-2005 Gentoo Foundation
2# Distributed under the terms of the GNU General Public License v2 2# Distributed under the terms of the GNU General Public License v2
3# $Header: /var/cvsroot/gentoo-x86/eclass/x-modular.eclass,v 1.61 2006/06/28 02:20:31 joshuabaergen Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/x-modular.eclass,v 1.71 2006/07/04 02:11:26 spyderous Exp $
4# 4#
5# Author: Donnie Berkholz <spyderous@gentoo.org> 5# Author: Donnie Berkholz <spyderous@gentoo.org>
6# 6#
7# This eclass is designed to reduce code duplication in the modularized X11 7# This eclass is designed to reduce code duplication in the modularized X11
8# ebuilds. 8# ebuilds.
25# 25#
26# Pretty much everything else should be automatic. 26# Pretty much everything else should be automatic.
27 27
28EXPORT_FUNCTIONS src_unpack src_compile src_install pkg_preinst pkg_postinst pkg_postrm 28EXPORT_FUNCTIONS src_unpack src_compile src_install pkg_preinst pkg_postinst pkg_postrm
29 29
30inherit eutils libtool toolchain-funcs flag-o-matic autotools 30inherit eutils libtool multilib toolchain-funcs flag-o-matic autotools
31 31
32# Directory prefix to use for everything 32# Directory prefix to use for everything
33XDIR="/usr" 33XDIR="/usr"
34 34
35# Set up default patchset version(s) if necessary 35# Set up default patchset version(s) if necessary
159DEPEND="${DEPEND} 159DEPEND="${DEPEND}
160 >=dev-util/pkgconfig-0.18" 160 >=dev-util/pkgconfig-0.18"
161 161
162if [[ "${PN/util-macros}" = "${PN}" ]]; then 162if [[ "${PN/util-macros}" = "${PN}" ]]; then
163 DEPEND="${DEPEND} 163 DEPEND="${DEPEND}
164 >=x11-misc/util-macros-0.99.2" 164 >=x11-misc/util-macros-0.99.2
165 >=sys-devel/binutils-2.16.1-r3"
165fi 166fi
166 167
167RDEPEND="${RDEPEND} 168RDEPEND="${RDEPEND}
168 !<=x11-base/xorg-x11-6.9" 169 !<=x11-base/xorg-x11-6.9"
169# Provides virtual/x11 for temporary use until packages are ported 170# Provides virtual/x11 for temporary use until packages are ported
170# x11-base/x11-env" 171# x11-base/x11-env"
171 172
172x-modular_specs_check() { 173x-modular_specs_check() {
173 if [[ ${PN:0:11} = "xorg-server" ]] || [[ -n "${DRIVER}" ]]; then 174 if [[ ${PN:0:11} = "xorg-server" ]] || [[ -n "${DRIVER}" ]]; then
174 if gcc-specs-now; then 175 append-ldflags -Wl,-z,lazy
175 msg="${PN} does not work with hardened gcc specs. Switch to vanilla gcc specs to emerge ${PN}."
176 eerror "$msg"
177 die "$msg"
178 fi
179
180 # (#116698) breaks loading 176 # (#116698) breaks loading
181 filter-ldflags -Wl,-z,now 177 filter-ldflags -Wl,-z,now
182 fi 178 fi
183} 179}
184 180
197 193
198x-modular_server_supports_drivers_check() { 194x-modular_server_supports_drivers_check() {
199 # (#135873) Only certain servers will actually use or be capable of 195 # (#135873) Only certain servers will actually use or be capable of
200 # building external drivers, including binary drivers. 196 # building external drivers, including binary drivers.
201 if [[ -n "${DRIVER}" ]]; then 197 if [[ -n "${DRIVER}" ]]; then
198 if has_version '>=x11-base/xorg-server-1.1'; then
202 if ! built_with_use x11-base/xorg-server xorg; then 199 if ! built_with_use x11-base/xorg-server xorg; then
203 eerror "x11-base/xorg-server is not built with support for external drivers." 200 eerror "x11-base/xorg-server is not built with support for external drivers."
204 die "You must build x11-base/xorg-server with USE=xorg." 201 die "You must build x11-base/xorg-server with USE=xorg."
202 fi
205 fi 203 fi
206 fi 204 fi
207} 205}
208 206
209x-modular_unpack_source() { 207x-modular_unpack_source() {
345 343
346 # Make sure docs get compressed 344 # Make sure docs get compressed
347 prepalldocs 345 prepalldocs
348 346
349 # Don't install libtool archives for server modules 347 # Don't install libtool archives for server modules
350 if [[ -e ${D}/usr/lib/xorg/modules ]]; then 348 if [[ -e ${D}/usr/$(get_libdir)/xorg/modules ]]; then
351 find ${D}/usr/lib/xorg/modules -name '*.la' \ 349 find ${D}/usr/$(get_libdir)/xorg/modules -name '*.la' \
352 | xargs rm -f 350 | xargs rm -f
353 fi 351 fi
354 352
355 # Don't install overlapping fonts.* files 353 # Don't install overlapping fonts.* files
356 # Generate them instead when possible 354 # Generate them instead when possible

Legend:
Removed from v.1.61  
changed lines
  Added in v.1.71

  ViewVC Help
Powered by ViewVC 1.1.20