/[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.66 Revision 1.69
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.66 2006/06/30 16:21:38 spyderous Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/x-modular.eclass,v 1.69 2006/07/01 06:46:52 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.
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 !alpha? ( >=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 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 append-ldflags -Wl,-z,lazy 175 append-ldflags -Wl,-z,lazy
181 # (#116698) breaks loading 176 # (#116698) breaks loading
182 filter-ldflags -Wl,-z,now 177 filter-ldflags -Wl,-z,now
183 fi 178 fi
184} 179}
198 193
199x-modular_server_supports_drivers_check() { 194x-modular_server_supports_drivers_check() {
200 # (#135873) Only certain servers will actually use or be capable of 195 # (#135873) Only certain servers will actually use or be capable of
201 # building external drivers, including binary drivers. 196 # building external drivers, including binary drivers.
202 if [[ -n "${DRIVER}" ]]; then 197 if [[ -n "${DRIVER}" ]]; then
203 if has_version >=x11-base/xorg-server-1.1; then 198 if has_version '>=x11-base/xorg-server-1.1'; then
204 if ! built_with_use x11-base/xorg-server xorg; then 199 if ! built_with_use x11-base/xorg-server xorg; then
205 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."
206 die "You must build x11-base/xorg-server with USE=xorg." 201 die "You must build x11-base/xorg-server with USE=xorg."
207 fi 202 fi
208 fi 203 fi

Legend:
Removed from v.1.66  
changed lines
  Added in v.1.69

  ViewVC Help
Powered by ViewVC 1.1.20