/[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.56 Revision 1.72
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.56 2006/05/14 19:17:09 spyderous Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/x-modular.eclass,v 1.72 2006/07/29 17:42:11 joshuabaergen 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
… …
41IUSE="" 41IUSE=""
42HOMEPAGE="http://xorg.freedesktop.org/" 42HOMEPAGE="http://xorg.freedesktop.org/"
43 43
44# Set up SRC_URI for individual modular releases 44# Set up SRC_URI for individual modular releases
45BASE_INDIVIDUAL_URI="http://xorg.freedesktop.org/releases/individual" 45BASE_INDIVIDUAL_URI="http://xorg.freedesktop.org/releases/individual"
46if [[ ${CATEGORY} = x11-apps ]]; then 46if [[ ${CATEGORY} = x11-apps ]] || [[ ${CATEGORY} = x11-wm ]]; then
47 SRC_URI="${SRC_URI} 47 SRC_URI="${SRC_URI}
48 ${BASE_INDIVIDUAL_URI}/app/${P}.tar.bz2" 48 ${BASE_INDIVIDUAL_URI}/app/${P}.tar.bz2"
49elif [[ ${CATEGORY} = app-doc ]]; then 49elif [[ ${CATEGORY} = app-doc ]]; then
50 SRC_URI="${SRC_URI} 50 SRC_URI="${SRC_URI}
51 ${BASE_INDIVIDUAL_URI}/doc/${P}.tar.bz2" 51 ${BASE_INDIVIDUAL_URI}/doc/${P}.tar.bz2"
… …
68 ${BASE_INDIVIDUAL_URI}/proto/${P}.tar.bz2" 68 ${BASE_INDIVIDUAL_URI}/proto/${P}.tar.bz2"
69elif [[ ${CATEGORY} = x11-base ]]; then 69elif [[ ${CATEGORY} = x11-base ]]; then
70 SRC_URI="${SRC_URI} 70 SRC_URI="${SRC_URI}
71 ${BASE_INDIVIDUAL_URI}/xserver/${P}.tar.bz2" 71 ${BASE_INDIVIDUAL_URI}/xserver/${P}.tar.bz2"
72fi 72fi
73
74# SRC_URI for full releases
75SRC_URI="${SRC_URI}
76 http://xorg.freedesktop.org/releases/X11R7.0/src/everything/${P}.tar.bz2"
77 73
78SLOT="0" 74SLOT="0"
79 75
80# Set the license for the package. This can be overridden by setting 76# Set the license for the package. This can be overridden by setting
81# LICENSE after the inherit. 77# LICENSE after the inherit.
… …
134# If we're a driver package 130# If we're a driver package
135if [[ "${PN/#xf86-video}" != "${PN}" ]] || [[ "${PN/#xf86-input}" != "${PN}" ]]; then 131if [[ "${PN/#xf86-video}" != "${PN}" ]] || [[ "${PN/#xf86-input}" != "${PN}" ]]; then
136 # Enable driver code in the rest of the eclass 132 # Enable driver code in the rest of the eclass
137 DRIVER="yes" 133 DRIVER="yes"
138 134
135 if [[ ${XDPVER} != -1 ]]; then
139 # Add driver patchset to SRC_URI 136 # Add driver patchset to SRC_URI
140 SRC_URI="${SRC_URI} 137 SRC_URI="${SRC_URI}
141 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
142fi 140fi
143 141
144# Debugging -- ignore packages that can't be built with debugging 142# Debugging -- ignore packages that can't be built with debugging
145if [[ -z "${FONT}" ]] \ 143if [[ -z "${FONT}" ]] \
146 || [[ "${PN/app-doc}" != "${PN}" ]] \ 144 || [[ "${PN/app-doc}" != "${PN}" ]] \
… …
163DEPEND="${DEPEND} 161DEPEND="${DEPEND}
164 >=dev-util/pkgconfig-0.18" 162 >=dev-util/pkgconfig-0.18"
165 163
166if [[ "${PN/util-macros}" = "${PN}" ]]; then 164if [[ "${PN/util-macros}" = "${PN}" ]]; then
167 DEPEND="${DEPEND} 165 DEPEND="${DEPEND}
168 >=x11-misc/util-macros-0.99.2" 166 >=x11-misc/util-macros-0.99.2
167 >=sys-devel/binutils-2.16.1-r3"
169fi 168fi
170 169
171# >=sys-apps/man-1.6b-r2 required to look in [0-8]x/ directories
172RDEPEND="${RDEPEND} 170RDEPEND="${RDEPEND}
173 !<=x11-base/xorg-x11-6.9 171 !<=x11-base/xorg-x11-6.9"
174 >=sys-apps/man-1.6b-r2"
175# Provides virtual/x11 for temporary use until packages are ported 172# Provides virtual/x11 for temporary use until packages are ported
176# x11-base/x11-env" 173# x11-base/x11-env"
177 174
178x-modular_specs_check() { 175x-modular_specs_check() {
179 if [[ ${PN:0:11} = "xorg-server" ]] || [[ -n "${DRIVER}" ]]; then 176 if [[ ${PN:0:11} = "xorg-server" ]] || [[ -n "${DRIVER}" ]]; then
180 if gcc-specs-now; then 177 append-ldflags -Wl,-z,lazy
181 msg="${PN} does not work with hardened gcc specs. Switch to vanilla gcc specs to emerge ${PN}."
182 eerror "$msg"
183 die "$msg"
184 fi
185
186 # (#116698) breaks loading 178 # (#116698) breaks loading
187 filter-ldflags -Wl,-z,now 179 filter-ldflags -Wl,-z,now
188 fi 180 fi
189} 181}
190 182
… …
199 fi 191 fi
200 fi 192 fi
201 fi 193 fi
202} 194}
203 195
196x-modular_server_supports_drivers_check() {
197 # (#135873) Only certain servers will actually use or be capable of
198 # building external drivers, including binary drivers.
199 if [[ -n "${DRIVER}" ]]; then
200 if has_version '>=x11-base/xorg-server-1.1'; then
201 if ! built_with_use x11-base/xorg-server xorg; then
202 eerror "x11-base/xorg-server is not built with support for external drivers."
203 die "You must build x11-base/xorg-server with USE=xorg."
204 fi
205 fi
206 fi
207}
208
204x-modular_unpack_source() { 209x-modular_unpack_source() {
205 unpack ${A} 210 unpack ${A}
206 cd ${S} 211 cd ${S}
207 212
208 if [[ -n ${FONT_OPTIONS} ]]; then 213 if [[ -n ${FONT_OPTIONS} ]]; then
… …
219 fi 224 fi
220 225
221 # If this is a driver package we need to fix man page install location. 226 # If this is a driver package we need to fix man page install location.
222 # Running autoreconf will use the patched util-macros to make the 227 # Running autoreconf will use the patched util-macros to make the
223 # change for us, so we only need to patch if it is not going to run. 228 # change for us, so we only need to patch if it is not going to run.
224 if [[ -n "${DRIVER}" ]] && [[ "${SNAPSHOT}" != "yes" ]]; then 229 if [[ -n "${DRIVER}" ]] && [[ "${SNAPSHOT}" != "yes" ]]\
230 && [[ ${XDPVER} != -1 ]]; then
225 PATCHES="${PATCHES} ${DISTDIR}/x11-driver-patches-${XDPVER}.tar.bz2" 231 PATCHES="${PATCHES} ${DISTDIR}/x11-driver-patches-${XDPVER}.tar.bz2"
226 fi 232 fi
227 233
228 # For specific list of patches 234 # For specific list of patches
229 if [[ -n "${PATCHES}" ]] ; then 235 if [[ -n "${PATCHES}" ]] ; then
… …
256 elibtoolize 262 elibtoolize
257} 263}
258 264
259x-modular_src_unpack() { 265x-modular_src_unpack() {
260 x-modular_specs_check 266 x-modular_specs_check
267 x-modular_server_supports_drivers_check
261 x-modular_dri_check 268 x-modular_dri_check
262 x-modular_unpack_source 269 x-modular_unpack_source
263 x-modular_patch_source 270 x-modular_patch_source
264 x-modular_reconf_source 271 x-modular_reconf_source
265} 272}
… …
331# Shouldn't be necessary in XDIR=/usr 338# Shouldn't be necessary in XDIR=/usr
332# einstall forces datadir, so we need to re-force it 339# einstall forces datadir, so we need to re-force it
333# datadir=${XDIR}/share \ 340# datadir=${XDIR}/share \
334# mandir=${XDIR}/share/man \ 341# mandir=${XDIR}/share/man \
335 342
343 if [[ -e ${S}/ChangeLog ]]; then
344 dodoc ${S}/ChangeLog
345 fi
346
336 # Make sure docs get compressed 347 # Make sure docs get compressed
337 prepalldocs 348 prepalldocs
338 349
339 # Don't install libtool archives for server modules 350 # Don't install libtool archives for server modules
340 if [[ -e ${D}/usr/lib/xorg/modules ]]; then 351 if [[ -e ${D}/usr/$(get_libdir)/xorg/modules ]]; then
341 find ${D}/usr/lib/xorg/modules -name '*.la' \ 352 find ${D}/usr/$(get_libdir)/xorg/modules -name '*.la' \
342 | xargs rm -f 353 | xargs rm -f
343 fi 354 fi
344 355
345 # Don't install overlapping fonts.* files 356 # Don't install overlapping fonts.* files
346 # Generate them instead when possible 357 # Generate them instead when possible
Legend:
Removed from v.1.56  
changed lines
  Added in v.1.72
  ViewVC Help
Powered by ViewVC 1.1.13