/[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.65 Revision 1.76
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.65 2006/06/30 07:55:53 spyderous Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/x-modular.eclass,v 1.76 2006/10/11 02:31:47 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 >=sys-apps/man-db-2.4.3-r1 )
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
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 178 append-ldflags -Wl,-z,lazy
181 # (#116698) breaks loading 179 # (#116698) breaks loading
182 filter-ldflags -Wl,-z,now 180 filter-ldflags -Wl,-z,now
183 fi 181 fi
184} 182}
… …
198 196
199x-modular_server_supports_drivers_check() { 197x-modular_server_supports_drivers_check() {
200 # (#135873) Only certain servers will actually use or be capable of 198 # (#135873) Only certain servers will actually use or be capable of
201 # building external drivers, including binary drivers. 199 # building external drivers, including binary drivers.
202 if [[ -n "${DRIVER}" ]]; then 200 if [[ -n "${DRIVER}" ]]; then
201 if has_version '>=x11-base/xorg-server-1.1'; then
203 if ! built_with_use x11-base/xorg-server xorg; then 202 if ! built_with_use x11-base/xorg-server xorg; then
204 eerror "x11-base/xorg-server is not built with support for external drivers." 203 eerror "x11-base/xorg-server is not built with support for external drivers."
205 die "You must build x11-base/xorg-server with USE=xorg." 204 die "You must build x11-base/xorg-server with USE=xorg."
205 fi
206 fi 206 fi
207 fi 207 fi
208} 208}
209 209
210x-modular_unpack_source() { 210x-modular_unpack_source() {
… …
225 fi 225 fi
226 226
227 # 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.
228 # Running autoreconf will use the patched util-macros to make the 228 # Running autoreconf will use the patched util-macros to make the
229 # 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.
230 if [[ -n "${DRIVER}" ]] && [[ "${SNAPSHOT}" != "yes" ]]; then 230 if [[ -n "${DRIVER}" ]] && [[ "${SNAPSHOT}" != "yes" ]]\
231 && [[ ${XDPVER} != -1 ]]; then
231 PATCHES="${PATCHES} ${DISTDIR}/x11-driver-patches-${XDPVER}.tar.bz2" 232 PATCHES="${PATCHES} ${DISTDIR}/x11-driver-patches-${XDPVER}.tar.bz2"
232 fi 233 fi
233 234
234 # For specific list of patches 235 # For specific list of patches
235 if [[ -n "${PATCHES}" ]] ; then 236 if [[ -n "${PATCHES}" ]] ; then
… …
249x-modular_reconf_source() { 250x-modular_reconf_source() {
250 # Run autoreconf for CVS snapshots only 251 # Run autoreconf for CVS snapshots only
251 if [[ "${SNAPSHOT}" = "yes" ]] 252 if [[ "${SNAPSHOT}" = "yes" ]]
252 then 253 then
253 # If possible, generate configure if it doesn't exist 254 # If possible, generate configure if it doesn't exist
254 if [ -f "${S}/configure.ac" ] 255 if [ -f "./configure.ac" ]
255 then 256 then
256 eautoreconf 257 eautoreconf
257 fi 258 fi
258 fi 259 fi
259 260
… …
346 347
347 # Make sure docs get compressed 348 # Make sure docs get compressed
348 prepalldocs 349 prepalldocs
349 350
350 # Don't install libtool archives for server modules 351 # Don't install libtool archives for server modules
351 if [[ -e ${D}/usr/lib/xorg/modules ]]; then 352 if [[ -e ${D}/usr/$(get_libdir)/xorg/modules ]]; then
352 find ${D}/usr/lib/xorg/modules -name '*.la' \ 353 find ${D}/usr/$(get_libdir)/xorg/modules -name '*.la' \
353 | xargs rm -f 354 | xargs rm -f
354 fi 355 fi
355 356
356 # Don't install overlapping fonts.* files 357 # Don't install overlapping fonts.* files
357 # Generate them instead when possible 358 # Generate them instead when possible
358 if [[ -n "${FONT}" ]]; then 359 if [[ -n "${FONT}" ]]; then
359 remove_font_metadata 360 remove_font_metadata
361 fi
362
363 if [[ -n "${DRIVER}" ]]; then
364 install_driver_hwdata
360 fi 365 fi
361} 366}
362 367
363x-modular_pkg_preinst() { 368x-modular_pkg_preinst() {
364 if [[ -n "${FONT}" ]]; then 369 if [[ -n "${FONT}" ]]; then
… …
432 if [[ "${DIR}" != "Speedo" ]] && \ 437 if [[ "${DIR}" != "Speedo" ]] && \
433 [[ "${DIR}" != "CID" ]] ; then 438 [[ "${DIR}" != "CID" ]] ; then
434 # Delete font metadata files 439 # Delete font metadata files
435 # fonts.scale, fonts.dir, fonts.cache-1 440 # fonts.scale, fonts.dir, fonts.cache-1
436 rm -f ${D}/usr/share/fonts/${DIR}/fonts.{scale,dir,cache-1} 441 rm -f ${D}/usr/share/fonts/${DIR}/fonts.{scale,dir,cache-1}
442 fi
443 done
444}
445
446# Installs device-to-driver mappings for system-config-display
447# and anything else that uses hwdata
448install_driver_hwdata() {
449 insinto /usr/share/hwdata/videoaliases
450 for i in "${FILESDIR}"/*.xinf; do
451 # We need this for the case when none exist,
452 # so *.xinf doesn't expand
453 if [[ -e $i ]]; then
454 doins $i
437 fi 455 fi
438 done 456 done
439} 457}
440 458
441discover_font_dirs() { 459discover_font_dirs() {
Legend:
Removed from v.1.65  
changed lines
  Added in v.1.76
  ViewVC Help
Powered by ViewVC 1.1.20