/[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.60 Revision 1.73
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.60 2006/05/23 17:50:30 spyderous Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/x-modular.eclass,v 1.73 2006/08/21 00:22:52 dberkholz 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
… …
130# If we're a driver package 130# If we're a driver package
131if [[ "${PN/#xf86-video}" != "${PN}" ]] || [[ "${PN/#xf86-input}" != "${PN}" ]]; then 131if [[ "${PN/#xf86-video}" != "${PN}" ]] || [[ "${PN/#xf86-input}" != "${PN}" ]]; then
132 # Enable driver code in the rest of the eclass 132 # Enable driver code in the rest of the eclass
133 DRIVER="yes" 133 DRIVER="yes"
134 134
135 if [[ ${XDPVER} != -1 ]]; then
135 # Add driver patchset to SRC_URI 136 # Add driver patchset to SRC_URI
136 SRC_URI="${SRC_URI} 137 SRC_URI="${SRC_URI}
137 http://dev.gentoo.org/~joshuabaergen/distfiles/x11-driver-patches-${XDPVER}.tar.bz2" 138 http://dev.gentoo.org/~joshuabaergen/distfiles/x11-driver-patches-${XDPVER}.tar.bz2"
139 fi
138fi 140fi
139 141
140# Debugging -- ignore packages that can't be built with debugging 142# Debugging -- ignore packages that can't be built with debugging
141if [[ -z "${FONT}" ]] \ 143if [[ -z "${FONT}" ]] \
142 || [[ "${PN/app-doc}" != "${PN}" ]] \ 144 || [[ "${PN/app-doc}" != "${PN}" ]] \
… …
159DEPEND="${DEPEND} 161DEPEND="${DEPEND}
160 >=dev-util/pkgconfig-0.18" 162 >=dev-util/pkgconfig-0.18"
161 163
162if [[ "${PN/util-macros}" = "${PN}" ]]; then 164if [[ "${PN/util-macros}" = "${PN}" ]]; then
163 DEPEND="${DEPEND} 165 DEPEND="${DEPEND}
164 >=x11-misc/util-macros-0.99.2" 166 >=x11-misc/util-macros-0.99.2
167 >=sys-devel/binutils-2.16.1-r3"
165fi 168fi
166 169
167RDEPEND="${RDEPEND} 170RDEPEND="${RDEPEND}
171 >=sys-apps/man-1.6b-r2
168 !<=x11-base/xorg-x11-6.9" 172 !<=x11-base/xorg-x11-6.9"
169# Provides virtual/x11 for temporary use until packages are ported 173# Provides virtual/x11 for temporary use until packages are ported
170# x11-base/x11-env" 174# x11-base/x11-env"
171 175
172x-modular_specs_check() { 176x-modular_specs_check() {
173 if [[ ${PN:0:11} = "xorg-server" ]] || [[ -n "${DRIVER}" ]]; then 177 if [[ ${PN:0:11} = "xorg-server" ]] || [[ -n "${DRIVER}" ]]; then
174 if gcc-specs-now; then 178 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 179 # (#116698) breaks loading
181 filter-ldflags -Wl,-z,now 180 filter-ldflags -Wl,-z,now
182 fi 181 fi
183} 182}
184 183
… …
193 fi 192 fi
194 fi 193 fi
195 fi 194 fi
196} 195}
197 196
197x-modular_server_supports_drivers_check() {
198 # (#135873) Only certain servers will actually use or be capable of
199 # building external drivers, including binary drivers.
200 if [[ -n "${DRIVER}" ]]; then
201 if has_version '>=x11-base/xorg-server-1.1'; then
202 if ! built_with_use x11-base/xorg-server xorg; then
203 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."
205 fi
206 fi
207 fi
208}
209
198x-modular_unpack_source() { 210x-modular_unpack_source() {
199 unpack ${A} 211 unpack ${A}
200 cd ${S} 212 cd ${S}
201 213
202 if [[ -n ${FONT_OPTIONS} ]]; then 214 if [[ -n ${FONT_OPTIONS} ]]; then
… …
213 fi 225 fi
214 226
215 # If this is a driver package we need to fix man page install location. 227 # If this is a driver package we need to fix man page install location.
216 # Running autoreconf will use the patched util-macros to make the 228 # Running autoreconf will use the patched util-macros to make the
217 # change for us, so we only need to patch if it is not going to run. 229 # change for us, so we only need to patch if it is not going to run.
218 if [[ -n "${DRIVER}" ]] && [[ "${SNAPSHOT}" != "yes" ]]; then 230 if [[ -n "${DRIVER}" ]] && [[ "${SNAPSHOT}" != "yes" ]]\
231 && [[ ${XDPVER} != -1 ]]; then
219 PATCHES="${PATCHES} ${DISTDIR}/x11-driver-patches-${XDPVER}.tar.bz2" 232 PATCHES="${PATCHES} ${DISTDIR}/x11-driver-patches-${XDPVER}.tar.bz2"
220 fi 233 fi
221 234
222 # For specific list of patches 235 # For specific list of patches
223 if [[ -n "${PATCHES}" ]] ; then 236 if [[ -n "${PATCHES}" ]] ; then
… …
250 elibtoolize 263 elibtoolize
251} 264}
252 265
253x-modular_src_unpack() { 266x-modular_src_unpack() {
254 x-modular_specs_check 267 x-modular_specs_check
268 x-modular_server_supports_drivers_check
255 x-modular_dri_check 269 x-modular_dri_check
256 x-modular_unpack_source 270 x-modular_unpack_source
257 x-modular_patch_source 271 x-modular_patch_source
258 x-modular_reconf_source 272 x-modular_reconf_source
259} 273}
… …
333 347
334 # Make sure docs get compressed 348 # Make sure docs get compressed
335 prepalldocs 349 prepalldocs
336 350
337 # Don't install libtool archives for server modules 351 # Don't install libtool archives for server modules
338 if [[ -e ${D}/usr/lib/xorg/modules ]]; then 352 if [[ -e ${D}/usr/$(get_libdir)/xorg/modules ]]; then
339 find ${D}/usr/lib/xorg/modules -name '*.la' \ 353 find ${D}/usr/$(get_libdir)/xorg/modules -name '*.la' \
340 | xargs rm -f 354 | xargs rm -f
341 fi 355 fi
342 356
343 # Don't install overlapping fonts.* files 357 # Don't install overlapping fonts.* files
344 # Generate them instead when possible 358 # Generate them instead when possible
Legend:
Removed from v.1.60  
changed lines
  Added in v.1.73
  ViewVC Help
Powered by ViewVC 1.1.20