/[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.26 Revision 1.62
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.26 2005/12/07 22:10:45 joshuabaergen Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/x-modular.eclass,v 1.62 2006/06/30 03:37:53 solar 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.
9# 9#
10# If the ebuild installs fonts, set FONT="yes" at the top and set FONT_DIRS to 10# Using this eclass:
11# the subdirectories within /usr/share/fonts to which it installs fonts. 11#
12# Inherit it. If you need to run autoreconf for any reason (e.g., your patches
13# apply to the autotools files rather than configure), set SNAPSHOT="yes". Set
14# CONFIGURE_OPTIONS to everything you want to pass to the configure script.
15#
16# If you have any patches to apply, set PATCHES to their locations and epatch
17# will apply them. It also handles epatch-style bulk patches, if you know how to
18# use them and set the correct variables. If you don't, read eutils.eclass.
19#
20# If you're creating a font package and the suffix of PN is not equal to the
21# subdirectory of /usr/share/fonts/ it should install into, set FONT_DIR to that
22# directory or directories.
23#
24# IMPORTANT: Both SNAPSHOT and FONT_DIR must be set _before_ the inherit.
25#
26# Pretty much everything else should be automatic.
12 27
13EXPORT_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
14 29
15inherit eutils libtool toolchain-funcs 30inherit eutils libtool toolchain-funcs flag-o-matic autotools
16 31
17# Directory prefix to use for everything 32# Directory prefix to use for everything
18XDIR="/usr" 33XDIR="/usr"
19 34
35# Set up default patchset version(s) if necessary
36# x11-driver-patches
37if [[ -z "${XDPVER}" ]]; then
38 XDPVER="1"
39fi
40
20IUSE="" 41IUSE=""
21HOMEPAGE="http://xorg.freedesktop.org/" 42HOMEPAGE="http://xorg.freedesktop.org/"
22SRC_URI="http://xorg.freedesktop.org/releases/X11R7.0-RC3/everything/${P}.tar.bz2 43
23 http://xorg.freedesktop.org/releases/X11R7.0-RC2/everything/${P}.tar.bz2 44# Set up SRC_URI for individual modular releases
24 http://xorg.freedesktop.org/releases/X11R7.0-RC1/everything/${P}.tar.bz2 45BASE_INDIVIDUAL_URI="http://xorg.freedesktop.org/releases/individual"
25 http://xorg.freedesktop.org/releases/X11R7.0-RC0/everything/${P}.tar.bz2" 46if [[ ${CATEGORY} = x11-apps ]] || [[ ${CATEGORY} = x11-wm ]]; then
26LICENSE="X11" 47 SRC_URI="${SRC_URI}
48 ${BASE_INDIVIDUAL_URI}/app/${P}.tar.bz2"
49elif [[ ${CATEGORY} = app-doc ]]; then
50 SRC_URI="${SRC_URI}
51 ${BASE_INDIVIDUAL_URI}/doc/${P}.tar.bz2"
52# x11-misc contains data and util, x11-themes contains data
53elif [[ ${CATEGORY} = x11-misc ]] || [[ ${CATEGORY} = x11-themes ]]; then
54 SRC_URI="${SRC_URI}
55 ${BASE_INDIVIDUAL_URI}/data/${P}.tar.bz2
56 ${BASE_INDIVIDUAL_URI}/util/${P}.tar.bz2"
57elif [[ ${CATEGORY} = x11-drivers ]]; then
58 SRC_URI="${SRC_URI}
59 ${BASE_INDIVIDUAL_URI}/driver/${P}.tar.bz2"
60elif [[ ${CATEGORY} = media-fonts ]]; then
61 SRC_URI="${SRC_URI}
62 ${BASE_INDIVIDUAL_URI}/font/${P}.tar.bz2"
63elif [[ ${CATEGORY} = x11-libs ]]; then
64 SRC_URI="${SRC_URI}
65 ${BASE_INDIVIDUAL_URI}/lib/${P}.tar.bz2"
66elif [[ ${CATEGORY} = x11-proto ]]; then
67 SRC_URI="${SRC_URI}
68 ${BASE_INDIVIDUAL_URI}/proto/${P}.tar.bz2"
69elif [[ ${CATEGORY} = x11-base ]]; then
70 SRC_URI="${SRC_URI}
71 ${BASE_INDIVIDUAL_URI}/xserver/${P}.tar.bz2"
72fi
73
27SLOT="0" 74SLOT="0"
28 75
76# Set the license for the package. This can be overridden by setting
77# LICENSE after the inherit.
78LICENSE=${PN}
79
29# Set up shared dependencies 80# Set up shared dependencies
30if [ -n "${SNAPSHOT}" ]; then 81if [[ -n "${SNAPSHOT}" ]]; then
31# FIXME: What's the minimal libtool version supporting arbitrary versioning? 82# FIXME: What's the minimal libtool version supporting arbitrary versioning?
32 DEPEND="${DEPEND} 83 DEPEND="${DEPEND}
33 >=sys-devel/autoconf-2.57 84 >=sys-devel/autoconf-2.57
34 >=sys-devel/automake-1.7 85 >=sys-devel/automake-1.7
35 >=sys-devel/libtool-1.5 86 >=sys-devel/libtool-1.5
36 >=sys-devel/m4-1.4" 87 >=sys-devel/m4-1.4"
37fi 88fi
38 89
39# If we're a font package, but not the font.alias one 90# If we're a font package, but not the font.alias one
40if [[ "${PN/#font-}" != "${PN}" ]] \ 91if [[ "${PN/#font-}" != "${PN}" ]] \
92 && [[ "${CATEGORY}" = "media-fonts" ]] \
41 && [[ "${PN}" != "font-alias" ]] \ 93 && [[ "${PN}" != "font-alias" ]] \
42 && [[ "${PN}" != "font-util" ]]; then 94 && [[ "${PN}" != "font-util" ]]; then
43 # Activate font code in the rest of the eclass 95 # Activate font code in the rest of the eclass
44 FONT="yes" 96 FONT="yes"
45 97
46 RDEPEND="${RDEPEND} 98 RDEPEND="${RDEPEND}
47 media-fonts/encodings" 99 media-fonts/encodings
100 x11-apps/mkfontscale
101 x11-apps/mkfontdir"
48 PDEPEND="${PDEPEND} 102 PDEPEND="${PDEPEND}
49 media-fonts/font-alias" 103 media-fonts/font-alias"
50 104
51 # Starting with 7.0RC3, we can specify the font directory 105 # Starting with 7.0RC3, we can specify the font directory
52 # But oddly, we can't do the same for encodings or font-alias 106 # But oddly, we can't do the same for encodings or font-alias
… …
73 fi 127 fi
74fi 128fi
75 129
76# If we're a driver package 130# If we're a driver package
77if [[ "${PN/#xf86-video}" != "${PN}" ]] || [[ "${PN/#xf86-input}" != "${PN}" ]]; then 131if [[ "${PN/#xf86-video}" != "${PN}" ]] || [[ "${PN/#xf86-input}" != "${PN}" ]]; then
78 # Don't build static driver modules 132 # Enable driver code in the rest of the eclass
79 DRIVER_OPTIONS="--disable-static" 133 DRIVER="yes"
134
135 # Add driver patchset to SRC_URI
136 SRC_URI="${SRC_URI}
137 http://dev.gentoo.org/~joshuabaergen/distfiles/x11-driver-patches-${XDPVER}.tar.bz2"
138fi
139
140# Debugging -- ignore packages that can't be built with debugging
141if [[ -z "${FONT}" ]] \
142 || [[ "${PN/app-doc}" != "${PN}" ]] \
143 || [[ "${PN/x11-proto}" != "${PN}" ]] \
144 || [[ "${PN/util-macros}" != "${PN}" ]] \
145 || [[ "${PN/xbitmaps}" != "${PN}" ]] \
146 || [[ "${PN/xkbdata}" != "${PN}" ]] \
147 || [[ "${PN/xorg-cf-files}" != "${PN}" ]] \
148 || [[ "${PN/xcursor}" != "${PN}" ]] \
149 ; then
150 DEBUGGABLE="yes"
151 IUSE="${IUSE} debug"
152 if use debug; then
153 if ! has splitdebug ${FEATURES}; then
154 RESTRICT="${RESTRICT} nostrip"
155 fi
156 fi
80fi 157fi
81 158
82DEPEND="${DEPEND} 159DEPEND="${DEPEND}
83 >=dev-util/pkgconfig-0.18 160 >=dev-util/pkgconfig-0.18"
161
162if [[ "${PN/util-macros}" = "${PN}" ]]; then
163 DEPEND="${DEPEND}
84 >=x11-misc/util-macros-0.99.2" 164 >=x11-misc/util-macros-0.99.2"
165fi
85 166
86# >=sys-apps/man-1.6b-r2 required to look in [0-8]x/ directories
87RDEPEND="${RDEPEND} 167RDEPEND="${RDEPEND}
88 !<=x11-base/xorg-x11-6.9 168 !<=x11-base/xorg-x11-6.9"
89 >=sys-apps/man-1.6b-r2"
90# Provides virtual/x11 for temporary use until packages are ported 169# Provides virtual/x11 for temporary use until packages are ported
91# x11-base/x11-env" 170# x11-base/x11-env"
171
172x-modular_specs_check() {
173 if [[ ${PN:0:11} = "xorg-server" ]] || [[ -n "${DRIVER}" ]]; then
174 append-ldflags -Wl,-z,lazy
175 # (#116698) breaks loading
176 filter-ldflags -Wl,-z,now
177 fi
178}
179
180x-modular_dri_check() {
181 # (#120057) Enabling DRI in drivers requires that the server was built with
182 # support for it
183 if [[ -n "${DRIVER}" ]]; then
184 if has dri ${IUSE} && use dri; then
185 einfo "Checking for direct rendering capabilities ..."
186 if ! built_with_use x11-base/xorg-server dri; then
187 die "You must build x11-base/xorg-server with USE=dri."
188 fi
189 fi
190 fi
191}
192
193x-modular_server_supports_drivers_check() {
194 # (#135873) Only certain servers will actually use or be capable of
195 # building external drivers, including binary drivers.
196 if [[ -n "${DRIVER}" ]]; then
197 if ! built_with_use x11-base/xorg-server xorg; then
198 eerror "x11-base/xorg-server is not built with support for external drivers."
199 die "You must build x11-base/xorg-server with USE=xorg."
200 fi
201 fi
202}
92 203
93x-modular_unpack_source() { 204x-modular_unpack_source() {
94 unpack ${A} 205 unpack ${A}
95 cd ${S} 206 cd ${S}
96
97 # Joshua Baergen - October 23, 2005
98 # Fix shared lib issues on MIPS, FBSD, etc etc
99 elibtoolize
100 207
101 if [[ -n ${FONT_OPTIONS} ]]; then 208 if [[ -n ${FONT_OPTIONS} ]]; then
102 einfo "Detected font directory: ${FONT_DIR}" 209 einfo "Detected font directory: ${FONT_DIR}"
103 fi 210 fi
104} 211}
105 212
106x-modular_patch_source() { 213x-modular_patch_source() {
107 # Use standardized names and locations with bulk patching 214 # Use standardized names and locations with bulk patching
108 # Patch directory is ${WORKDIR}/patch 215 # Patch directory is ${WORKDIR}/patch
109 # See epatch() in eutils.eclass for more documentation 216 # See epatch() in eutils.eclass for more documentation
110 if [ -z "${EPATCH_SUFFIX}" ] ; then 217 if [[ -z "${EPATCH_SUFFIX}" ]] ; then
111 EPATCH_SUFFIX="patch" 218 EPATCH_SUFFIX="patch"
112 fi 219 fi
113 220
221 # 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
223 # change for us, so we only need to patch if it is not going to run.
224 if [[ -n "${DRIVER}" ]] && [[ "${SNAPSHOT}" != "yes" ]]; then
225 PATCHES="${PATCHES} ${DISTDIR}/x11-driver-patches-${XDPVER}.tar.bz2"
226 fi
227
114 # For specific list of patches 228 # For specific list of patches
115 if [ -n "${PATCHES}" ] ; then 229 if [[ -n "${PATCHES}" ]] ; then
116 for PATCH in ${PATCHES} 230 for PATCH in ${PATCHES}
117 do 231 do
118 epatch ${PATCH} 232 epatch ${PATCH}
119 done 233 done
120 # For non-default directory bulk patching 234 # For non-default directory bulk patching
121 elif [ -n "${PATCH_LOC}" ] ; then 235 elif [[ -n "${PATCH_LOC}" ]] ; then
122 epatch ${PATCH_LOC} 236 epatch ${PATCH_LOC}
123 # For standard bulk patching 237 # For standard bulk patching
124 elif [ -d "${EPATCH_SOURCE}" ] ; then 238 elif [[ -d "${EPATCH_SOURCE}" ]] ; then
125 epatch 239 epatch
126 fi 240 fi
127} 241}
128 242
129x-modular_reconf_source() { 243x-modular_reconf_source() {
130 # Run autoreconf for CVS snapshots only 244 # Run autoreconf for CVS snapshots only
131 if [ "${SNAPSHOT}" = "yes" ] 245 if [[ "${SNAPSHOT}" = "yes" ]]
132 then 246 then
133 # If possible, generate configure if it doesn't exist 247 # If possible, generate configure if it doesn't exist
134 if [ -f "${S}/configure.ac" ] 248 if [ -f "${S}/configure.ac" ]
135 then 249 then
136 einfo "Running autoreconf..." 250 eautoreconf
137 autoreconf -v --force --install
138 fi
139 fi 251 fi
252 fi
140 253
254 # Joshua Baergen - October 23, 2005
255 # Fix shared lib issues on MIPS, FBSD, etc etc
256 elibtoolize
141} 257}
142 258
143x-modular_src_unpack() { 259x-modular_src_unpack() {
144 for x in xorg-server xf86-video- xf86-input- ; do 260 x-modular_specs_check
145 if [[ ${PN:0:11} = $x ]] && gcc-specs-now; then 261 x-modular_server_supports_drivers_check
146 msg="Do not emerge ${PN} without vanilla gcc!" 262 x-modular_dri_check
147 eerror "$msg"
148 die "$msg"
149 fi
150 done
151
152 x-modular_unpack_source 263 x-modular_unpack_source
153 x-modular_patch_source 264 x-modular_patch_source
154 x-modular_reconf_source 265 x-modular_reconf_source
155} 266}
156 267
… …
179 --disable-koi8-r" 290 --disable-koi8-r"
180 fi 291 fi
181 fi 292 fi
182} 293}
183 294
295x-modular_debug_setup() {
296 if [[ -n "${DEBUGGABLE}" ]]; then
297 if use debug; then
298 strip-flags
299 append-flags -g
300 fi
301 fi
302}
303
184x-modular_src_configure() { 304x-modular_src_configure() {
185 x-modular_font_configure 305 x-modular_font_configure
306 x-modular_debug_setup
186 307
187 # If prefix isn't set here, .pc files cause problems 308 # If prefix isn't set here, .pc files cause problems
188 if [ -x ./configure ]; then 309 if [[ -x ./configure ]]; then
189 econf --prefix=${XDIR} \ 310 econf --prefix=${XDIR} \
190 --datadir=${XDIR}/share \ 311 --datadir=${XDIR}/share \
191 ${FONT_OPTIONS} \ 312 ${FONT_OPTIONS} \
192 ${DRIVER_OPTIONS} \ 313 ${DRIVER_OPTIONS} \
193 ${CONFIGURE_OPTIONS} 314 ${CONFIGURE_OPTIONS}
… …
211# Shouldn't be necessary in XDIR=/usr 332# Shouldn't be necessary in XDIR=/usr
212# einstall forces datadir, so we need to re-force it 333# einstall forces datadir, so we need to re-force it
213# datadir=${XDIR}/share \ 334# datadir=${XDIR}/share \
214# mandir=${XDIR}/share/man \ 335# mandir=${XDIR}/share/man \
215 336
337 if [[ -e ${S}/ChangeLog ]]; then
338 dodoc ${S}/ChangeLog
339 fi
340
341 # Make sure docs get compressed
342 prepalldocs
343
216 # Don't install libtool archives for server modules 344 # Don't install libtool archives for server modules
217 if [[ -e ${D}/usr/lib/xorg/modules ]]; then 345 if [[ -e ${D}/usr/lib/xorg/modules ]]; then
218 find ${D}/usr/lib/xorg/modules -name '*.la' \ 346 find ${D}/usr/lib/xorg/modules -name '*.la' \
219 | xargs rm -f 347 | xargs rm -f
348 fi
349
350 # Don't install overlapping fonts.* files
351 # Generate them instead when possible
352 if [[ -n "${FONT}" ]]; then
353 remove_font_metadata
220 fi 354 fi
221} 355}
222 356
223x-modular_pkg_preinst() { 357x-modular_pkg_preinst() {
224 if [[ -n "${FONT}" ]]; then 358 if [[ -n "${FONT}" ]]; then
… …
284 create_fonts_dir 418 create_fonts_dir
285 fix_font_permissions 419 fix_font_permissions
286 create_font_cache 420 create_font_cache
287} 421}
288 422
423remove_font_metadata() {
424 local DIR
425 for DIR in ${FONT_DIR}; do
426 if [[ "${DIR}" != "Speedo" ]] && \
427 [[ "${DIR}" != "CID" ]] ; then
428 # Delete font metadata files
429 # fonts.scale, fonts.dir, fonts.cache-1
430 rm -f ${D}/usr/share/fonts/${DIR}/fonts.{scale,dir,cache-1}
431 fi
432 done
433}
434
289discover_font_dirs() { 435discover_font_dirs() {
290 pushd ${IMAGE}/usr/share/fonts 436 pushd ${IMAGE}/usr/share/fonts
291 FONT_DIRS="$(find . -maxdepth 1 -mindepth 1 -type d)" 437 FONT_DIRS="$(find . -maxdepth 1 -mindepth 1 -type d)"
292 FONT_DIRS="$(echo ${FONT_DIRS} | sed -e 's:./::g')" 438 FONT_DIRS="$(echo ${FONT_DIRS} | sed -e 's:./::g')"
293 popd 439 popd
… …
296create_fonts_scale() { 442create_fonts_scale() {
297 ebegin "Creating fonts.scale files" 443 ebegin "Creating fonts.scale files"
298 local x 444 local x
299 for FONT_DIR in ${FONT_DIRS}; do 445 for FONT_DIR in ${FONT_DIRS}; do
300 x=${ROOT}/usr/share/fonts/${FONT_DIR} 446 x=${ROOT}/usr/share/fonts/${FONT_DIR}
301 [ -z "$(ls ${x}/)" ] && continue 447 [[ -z "$(ls ${x}/)" ]] && continue
302 [ "$(ls ${x}/)" = "fonts.cache-1" ] && continue 448 [[ "$(ls ${x}/)" = "fonts.cache-1" ]] && continue
303 449
304 # Only generate .scale files if truetype, opentype or type1 450 # Only generate .scale files if truetype, opentype or type1
305 # fonts are present ... 451 # fonts are present ...
306 452
307 # First truetype (ttf,ttc) 453 # First truetype (ttf,ttc)
308 # NOTE: ttmkfdir does NOT work on type1 fonts (#53753) 454 # NOTE: ttmkfdir does NOT work on type1 fonts (#53753)
309 # Also, there is no way to regenerate Speedo/CID fonts.scale 455 # Also, there is no way to regenerate Speedo/CID fonts.scale
310 # <spyderous@gentoo.org> 2 August 2004 456 # <spyderous@gentoo.org> 2 August 2004
311 if [ "${x/encodings}" = "${x}" -a \ 457 if [[ "${x/encodings}" = "${x}" ]] \
312 -n "$(find ${x} -iname '*.tt[cf]' -print)" ]; then 458 && [[ -n "$(find ${x} -iname '*.tt[cf]' -print)" ]]; then
313 if [ -x ${ROOT}/usr/bin/ttmkfdir ]; then 459 if [[ -x ${ROOT}/usr/bin/ttmkfdir ]]; then
314 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \ 460 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \
315 ${ROOT}/usr/bin/ttmkfdir -x 2 \ 461 ${ROOT}/usr/bin/ttmkfdir -x 2 \
316 -e ${ROOT}/usr/share/fonts/encodings/encodings.dir \ 462 -e ${ROOT}/usr/share/fonts/encodings/encodings.dir \
317 -o ${x}/fonts.scale -d ${x} 463 -o ${x}/fonts.scale -d ${x}
318 # ttmkfdir fails on some stuff, so try mkfontscale if it does 464 # ttmkfdir fails on some stuff, so try mkfontscale if it does
319 local ttmkfdir_return=$? 465 local ttmkfdir_return=$?
320 else 466 else
321 # We didn't use ttmkfdir at all 467 # We didn't use ttmkfdir at all
322 local ttmkfdir_return=2 468 local ttmkfdir_return=2
323 fi 469 fi
324 if [ ${ttmkfdir_return} -ne 0 ]; then 470 if [[ ${ttmkfdir_return} -ne 0 ]]; then
325 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \ 471 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \
326 ${ROOT}/usr/bin/mkfontscale \ 472 ${ROOT}/usr/bin/mkfontscale \
327 -a /usr/share/fonts/encodings/encodings.dir \ 473 -a /usr/share/fonts/encodings/encodings.dir \
328 -- ${x} 474 -- ${x}
329 fi 475 fi
330 # Next type1 and opentype (pfa,pfb,otf,otc) 476 # Next type1 and opentype (pfa,pfb,otf,otc)
331 elif [ "${x/encodings}" = "${x}" -a \ 477 elif [[ "${x/encodings}" = "${x}" ]] \
332 -n "$(find ${x} -iname '*.[po][ft][abcf]' -print)" ]; then 478 && [[ -n "$(find ${x} -iname '*.[po][ft][abcf]' -print)" ]]; then
333 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \ 479 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \
334 ${ROOT}/usr/bin/mkfontscale \ 480 ${ROOT}/usr/bin/mkfontscale \
335 -a ${ROOT}/usr/share/fonts/encodings/encodings.dir \ 481 -a ${ROOT}/usr/share/fonts/encodings/encodings.dir \
336 -- ${x} 482 -- ${x}
337 fi 483 fi
… …
341 487
342create_fonts_dir() { 488create_fonts_dir() {
343 ebegin "Generating fonts.dir files" 489 ebegin "Generating fonts.dir files"
344 for FONT_DIR in ${FONT_DIRS}; do 490 for FONT_DIR in ${FONT_DIRS}; do
345 x=${ROOT}/usr/share/fonts/${FONT_DIR} 491 x=${ROOT}/usr/share/fonts/${FONT_DIR}
346 [ -z "$(ls ${x}/)" ] && continue 492 [[ -z "$(ls ${x}/)" ]] && continue
347 [ "$(ls ${x}/)" = "fonts.cache-1" ] && continue 493 [[ "$(ls ${x}/)" = "fonts.cache-1" ]] && continue
348 494
349 if [ "${x/encodings}" = "${x}" ]; then 495 if [[ "${x/encodings}" = "${x}" ]]; then
350 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \ 496 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \
351 ${ROOT}/usr/bin/mkfontdir \ 497 ${ROOT}/usr/bin/mkfontdir \
352 -e ${ROOT}/usr/share/fonts/encodings \ 498 -e ${ROOT}/usr/share/fonts/encodings \
353 -e ${ROOT}/usr/share/fonts/encodings/large \ 499 -e ${ROOT}/usr/share/fonts/encodings/large \
354 -- ${x} 500 -- ${x}
… …
368 514
369create_font_cache() { 515create_font_cache() {
370 # danarmak found out that fc-cache should be run AFTER all the above 516 # danarmak found out that fc-cache should be run AFTER all the above
371 # stuff, as otherwise the cache is invalid, and has to be run again 517 # stuff, as otherwise the cache is invalid, and has to be run again
372 # as root anyway 518 # as root anyway
373 if [ -x ${ROOT}/usr/bin/fc-cache ]; then 519 if [[ -x ${ROOT}/usr/bin/fc-cache ]]; then
374 ebegin "Creating FC font cache" 520 ebegin "Creating FC font cache"
375 HOME="/root" ${ROOT}/usr/bin/fc-cache 521 HOME="/root" ${ROOT}/usr/bin/fc-cache
376 eend 0 522 eend 0
377 fi 523 fi
378} 524}
Legend:
Removed from v.1.26  
changed lines
  Added in v.1.62
  ViewVC Help
Powered by ViewVC 1.1.13