/[gentoo-x86]/eclass/eutils.eclass
Gentoo

Diff of /eclass/eutils.eclass

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

Revision 1.128 Revision 1.188
1# Copyright 1999-2004 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/eutils.eclass,v 1.128 2004/12/23 09:20:45 eradicator Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.188 2005/07/06 20:32:49 agriffis Exp $
4# 4#
5# Author: Martin Schlemmer <azarah@gentoo.org> 5# Author: Martin Schlemmer <azarah@gentoo.org>
6# 6#
7# This eclass is for general purpose functions that most ebuilds 7# This eclass is for general purpose functions that most ebuilds
8# have to implement themselves. 8# have to implement themselves.
9# 9#
10# NB: If you add anything, please comment it! 10# NB: If you add anything, please comment it!
11 11
12ECLASS=eutils 12inherit multilib
13INHERITED="$INHERITED $ECLASS" 13
14IUSE="bootstrap pam"
14 15
15DEPEND="!bootstrap? ( sys-devel/patch )" 16DEPEND="!bootstrap? ( sys-devel/patch )"
17# sys-apps/shadow is needed for useradd, etc, bug #94745.
16 18
17DESCRIPTION="Based on the ${ECLASS} eclass" 19DESCRIPTION="Based on the ${ECLASS} eclass"
18 20
19# Wait for the supplied number of seconds. If no argument is supplied, defaults 21# Wait for the supplied number of seconds. If no argument is supplied, defaults
20# to five seconds. If the EPAUSE_IGNORE env var is set, don't wait. If we're not 22# to five seconds. If the EPAUSE_IGNORE env var is set, don't wait. If we're not
41 sleep 1 43 sleep 1
42 done 44 done
43 fi 45 fi
44} 46}
45 47
46# This function simply returns the desired lib directory. With portage
47# 2.0.51, we now have support for installing libraries to lib32/lib64
48# to accomidate the needs of multilib systems. It's no longer a good idea
49# to assume all libraries will end up in lib. Replace any (sane) instances
50# where lib is named directly with $(get_libdir) if possible.
51#
52# Travis Tilley <lv@gentoo.org> (24 Aug 2004)
53#
54# Jeremy Huddleston <eradicator@gentoo.org> (23 Dec 2004):
55# Added support for ${ABI} and ${DEFAULT_ABI}. If they're both not set,
56# fall back on old behavior. Any profile that has these set should also
57# depend on a newer version of portage (not yet released) which uses these
58# over CONF_LIBDIR in econf, dolib, etc...
59#
60# For now, this is restricted to the sparc64-multilib ${PROFILE_ARCH} as it
61# is still in testing.
62get_libdir() {
63 LIBDIR_TEST=$(type econf)
64 if [ ! -z "${CONF_LIBDIR_OVERRIDE}" ] ; then
65 # if there is an override, we want to use that... always.
66 CONF_LIBDIR="${CONF_LIBDIR_OVERRIDE}"
67 # We don't need to know the verison of portage. We only need to know
68 # if there is support for CONF_LIBDIR in econf and co.
69 # Danny van Dyk <kugelfang@gentoo.org> 2004/17/09
70 #elif portageq has_version / '<sys-apps/portage-2.0.51_pre20' ; then
71 # # and if there isnt an override, and we're using a version of
72 # # portage without CONF_LIBDIR support, force the use of lib. dolib
73 # # and friends from portage 2.0.50 wont be too happy otherwise.
74 # CONF_LIBDIR="lib"
75 #fi
76 elif [ "${PROFILE_ARCH}" = "sparc64-multilib" ]; then # Using eradicator's LIBDIR_<abi> approach...
77 CONF_LIBDIR="$(get_abi_LIBDIR)"
78 elif [ "${LIBDIR_TEST/CONF_LIBDIR}" == "${LIBDIR_TEST}" ]; then # we don't have CONF_LIBDIR support
79 # will be <portage-2.0.51_pre20
80 CONF_LIBDIR="lib"
81 fi
82 # and of course, default to lib if CONF_LIBDIR isnt set
83 echo ${CONF_LIBDIR:=lib}
84 unset LIBDIR_TEST
85}
86
87get_multilibdir() {
88 [ "${PROFILE_ARCH}" = "sparc64-multilib" ] && die "get_multilibdir called, but it shouldn't be needed on sparc64-multilib"
89 echo ${CONF_MULTILIBDIR:=lib32}
90}
91
92# Sometimes you need to override the value returned by get_libdir. A good
93# example of this is xorg-x11, where lib32 isnt a supported configuration,
94# and where lib64 -must- be used on amd64 (for applications that need lib
95# to be 32bit, such as adobe acrobat). Note that this override also bypasses
96# portage version sanity checking.
97# get_libdir_override expects one argument, the result get_libdir should
98# return:
99#
100# get_libdir_override lib64
101#
102# Travis Tilley <lv@gentoo.org> (31 Aug 2004)
103get_libdir_override() {
104 [ "${PROFILE_ARCH}" = "sparc64-multilib" ] && die "get_libdir_override called, but it shouldn't be needed on sparc64-multilib..."
105 CONF_LIBDIR="$1"
106 CONF_LIBDIR_OVERRIDE="$1"
107}
108
109# This function generate linker scripts in /usr/lib for dynamic 48# This function generate linker scripts in /usr/lib for dynamic
110# libs in /lib. This is to fix linking problems when you have 49# libs in /lib. This is to fix linking problems when you have
111# the .so in /lib, and the .a in /usr/lib. What happens is that 50# the .so in /lib, and the .a in /usr/lib. What happens is that
112# in some cases when linking dynamic, the .a in /usr/lib is used 51# in some cases when linking dynamic, the .a in /usr/lib is used
113# instead of the .so in /lib due to gcc/libtool tweaking ld's 52# instead of the .so in /lib due to gcc/libtool tweaking ld's
127gen_usr_ldscript() { 66gen_usr_ldscript() {
128 local libdir="$(get_libdir)" 67 local libdir="$(get_libdir)"
129 # Just make sure it exists 68 # Just make sure it exists
130 dodir /usr/${libdir} 69 dodir /usr/${libdir}
131 70
71 for lib in "${@}" ; do
132 cat > "${D}/usr/${libdir}/${1}" << END_LDSCRIPT 72 cat > "${D}/usr/${libdir}/${lib}" <<-END_LDSCRIPT
133/* GNU ld script 73 /* GNU ld script
134 Because Gentoo have critical dynamic libraries 74 Since Gentoo has critical dynamic libraries
135 in /lib, and the static versions in /usr/lib, we 75 in /lib, and the static versions in /usr/lib,
136 need to have a "fake" dynamic lib in /usr/lib, 76 we need to have a "fake" dynamic lib in /usr/lib,
137 otherwise we run into linking problems. 77 otherwise we run into linking problems.
138 See bug #4411 on http://bugs.gentoo.org/ for 78
139 more info. */ 79 See bug http://bugs.gentoo.org/4411 for more info.
80 */
140GROUP ( /${libdir}/${1} ) 81 GROUP ( /${libdir}/${lib} )
141END_LDSCRIPT 82 END_LDSCRIPT
142 fperms a+x "/usr/${libdir}/${1}" 83 fperms a+x "/usr/${libdir}/${lib}"
84 done
143} 85}
144 86
145# Simple function to draw a line consisting of '=' the same length as $* 87# Simple function to draw a line consisting of '=' the same length as $*
88# - only to be used by epatch()
146# 89#
147# <azarah@gentoo.org> (11 Nov 2002) 90# <azarah@gentoo.org> (11 Nov 2002)
148# 91#
149draw_line() { 92draw_line() {
150 local i=0 93 local i=0
176EPATCH_SOURCE="${WORKDIR}/patch" 119EPATCH_SOURCE="${WORKDIR}/patch"
177# Default extension for patches 120# Default extension for patches
178EPATCH_SUFFIX="patch.bz2" 121EPATCH_SUFFIX="patch.bz2"
179# Default options for patch 122# Default options for patch
180# Set -g0 to keep RCS, ClearCase, Perforce and SCCS happy. Bug #24571 123# Set -g0 to keep RCS, ClearCase, Perforce and SCCS happy. Bug #24571
181EPATCH_OPTS="-g0" 124# Set --no-backup-if-mismatch so we don't leave '.orig' files behind.
125EPATCH_OPTS="-g0 --no-backup-if-mismatch"
182# List of patches not to apply. Not this is only file names, 126# List of patches not to apply. Not this is only file names,
183# and not the full path .. 127# and not the full path ..
184EPATCH_EXCLUDE="" 128EPATCH_EXCLUDE=""
185# Change the printed message for a single patch. 129# Change the printed message for a single patch.
186EPATCH_SINGLE_MSG="" 130EPATCH_SINGLE_MSG=""
131# Change the printed message for multiple patches.
132EPATCH_MULTI_MSG="Applying various patches (bugfixes/updates) ..."
187# Force applying bulk patches even if not following the style: 133# Force applying bulk patches even if not following the style:
188# 134#
189# ??_${ARCH}_foo.${EPATCH_SUFFIX} 135# ??_${ARCH}_foo.${EPATCH_SUFFIX}
190# 136#
191EPATCH_FORCE="no" 137EPATCH_FORCE="no"
232 local x="" 178 local x=""
233 179
234 if [ "$#" -gt 1 ] 180 if [ "$#" -gt 1 ]
235 then 181 then
236 local m="" 182 local m=""
237 einfo "${#} patches to apply ..."
238 for m in "$@" ; do 183 for m in "$@" ; do
239 epatch "${m}" 184 epatch "${m}"
240 done 185 done
241 return 0 186 return 0
242 fi 187 fi
267 212
268 echo 213 echo
269 eerror "Cannot find \$EPATCH_SOURCE! Value for \$EPATCH_SOURCE is:" 214 eerror "Cannot find \$EPATCH_SOURCE! Value for \$EPATCH_SOURCE is:"
270 eerror 215 eerror
271 eerror " ${EPATCH_SOURCE}" 216 eerror " ${EPATCH_SOURCE}"
217 eerror " ( ${EPATCH_SOURCE##*/} )"
272 echo 218 echo
273 die "Cannot find \$EPATCH_SOURCE!" 219 die "Cannot find \$EPATCH_SOURCE!"
274 fi 220 fi
275 221
276 local EPATCH_SOURCE="${EPATCH_SOURCE}/*.${EPATCH_SUFFIX}" 222 local EPATCH_SOURCE="${EPATCH_SOURCE}/*.${EPATCH_SUFFIX}"
295 ;; 241 ;;
296 esac 242 esac
297 243
298 if [ "${SINGLE_PATCH}" = "no" ] 244 if [ "${SINGLE_PATCH}" = "no" ]
299 then 245 then
300 einfo "Applying various patches (bugfixes/updates) ..." 246 einfo "${EPATCH_MULTI_MSG}"
301 fi 247 fi
302 for x in ${EPATCH_SOURCE} 248 for x in ${EPATCH_SOURCE}
303 do 249 do
304 # New ARCH dependant patch naming scheme ... 250 # New ARCH dependant patch naming scheme ...
305 # 251 #
306 # ???_arch_foo.patch 252 # ???_arch_foo.patch
307 # 253 #
308 if [ -f ${x} ] && \ 254 if [ -f ${x} ] && \
309 ([ "${SINGLE_PATCH}" = "yes" -o "${x/_all_}" != "${x}" -o "`eval echo \$\{x/_${ARCH}_\}`" != "${x}" ] || \ 255 ([ "${SINGLE_PATCH}" = "yes" -o "${x/_all_}" != "${x}" -o "${x/_${ARCH}_}" != "${x}" ] || \
310 [ "${EPATCH_FORCE}" = "yes" ]) 256 [ "${EPATCH_FORCE}" = "yes" ])
311 then 257 then
312 local count=0 258 local count=0
313 local popts="${EPATCH_OPTS}" 259 local popts="${EPATCH_OPTS}"
260 local patchname=${x##*/}
314 261
315 if [ -n "${EPATCH_EXCLUDE}" ] 262 if [ -n "${EPATCH_EXCLUDE}" ]
316 then 263 then
317 if [ "`eval echo \$\{EPATCH_EXCLUDE/${x##*/}\}`" != "${EPATCH_EXCLUDE}" ] 264 if [ "${EPATCH_EXCLUDE/${patchname}}" != "${EPATCH_EXCLUDE}" ]
318 then 265 then
319 continue 266 continue
320 fi 267 fi
321 fi 268 fi
322 269
324 then 271 then
325 if [ -n "${EPATCH_SINGLE_MSG}" ] 272 if [ -n "${EPATCH_SINGLE_MSG}" ]
326 then 273 then
327 einfo "${EPATCH_SINGLE_MSG}" 274 einfo "${EPATCH_SINGLE_MSG}"
328 else 275 else
329 einfo "Applying ${x##*/} ..." 276 einfo "Applying ${patchname} ..."
330 fi 277 fi
331 else 278 else
332 einfo " ${x##*/} ..." 279 einfo " ${patchname} ..."
333 fi 280 fi
334 281
335 echo "***** ${x##*/} *****" > ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 282 echo "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
336 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 283 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
337 284
338 # Allow for prefix to differ ... im lazy, so shoot me :/ 285 # Allow for prefix to differ ... im lazy, so shoot me :/
339 while [ "${count}" -lt 5 ] 286 while [ "${count}" -lt 5 ]
340 do 287 do
341 # Generate some useful debug info ... 288 # Generate some useful debug info ...
342 draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 289 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
343 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 290 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
344 291
345 if [ "${PATCH_SUFFIX}" != "patch" ] 292 if [ "${PATCH_SUFFIX}" != "patch" ]
346 then 293 then
347 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 294 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
348 echo "${PIPE_CMD} ${x} > ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 295 echo "${PIPE_CMD} ${x} > ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
349 else 296 else
350 PATCH_TARGET="${x}" 297 PATCH_TARGET="${x}"
351 fi 298 fi
352 299
353 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 300 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
354 echo "patch -p${count} ${popts} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 301 echo "patch -p${count} ${popts} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
355 302
356 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 303 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
357 draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 304 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
358 305
359 if [ "${PATCH_SUFFIX}" != "patch" ] 306 if [ "${PATCH_SUFFIX}" != "patch" ]
360 then 307 then
361 if ! (${PIPE_CMD} ${x} > ${PATCH_TARGET}) >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 2>&1 308 if ! (${PIPE_CMD} ${x} > ${PATCH_TARGET}) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1
362 then 309 then
363 echo 310 echo
364 eerror "Could not extract patch!" 311 eerror "Could not extract patch!"
365 #die "Could not extract patch!" 312 #die "Could not extract patch!"
366 count=5 313 count=5
367 break 314 break
368 fi 315 fi
369 fi 316 fi
370 317
371 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f) >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 2>&1 318 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1
372 then 319 then
373 draw_line "***** ${x##*/} *****" > ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 320 draw_line "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
374 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 321 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
375 echo "ACTUALLY APPLYING ${x##*/} ..." >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 322 echo "ACTUALLY APPLYING ${patchname} ..." >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
376 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 323 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
377 draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 324 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
378 325
379 cat ${PATCH_TARGET} | patch -p${count} ${popts} >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 2>&1 326 cat ${PATCH_TARGET} | patch -p${count} ${popts} >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 2>&1
380 327
381 if [ "$?" -ne 0 ] 328 if [ "$?" -ne 0 ]
382 then 329 then
383 cat ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 330 cat ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
384 echo 331 echo
385 eerror "A dry-run of patch command succeeded, but actually" 332 eerror "A dry-run of patch command succeeded, but actually"
386 eerror "applying the patch failed!" 333 eerror "applying the patch failed!"
387 #die "Real world sux compared to the dreamworld!" 334 #die "Real world sux compared to the dreamworld!"
388 count=5 335 count=5
389 fi 336 fi
390 337
391 rm -f ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 338 rm -f ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
392 339
393 break 340 break
394 fi 341 fi
395 342
396 count=$((count + 1)) 343 count=$((count + 1))
402 fi 349 fi
403 350
404 if [ "${count}" -eq 5 ] 351 if [ "${count}" -eq 5 ]
405 then 352 then
406 echo 353 echo
407 eerror "Failed Patch: ${x##*/}!" 354 eerror "Failed Patch: ${patchname} !"
355 eerror " ( ${PATCH_TARGET} )"
408 eerror 356 eerror
409 eerror "Include in your bugreport the contents of:" 357 eerror "Include in your bugreport the contents of:"
410 eerror 358 eerror
411 eerror " ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}" 359 eerror " ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}"
412 echo 360 echo
413 die "Failed Patch: ${x##*/}!" 361 die "Failed Patch: ${patchname}!"
414 fi 362 fi
415 363
416 rm -f ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 364 rm -f ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
417 365
418 eend 0 366 eend 0
419 fi 367 fi
420 done 368 done
421 if [ "${SINGLE_PATCH}" = "no" ] 369 if [ "${SINGLE_PATCH}" = "no" ]
422 then 370 then
423 einfo "Done with patching" 371 einfo "Done with patching"
424 fi
425}
426
427# This function return true if we are using the NPTL pthreads
428# implementation.
429#
430# <azarah@gentoo.org> (06 March 2003)
431#
432have_NPTL() {
433 cat > ${T}/test-nptl.c <<-"END"
434 #define _XOPEN_SOURCE
435 #include <unistd.h>
436 #include <stdio.h>
437
438 int main()
439 {
440 char buf[255];
441 char *str = buf;
442
443 confstr(_CS_GNU_LIBPTHREAD_VERSION, str, 255);
444 if (NULL != str) {
445 printf("%s\n", str);
446 if (NULL != strstr(str, "NPTL"))
447 return 0;
448 }
449
450 return 1;
451 }
452 END
453
454 einfon "Checking for _CS_GNU_LIBPTHREAD_VERSION support in glibc ..."
455 if gcc -o ${T}/nptl ${T}/test-nptl.c &> /dev/null
456 then
457 echo "yes"
458 einfon "Checking what PTHREADS implementation we have ..."
459 if ${T}/nptl
460 then
461 return 0
462 else
463 return 1
464 fi
465 else
466 echo "no"
467 fi
468
469 return 1
470}
471
472# This function check how many cpu's are present, and then set
473# -j in MAKEOPTS accordingly.
474#
475# Thanks to nall <nall@gentoo.org> for this.
476#
477get_number_of_jobs() {
478 local jobs=0
479
480 if [ ! -r /proc/cpuinfo ]
481 then
482 return 1
483 fi
484
485 # This bit is from H?kan Wessberg <nacka-gentoo@refug.org>, bug #13565.
486 if [ "`egrep "^[[:space:]]*MAKEOPTS=" /etc/make.conf | wc -l`" -gt 0 ]
487 then
488 ADMINOPTS="`egrep "^[[:space:]]*MAKEOPTS=" /etc/make.conf | cut -d= -f2 | sed 's/\"//g'`"
489 ADMINPARAM="`echo ${ADMINOPTS} | gawk '{match($0, /-j *[0-9]*/, opt); print opt[0]}'`"
490 ADMINPARAM="${ADMINPARAM/-j}"
491 fi
492
493 export MAKEOPTS="`echo ${MAKEOPTS} | sed -e 's:-j *[0-9]*::g'`"
494
495 if [ "${ARCH}" = "amd64" -o "${ARCH}" = "x86" -o "${ARCH}" = "hppa" -o \
496 "${ARCH}" = "arm" -o "${ARCH}" = "mips" -o "${ARCH}" = "ia64" ]
497 then
498 # these archs will always have "[Pp]rocessor"
499 jobs="$((`grep -c ^[Pp]rocessor /proc/cpuinfo` * 2))"
500
501 elif [ "${ARCH}" = "sparc" -o "${ARCH}" = "sparc64" ]
502 then
503 # sparc always has "ncpus active"
504 jobs="$((`grep "^ncpus active" /proc/cpuinfo | sed -e "s/^.*: //"` * 2))"
505
506 elif [ "${ARCH}" = "alpha" ]
507 then
508 # alpha has "cpus active", but only when compiled with SMP
509 if [ "`grep -c "^cpus active" /proc/cpuinfo`" -eq 1 ]
510 then
511 jobs="$((`grep "^cpus active" /proc/cpuinfo | sed -e "s/^.*: //"` * 2))"
512 else
513 jobs=2
514 fi
515
516 elif [ "${ARCH}" = "ppc" -o "${ARCH}" = "ppc64" ]
517 then
518 # ppc has "processor", but only when compiled with SMP
519 if [ "`grep -c "^processor" /proc/cpuinfo`" -eq 1 ]
520 then
521 jobs="$((`grep -c ^processor /proc/cpuinfo` * 2))"
522 else
523 jobs=2
524 fi
525 elif [ "${ARCH}" = "s390" ]
526 then
527 # s390 has "# processors : "
528 jobs="$((`grep "^\# processors" /proc/cpuinfo | sed -e "s/^.*: //"` * 2))"
529 else
530 jobs="$((`grep -c ^cpu /proc/cpuinfo` * 2))"
531 die "Unknown ARCH -- ${ARCH}!"
532 fi
533
534 # Make sure the number is valid ...
535 if [ "${jobs}" -lt 1 ]
536 then
537 jobs=1
538 fi
539
540 if [ -n "${ADMINPARAM}" ]
541 then
542 if [ "${jobs}" -gt "${ADMINPARAM}" ]
543 then
544 einfo "Setting make jobs to \"-j${ADMINPARAM}\" to ensure successful merge ..."
545 export MAKEOPTS="${MAKEOPTS} -j${ADMINPARAM}"
546 else
547 einfo "Setting make jobs to \"-j${jobs}\" to ensure successful merge ..."
548 export MAKEOPTS="${MAKEOPTS} -j${jobs}"
549 fi
550 fi 372 fi
551} 373}
552 374
553# Cheap replacement for when debianutils (and thus mktemp) 375# Cheap replacement for when debianutils (and thus mktemp)
554# does not exist on the users system 376# does not exist on the users system
588# Joe Jezak <josejx@gmail.com> and usata@gentoo.org 410# Joe Jezak <josejx@gmail.com> and usata@gentoo.org
589# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org> 411# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org>
590# 412#
591# egetent(database, key) 413# egetent(database, key)
592egetent() { 414egetent() {
593 if useq ppc-macos ; then 415 if [[ "${USERLAND}" == "Darwin" ]] ; then
594 case "$2" in 416 case "$2" in
595 *[!0-9]*) # Non numeric 417 *[!0-9]*) # Non numeric
596 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }" 418 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }"
597 ;; 419 ;;
598 *) # Numeric 420 *) # Numeric
599 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }" 421 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }"
600 ;; 422 ;;
601 esac 423 esac
602 elif useq x86-fbsd ; then 424 elif [[ "${USERLAND}" == "BSD" ]] ; then
603 local action 425 local action
604 if [ "$1" == "passwd" ] 426 if [ "$1" == "passwd" ]
605 then 427 then
606 action="user" 428 action="user"
607 else 429 else
627# homedir: /dev/null 449# homedir: /dev/null
628# groups: none 450# groups: none
629# extra: comment of 'added by portage for ${PN}' 451# extra: comment of 'added by portage for ${PN}'
630enewuser() { 452enewuser() {
631 # get the username 453 # get the username
632 local euser="$1"; shift 454 local euser=$1; shift
633 if [ -z "${euser}" ] 455 if [[ -z ${euser} ]] ; then
634 then
635 eerror "No username specified !" 456 eerror "No username specified !"
636 die "Cannot call enewuser without a username" 457 die "Cannot call enewuser without a username"
637 fi 458 fi
638 459
639 # lets see if the username already exists 460 # lets see if the username already exists
640 if [ "${euser}" == "`egetent passwd \"${euser}\" | cut -d: -f1`" ] 461 if [[ ${euser} == $(egetent passwd "${euser}" | cut -d: -f1) ]] ; then
641 then
642 return 0 462 return 0
643 fi 463 fi
644 einfo "Adding user '${euser}' to your system ..." 464 einfo "Adding user '${euser}' to your system ..."
645 465
646 # options to pass to useradd 466 # options to pass to useradd
647 local opts= 467 local opts=
648 468
649 # handle uid 469 # handle uid
650 local euid="$1"; shift 470 local euid=$1; shift
651 if [ ! -z "${euid}" ] && [ "${euid}" != "-1" ] 471 if [[ ! -z ${euid} ]] && [[ ${euid} != "-1" ]] ; then
652 then
653 if [ "${euid}" -gt 0 ] 472 if [[ ${euid} -gt 0 ]] ; then
654 then
655 if [ ! -z "`egetent passwd ${euid}`" ] 473 if [[ ! -z $(egetent passwd ${euid}) ]] ; then
656 then
657 euid="next" 474 euid="next"
658 fi 475 fi
659 else 476 else
660 eerror "Userid given but is not greater than 0 !" 477 eerror "Userid given but is not greater than 0 !"
661 die "${euid} is not a valid UID" 478 die "${euid} is not a valid UID"
662 fi 479 fi
663 else 480 else
664 euid="next" 481 euid="next"
665 fi 482 fi
666 if [ "${euid}" == "next" ] 483 if [[ ${euid} == "next" ]] ; then
667 then
668 local pwrange 484 local pwrange
669 if [ "${USERLAND}" == "BSD" ] ; then 485 if [[ ${USERLAND} == "BSD" ]] ; then
670 pwrange="`jot 898 101`" 486 pwrange=$(jot 898 101)
671 else 487 else
672 pwrange="`seq 101 999`" 488 pwrange=$(seq 101 999)
673 fi 489 fi
674 for euid in ${pwrange} ; do 490 for euid in ${pwrange} ; do
675 [ -z "`egetent passwd ${euid}`" ] && break 491 [[ -z $(egetent passwd ${euid}) ]] && break
676 done 492 done
677 fi 493 fi
678 opts="${opts} -u ${euid}" 494 opts="${opts} -u ${euid}"
679 einfo " - Userid: ${euid}" 495 einfo " - Userid: ${euid}"
680 496
681 # handle shell 497 # handle shell
682 local eshell="$1"; shift 498 local eshell=$1; shift
683 if [ ! -z "${eshell}" ] && [ "${eshell}" != "-1" ] 499 if [[ ! -z ${eshell} ]] && [[ ${eshell} != "-1" ]] ; then
684 then
685 if [ ! -e "${eshell}" ] 500 if [[ ! -e ${eshell} ]] ; then
686 then
687 eerror "A shell was specified but it does not exist !" 501 eerror "A shell was specified but it does not exist !"
688 die "${eshell} does not exist" 502 die "${eshell} does not exist"
689 fi 503 fi
690 else 504 else
691 if [ "${USERLAND}" == "BSD" ] 505 case ${USERLAND} in
692 then
693 eshell="/usr/bin/false" 506 Darwin) eshell="/usr/bin/false";;
694 else 507 BSD) eshell="/usr/sbin/nologin";;
695 eshell="/bin/false" 508 *) eshell="/bin/false";;
696 fi 509 esac
697 fi 510 fi
698 einfo " - Shell: ${eshell}" 511 einfo " - Shell: ${eshell}"
699 opts="${opts} -s ${eshell}" 512 opts="${opts} -s ${eshell}"
700 513
701 # handle homedir 514 # handle homedir
702 local ehome="$1"; shift 515 local ehome=$1; shift
703 if [ -z "${ehome}" ] && [ "${eshell}" != "-1" ] 516 if [[ -z ${ehome} ]] || [[ ${ehome} == "-1" ]] ; then
704 then
705 ehome="/dev/null" 517 ehome="/dev/null"
706 fi 518 fi
707 einfo " - Home: ${ehome}" 519 einfo " - Home: ${ehome}"
708 opts="${opts} -d ${ehome}" 520 opts="${opts} -d ${ehome}"
709 521
710 # handle groups 522 # handle groups
711 local egroups="$1"; shift 523 local egroups=$1; shift
712 if [ ! -z "${egroups}" ] 524 if [[ ! -z ${egroups} ]] ; then
713 then
714 local oldifs="${IFS}" 525 local oldifs=${IFS}
715 local defgroup="" exgroups="" 526 local defgroup="" exgroups=""
716 527
717 export IFS="," 528 export IFS=","
718 for g in ${egroups} 529 for g in ${egroups} ; do
719 do
720 export IFS="${oldifs}" 530 export IFS=${oldifs}
721 if [ -z "`egetent group \"${g}\"`" ] 531 if [[ -z $(egetent group "${g}") ]] ; then
722 then
723 eerror "You must add group ${g} to the system first" 532 eerror "You must add group ${g} to the system first"
724 die "${g} is not a valid GID" 533 die "${g} is not a valid GID"
725 fi 534 fi
726 if [ -z "${defgroup}" ] 535 if [[ -z ${defgroup} ]] ; then
727 then
728 defgroup="${g}" 536 defgroup=${g}
729 else 537 else
730 exgroups="${exgroups},${g}" 538 exgroups="${exgroups},${g}"
731 fi 539 fi
732 export IFS="," 540 export IFS=","
733 done 541 done
734 export IFS="${oldifs}" 542 export IFS=${oldifs}
735 543
736 opts="${opts} -g ${defgroup}" 544 opts="${opts} -g ${defgroup}"
737 if [ ! -z "${exgroups}" ] 545 if [[ ! -z ${exgroups} ]] ; then
738 then
739 opts="${opts} -G ${exgroups:1}" 546 opts="${opts} -G ${exgroups:1}"
740 fi 547 fi
741 else 548 else
742 egroups="(none)" 549 egroups="(none)"
743 fi 550 fi
744 einfo " - Groups: ${egroups}" 551 einfo " - Groups: ${egroups}"
745 552
746 # handle extra and add the user 553 # handle extra and add the user
747 local eextra="$@"
748 local oldsandbox="${SANDBOX_ON}" 554 local oldsandbox=${SANDBOX_ON}
749 export SANDBOX_ON="0" 555 export SANDBOX_ON="0"
750 if useq ppc-macos 556 case ${USERLAND} in
751 then 557 Darwin)
752 ### Make the user 558 ### Make the user
753 if [ -z "${eextra}" ] 559 if [[ -z $@ ]] ; then
754 then
755 dscl . create /users/${euser} uid ${euid} 560 dscl . create /users/${euser} uid ${euid}
756 dscl . create /users/${euser} shell ${eshell} 561 dscl . create /users/${euser} shell ${eshell}
757 dscl . create /users/${euser} home ${ehome} 562 dscl . create /users/${euser} home ${ehome}
758 dscl . create /users/${euser} realname "added by portage for ${PN}" 563 dscl . create /users/${euser} realname "added by portage for ${PN}"
759 ### Add the user to the groups specified 564 ### Add the user to the groups specified
760 local oldifs="${IFS}" 565 local oldifs=${IFS}
761 export IFS="," 566 export IFS=","
762 for g in ${egroups} 567 for g in ${egroups} ; do
763 do
764 dscl . merge /groups/${g} users ${euser} 568 dscl . merge /groups/${g} users ${euser}
765 done 569 done
766 export IFS="${oldifs}" 570 export IFS=${oldifs}
767 else 571 else
768 einfo "Extra options are not supported on macos yet" 572 einfo "Extra options are not supported on Darwin yet"
769 einfo "Please report the ebuild along with the info below" 573 einfo "Please report the ebuild along with the info below"
770 einfo "eextra: ${eextra}" 574 einfo "eextra: $@"
771 die "Required function missing" 575 die "Required function missing"
772 fi 576 fi
773 elif use x86-fbsd ; then 577 ;;
774 if [ -z "${eextra}" ] 578 BSD)
775 then 579 if [[ -z $@ ]] ; then
776 pw useradd ${euser} ${opts} \ 580 pw useradd ${euser} ${opts} \
777 -c "added by portage for ${PN}" \ 581 -c "added by portage for ${PN}" \
778 die "enewuser failed" 582 die "enewuser failed"
779 else 583 else
780 einfo " - Extra: ${eextra}" 584 einfo " - Extra: $@"
781 pw useradd ${euser} ${opts} \ 585 pw useradd ${euser} ${opts} \
782 -c ${eextra} || die "enewuser failed" 586 "$@" || die "enewuser failed"
783 fi 587 fi
784 else 588 ;;
785 if [ -z "${eextra}" ] 589 *)
786 then 590 if [[ -z $@ ]] ; then
787 useradd ${opts} ${euser} \ 591 useradd ${opts} ${euser} \
788 -c "added by portage for ${PN}" \ 592 -c "added by portage for ${PN}" \
789 || die "enewuser failed" 593 || die "enewuser failed"
790 else 594 else
791 einfo " - Extra: ${eextra}" 595 einfo " - Extra: $@"
792 useradd ${opts} ${euser} ${eextra} \ 596 useradd ${opts} ${euser} "$@" \
793 || die "enewuser failed" 597 || die "enewuser failed"
794 fi 598 fi
795 fi 599 ;;
600 esac
796 export SANDBOX_ON="${oldsandbox}" 601 export SANDBOX_ON=${oldsandbox}
797 602
798 if [ ! -e "${ehome}" ] && [ ! -e "${D}/${ehome}" ] 603 if [ ! -e "${ehome}" ] && [ ! -e "${D}/${ehome}" ]
799 then 604 then
800 einfo " - Creating ${ehome} in ${D}" 605 einfo " - Creating ${ehome} in ${D}"
801 dodir ${ehome} 606 dodir ${ehome}
838 then 643 then
839 if [ "${egid}" -gt 0 ] 644 if [ "${egid}" -gt 0 ]
840 then 645 then
841 if [ -z "`egetent group ${egid}`" ] 646 if [ -z "`egetent group ${egid}`" ]
842 then 647 then
843 if useq ppc-macos ; then 648 if [[ "${USERLAND}" == "Darwin" ]]; then
844 opts="${opts} ${egid}" 649 opts="${opts} ${egid}"
845 else 650 else
846 opts="${opts} -g ${egid}" 651 opts="${opts} -g ${egid}"
847 fi 652 fi
848 else 653 else
862 opts="${opts} ${eextra}" 667 opts="${opts} ${eextra}"
863 668
864 # add the group 669 # add the group
865 local oldsandbox="${SANDBOX_ON}" 670 local oldsandbox="${SANDBOX_ON}"
866 export SANDBOX_ON="0" 671 export SANDBOX_ON="0"
867 if useq ppc-macos ; then 672 if [[ "${USERLAND}" == "Darwin" ]]; then
868 if [ ! -z "${eextra}" ]; 673 if [ ! -z "${eextra}" ];
869 then 674 then
870 einfo "Extra options are not supported on macos yet" 675 einfo "Extra options are not supported on Darwin/OS X yet"
871 einfo "Please report the ebuild along with the info below" 676 einfo "Please report the ebuild along with the info below"
872 einfo "eextra: ${eextra}" 677 einfo "eextra: ${eextra}"
873 die "Required function missing" 678 die "Required function missing"
874 fi 679 fi
875 680
880 [ -z "`egetent group ${egid}`" ] && break 685 [ -z "`egetent group ${egid}`" ] && break
881 done 686 done
882 esac 687 esac
883 dscl . create /groups/${egroup} gid ${egid} 688 dscl . create /groups/${egroup} gid ${egid}
884 dscl . create /groups/${egroup} passwd '*' 689 dscl . create /groups/${egroup} passwd '*'
885 elif use x86-fbsd ; then 690 elif [[ "${USERLAND}" == "BSD" ]] ; then
886 case ${egid} in 691 case ${egid} in
887 *[!0-9]*) # Non numeric 692 *[!0-9]*) # Non numeric
888 for egid in `jot 898 101`; do 693 for egid in `jot 898 101`; do
889 [ -z "`egetent group ${egid}`" ] && break 694 [ -z "`egetent group ${egid}`" ] && break
890 done 695 done
906 cp "${f}" ${T}/edos2unix 711 cp "${f}" ${T}/edos2unix
907 sed 's/\r$//' ${T}/edos2unix > "${f}" 712 sed 's/\r$//' ${T}/edos2unix > "${f}"
908 done 713 done
909} 714}
910 715
716
717##############################################################
718# START: Handle .desktop files and menu entries #
719# maybe this should be separated into a new eclass some time #
720# lanius@gentoo.org #
721##############################################################
722
911# Make a desktop file ! 723# Make a desktop file !
912# Great for making those icons in kde/gnome startmenu ! 724# Great for making those icons in kde/gnome startmenu !
913# Amaze your friends ! Get the women ! Join today ! 725# Amaze your friends ! Get the women ! Join today !
914# 726#
915# make_desktop_entry(<binary>, [name], [icon], [type], [path]) 727# make_desktop_entry(<binary>, [name], [icon], [type], [path])
918# name: the name that will show up in the menu 730# name: the name that will show up in the menu
919# icon: give your little like a pretty little icon ... 731# icon: give your little like a pretty little icon ...
920# this can be relative (to /usr/share/pixmaps) or 732# this can be relative (to /usr/share/pixmaps) or
921# a full path to an icon 733# a full path to an icon
922# type: what kind of application is this ? for categories: 734# type: what kind of application is this ? for categories:
923# http://www.freedesktop.org/standards/menu-spec/ 735# http://www.freedesktop.org/wiki/Standards_2fmenu_2dspec
924# path: if your app needs to startup in a specific dir 736# path: if your app needs to startup in a specific dir
925make_desktop_entry() { 737make_desktop_entry() {
926 [ -z "$1" ] && eerror "make_desktop_entry: You must specify the executable" && return 1 738 [[ -z $1 ]] && eerror "make_desktop_entry: You must specify the executable" && return 1
927 739
928 local exec="${1}" 740 local exec=${1}
929 local name="${2:-${PN}}" 741 local name=${2:-${PN}}
930 local icon="${3:-${PN}.png}" 742 local icon=${3:-${PN}.png}
931 local type="${4}" 743 local type=${4}
932 local subdir="${6}" 744 local path=${5}
933 local path="${5:-${GAMES_BINDIR}}" 745
934 if [ -z "${type}" ] 746 if [[ -z ${type} ]] ; then
935 then 747 local catmaj=${CATEGORY%%-*}
936 case ${CATEGORY} in 748 local catmin=${CATEGORY##*-}
937 "app-emulation") 749 case ${catmaj} in
938 type=Emulator 750 app)
939 subdir="Emulation" 751 case ${catmin} in
752 admin) type=System;;
753 cdr) type=DiscBurning;;
754 dicts) type=Dictionary;;
755 editors) type=TextEditor;;
756 emacs) type=TextEditor;;
757 emulation) type=Emulator;;
758 laptop) type=HardwareSettings;;
759 office) type=Office;;
760 vim) type=TextEditor;;
761 xemacs) type=TextEditor;;
762 *) type=;;
763 esac
940 ;; 764 ;;
941 "games-"*) 765
942 type=Game 766 dev)
943 subdir="Games" 767 type="Development"
944 ;; 768 ;;
945 "net-"*) 769
946 type=Network 770 games)
947 subdir="${type}" 771 [[ -z ${path} ]] && path=${GAMES_BINDIR}
772
773 case ${catmin} in
774 action) type=ActionGame;;
775 arcade) type=ArcadeGame;;
776 board) type=BoardGame;;
777 kid) type=KidsGame;;
778 emulation) type=Emulator;;
779 puzzle) type=LogicGame;;
780 rpg) type=RolePlaying;;
781 roguelike) type=RolePlaying;;
782 simulation) type=Simulation;;
783 sports) type=SportsGame;;
784 strategy) type=StrategyGame;;
785 *) type=;;
786 esac
787 type="Game;${type}"
948 ;; 788 ;;
789
790 mail)
791 type="Network;Email"
792 ;;
793
794 media)
795 case ${catmin} in
796 gfx) type=Graphics;;
797 radio) type=Tuner;;
798 sound) type=Audio;;
799 tv) type=TV;;
800 video) type=Video;;
801 *) type=;;
802 esac
803 type="AudioVideo;${type}"
804 ;;
805
806 net)
807 case ${catmin} in
808 dialup) type=Dialup;;
809 ftp) type=FileTransfer;;
810 im) type=InstantMessaging;;
811 irc) type=IRCClient;;
812 mail) type=Email;;
813 news) type=News;;
814 nntp) type=News;;
815 p2p) type=FileTransfer;;
816 *) type=;;
817 esac
818 type="Network;${type}"
819 ;;
820
821 sci)
822 case ${catmin} in
823 astro*) type=Astronomoy;;
824 bio*) type=Biology;;
825 calc*) type=Calculator;;
826 chem*) type=Chemistry;;
827 geo*) type=Geology;;
828 math*) type=Math;;
829 *) type=;;
830 esac
831 type="Science;${type}"
832 ;;
833
834 www)
835 case ${catmin} in
836 client) type=WebBrowser;;
837 *) type=;;
838 esac
839 type="Network"
840 ;;
841
949 *) 842 *)
950 type= 843 type=
951 subdir=
952 ;; 844 ;;
953 esac 845 esac
954 fi 846 fi
847 if [ "${SLOT}" == "0" ] ; then
848 local desktop_name="${PN}"
849 else
850 local desktop_name="${PN}-${SLOT}"
851 fi
955 local desktop="${T}/${exec}.desktop" 852 local desktop=${T}/${exec%% *}-${desktop_name}.desktop
956 853
957echo "[Desktop Entry] 854echo "[Desktop Entry]
958Encoding=UTF-8 855Encoding=UTF-8
959Version=0.9.2 856Version=0.9.2
960Name=${name} 857Name=${name}
968 insinto /usr/share/applications 865 insinto /usr/share/applications
969 doins "${desktop}" 866 doins "${desktop}"
970 867
971 return 0 868 return 0
972} 869}
870
871# Make a GDM/KDM Session file
872#
873# make_desktop_entry(<title>, <command>)
874# title: File to execute to start the Window Manager
875# command: Name of the Window Manager
876
877make_session_desktop() {
878 [[ -z $1 ]] && eerror "make_session_desktop: You must specify the title" && return 1
879 [[ -z $2 ]] && eerror "make_session_desktop: You must specify the command" && return 1
880
881 local title=$1
882 local command=$2
883 local desktop=${T}/${wm}.desktop
884
885echo "[Desktop Entry]
886Encoding=UTF-8
887Name=${title}
888Comment=This session logs you into ${title}
889Exec=${command}
890TryExec=${command}
891Type=Application" > "${desktop}"
892
893 insinto /usr/share/xsessions
894 doins "${desktop}"
895}
896
897domenu() {
898 local i j
899 insinto /usr/share/applications
900 for i in "$@" ; do
901 if [[ -f ${i} ]] ; then
902 doins "${i}"
903 elif [[ -d ${i} ]] ; then
904 for j in "${i}"/*.desktop ; do
905 doins "${j}"
906 done
907 fi
908 done
909}
910newmenu() {
911 insinto /usr/share/applications
912 newins "$1" "$2"
913}
914
915doicon() {
916 local i j
917 insinto /usr/share/pixmaps
918 for i in "$@" ; do
919 if [[ -f ${i} ]] ; then
920 doins "${i}"
921 elif [[ -d ${i} ]] ; then
922 for j in "${i}"/*.png ; do
923 doins "${j}"
924 done
925 fi
926 done
927}
928newicon() {
929 insinto /usr/share/pixmaps
930 newins "$1" "$2"
931}
932
933##############################################################
934# END: Handle .desktop files and menu entries #
935##############################################################
936
973 937
974# for internal use only (unpack_pdv and unpack_makeself) 938# for internal use only (unpack_pdv and unpack_makeself)
975find_unpackable_file() { 939find_unpackable_file() {
976 local src="$1" 940 local src="$1"
977 if [ -z "${src}" ] 941 if [ -z "${src}" ]
1258 export CDROM_TOTAL_CDS=${cdcnt} 1222 export CDROM_TOTAL_CDS=${cdcnt}
1259 export CDROM_CURRENT_CD=1 1223 export CDROM_CURRENT_CD=1
1260 1224
1261 # now we see if the user gave use CD_ROOT ... 1225 # now we see if the user gave use CD_ROOT ...
1262 # if they did, let's just believe them that it's correct 1226 # if they did, let's just believe them that it's correct
1263 if [ ! -z "${CD_ROOT}" ] ; then 1227 if [[ ! -z ${CD_ROOT} ]] ; then
1264 export CDROM_ROOT="${CD_ROOT}" 1228 export CDROM_ROOT=${CD_ROOT}
1265 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1229 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1266 return 1230 return
1267 fi 1231 fi
1268 # do the same for CD_ROOT_X 1232 # do the same for CD_ROOT_X
1269 if [ ! -z "${CD_ROOT_1}" ] ; then 1233 if [[ ! -z ${CD_ROOT_1} ]] ; then
1270 local var= 1234 local var=
1271 cdcnt=0 1235 cdcnt=0
1272 while [ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ] ; do 1236 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1273 cdcnt=$((cdcnt + 1)) 1237 cdcnt=$((cdcnt + 1))
1274 var="CD_ROOT_${cdcnt}" 1238 var="CD_ROOT_${cdcnt}"
1275 if [ -z "${!var}" ] ; then 1239 if [[ -z ${!var} ]] ; then
1276 eerror "You must either use just the CD_ROOT" 1240 eerror "You must either use just the CD_ROOT"
1277 eerror "or specify ALL the CD_ROOT_X variables." 1241 eerror "or specify ALL the CD_ROOT_X variables."
1278 eerror "In this case, you will need ${CDROM_TOTAL_CDS} CD_ROOT_X variables." 1242 eerror "In this case, you will need ${CDROM_TOTAL_CDS} CD_ROOT_X variables."
1279 die "could not locate CD_ROOT_${cdcnt}" 1243 die "could not locate CD_ROOT_${cdcnt}"
1280 fi 1244 fi
1283 export CDROM_ROOT=${CDROM_ROOTS_1} 1247 export CDROM_ROOT=${CDROM_ROOTS_1}
1284 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1248 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1285 return 1249 return
1286 fi 1250 fi
1287 1251
1288 if [ ${CDROM_TOTAL_CDS} -eq 1 ] ; then 1252 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1289 einfon "This ebuild will need the " 1253 einfon "This ebuild will need the "
1290 if [ -z "${CDROM_NAME}" ] ; then 1254 if [[ -z ${CDROM_NAME} ]] ; then
1291 echo "cdrom for ${PN}." 1255 echo "cdrom for ${PN}."
1292 else 1256 else
1293 echo "${CDROM_NAME}." 1257 echo "${CDROM_NAME}."
1294 fi 1258 fi
1295 echo 1259 echo
1296 einfo "If you do not have the CD, but have the data files" 1260 einfo "If you do not have the CD, but have the data files"
1297 einfo "mounted somewhere on your filesystem, just export" 1261 einfo "mounted somewhere on your filesystem, just export"
1298 einfo "the variable CD_ROOT so that it points to the" 1262 einfo "the variable CD_ROOT so that it points to the"
1299 einfo "directory containing the files." 1263 einfo "directory containing the files."
1300 echo 1264 echo
1265 einfo "For example:"
1266 einfo "export CD_ROOT=/mnt/cdrom"
1267 echo
1301 else 1268 else
1302 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds." 1269 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds."
1303 cdcnt=0 1270 cdcnt=0
1304 while [ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ] ; do 1271 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1305 cdcnt=$((cdcnt + 1)) 1272 cdcnt=$((cdcnt + 1))
1306 var="CDROM_NAME_${cdcnt}" 1273 var="CDROM_NAME_${cdcnt}"
1307 [ ! -z "${!var}" ] && einfo " CD ${cdcnt}: ${!var}" 1274 [[ ! -z ${!var} ]] && einfo " CD ${cdcnt}: ${!var}"
1308 done 1275 done
1309 echo 1276 echo
1310 einfo "If you do not have the CDs, but have the data files" 1277 einfo "If you do not have the CDs, but have the data files"
1311 einfo "mounted somewhere on your filesystem, just export" 1278 einfo "mounted somewhere on your filesystem, just export"
1312 einfo "the following variables so they point to the right place:" 1279 einfo "the following variables so they point to the right place:"
1313 einfon "" 1280 einfon ""
1314 cdcnt=0 1281 cdcnt=0
1315 while [ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ] ; do 1282 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1316 cdcnt=$((cdcnt + 1)) 1283 cdcnt=$((cdcnt + 1))
1317 echo -n " CD_ROOT_${cdcnt}" 1284 echo -n " CD_ROOT_${cdcnt}"
1318 done 1285 done
1319 echo 1286 echo
1320 einfo "Or, if you have all the files in the same place, or" 1287 einfo "Or, if you have all the files in the same place, or"
1321 einfo "you only have one cdrom, you can export CD_ROOT" 1288 einfo "you only have one cdrom, you can export CD_ROOT"
1322 einfo "and that place will be used as the same data source" 1289 einfo "and that place will be used as the same data source"
1323 einfo "for all the CDs." 1290 einfo "for all the CDs."
1324 echo 1291 echo
1292 einfo "For example:"
1293 einfo "export CD_ROOT_1=/mnt/cdrom"
1294 echo
1325 fi 1295 fi
1326 export CDROM_CURRENT_CD=0 1296 export CDROM_CURRENT_CD=0
1327 cdrom_load_next_cd 1297 cdrom_load_next_cd
1328} 1298}
1329 1299
1333# remember, you can only go forward in the cd chain, you can't go back. 1303# remember, you can only go forward in the cd chain, you can't go back.
1334cdrom_load_next_cd() { 1304cdrom_load_next_cd() {
1335 export CDROM_CURRENT_CD=$((CDROM_CURRENT_CD + 1)) 1305 export CDROM_CURRENT_CD=$((CDROM_CURRENT_CD + 1))
1336 local var= 1306 local var=
1337 1307
1338 if [ ! -z "${CD_ROOT}" ] ; then 1308 if [[ ! -z ${CD_ROOT} ]] ; then
1339 einfo "Using same root as before for CD #${CDROM_CURRENT_CD}" 1309 einfo "Using same root as before for CD #${CDROM_CURRENT_CD}"
1340 return 1310 return
1341 fi 1311 fi
1342 1312
1343 unset CDROM_ROOT 1313 unset CDROM_ROOT
1344 var=CDROM_ROOTS_${CDROM_CURRENT_CD} 1314 var=CDROM_ROOTS_${CDROM_CURRENT_CD}
1345 if [ -z "${!var}" ] ; then 1315 if [[ -z ${!var} ]] ; then
1346 var="CDROM_CHECK_${CDROM_CURRENT_CD}" 1316 var="CDROM_CHECK_${CDROM_CURRENT_CD}"
1347 cdrom_locate_file_on_cd ${!var} 1317 cdrom_locate_file_on_cd ${!var}
1348 else 1318 else
1349 export CDROM_ROOT="${!var}" 1319 export CDROM_ROOT=${!var}
1350 fi 1320 fi
1351 1321
1352 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1322 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1353} 1323}
1354 1324
1358# found, then a message asking for the user to insert the cdrom will be 1328# found, then a message asking for the user to insert the cdrom will be
1359# displayed and we'll hang out here until: 1329# displayed and we'll hang out here until:
1360# (1) the file is found on a mounted cdrom 1330# (1) the file is found on a mounted cdrom
1361# (2) the user hits CTRL+C 1331# (2) the user hits CTRL+C
1362cdrom_locate_file_on_cd() { 1332cdrom_locate_file_on_cd() {
1363 while [ -z "${CDROM_ROOT}" ] ; do 1333 while [[ -z ${CDROM_ROOT} ]] ; do
1364 local dir="$(dirname ${@})" 1334 local dir="$(dirname ${@})"
1365 local file="$(basename ${@})" 1335 local file="$(basename ${@})"
1366 local mline="" 1336 local mline=""
1367 local showedmsg=0 1337 local showedmsg=0
1368 1338
1369 for mline in `mount | egrep -e '(iso|cdrom)' | awk '{print $3}'` ; do 1339 for mline in $(mount | egrep -e '(iso|cdrom)' | awk '{print $3}') ; do
1370 [ -d "${mline}/${dir}" ] || continue 1340 [[ -d ${mline}/${dir} ]] || continue
1371 [ ! -z "$(find ${mline}/${dir} -iname ${file} -maxdepth 1)" ] \ 1341 [[ ! -z $(find ${mline}/${dir} -maxdepth 1 -iname ${file}) ]] \
1372 && export CDROM_ROOT=${mline} 1342 && export CDROM_ROOT=${mline}
1373 done 1343 done
1374 1344
1375 if [ -z "${CDROM_ROOT}" ] ; then 1345 if [[ -z ${CDROM_ROOT} ]] ; then
1376 echo 1346 echo
1377 if [ ${showedmsg} -eq 0 ] ; then 1347 if [[ ${showedmsg} -eq 0 ]] ; then
1378 if [ ${CDROM_TOTAL_CDS} -eq 1 ] ; then 1348 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1379 if [ -z "${CDROM_NAME}" ] ; then 1349 if [[ -z ${CDROM_NAME} ]] ; then
1380 einfo "Please insert the cdrom for ${PN} now !" 1350 einfo "Please insert the cdrom for ${PN} now !"
1381 else 1351 else
1382 einfo "Please insert the ${CDROM_NAME} cdrom now !" 1352 einfo "Please insert the ${CDROM_NAME} cdrom now !"
1383 fi 1353 fi
1384 else 1354 else
1385 if [ -z "${CDROM_NAME_1}" ] ; then 1355 if [[ -z ${CDROM_NAME_1} ]] ; then
1386 einfo "Please insert cd #${CDROM_CURRENT_CD} for ${PN} now !" 1356 einfo "Please insert cd #${CDROM_CURRENT_CD} for ${PN} now !"
1387 else 1357 else
1388 local var="CDROM_NAME_${CDROM_CURRENT_CD}" 1358 local var="CDROM_NAME_${CDROM_CURRENT_CD}"
1389 einfo "Please insert+mount the ${!var} cdrom now !" 1359 einfo "Please insert+mount the ${!var} cdrom now !"
1390 fi 1360 fi
1391 fi 1361 fi
1392 showedmsg=1 1362 showedmsg=1
1393 fi 1363 fi
1394 einfo "Press return to scan for the cd again" 1364 einfo "Press return to scan for the cd again"
1395 einfo "or hit CTRL+C to abort the emerge." 1365 einfo "or hit CTRL+C to abort the emerge."
1366 echo
1367 einfo "If you are having trouble with the detection"
1368 einfo "of your CD, it is possible that you do not have"
1369 einfo "Joliet support enabled in your kernel. Please"
1370 einfo "check that CONFIG_JOLIET is enabled in your kernel."
1396 read 1371 read
1397 fi 1372 fi
1398 done 1373 done
1399} 1374}
1400 1375
1410# directories and uses the intersection of the lists. 1385# directories and uses the intersection of the lists.
1411# The -u builds a list of po files found in all the 1386# The -u builds a list of po files found in all the
1412# directories and uses the union of the lists. 1387# directories and uses the union of the lists.
1413strip-linguas() { 1388strip-linguas() {
1414 local ls newls 1389 local ls newls
1415 if [ "$1" == "-i" ] || [ "$1" == "-u" ] ; then 1390 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then
1416 local op="$1"; shift 1391 local op=$1; shift
1417 ls=" $(find "$1" -name '*.po' -printf '%f ') "; shift 1392 ls=" $(find "$1" -name '*.po' -printf '%f ') "; shift
1418 local d f 1393 local d f
1419 for d in "$@" ; do 1394 for d in "$@" ; do
1420 if [ "${op}" == "-u" ] ; then 1395 if [[ ${op} == "-u" ]] ; then
1421 newls="${ls}" 1396 newls=${ls}
1422 else 1397 else
1423 newls="" 1398 newls=""
1424 fi 1399 fi
1425 for f in $(find "$d" -name '*.po' -printf '%f ') ; do 1400 for f in $(find "$d" -name '*.po' -printf '%f ') ; do
1426 if [ "${op}" == "-i" ] ; then 1401 if [[ ${op} == "-i" ]] ; then
1427 [ "${ls/ ${f} /}" != "${ls}" ] && newls="${newls} ${f}" 1402 [[ ${ls/ ${f} /} != ${ls} ]] && newls="${newls} ${f}"
1428 else 1403 else
1429 [ "${ls/ ${f} /}" == "${ls}" ] && newls="${newls} ${f}" 1404 [[ ${ls/ ${f} /} == ${ls} ]] && newls="${newls} ${f}"
1430 fi 1405 fi
1431 done 1406 done
1432 ls="${newls}" 1407 ls=${newls}
1433 done 1408 done
1434 ls="${ls//.po}" 1409 ls=${ls//.po}
1435 else 1410 else
1436 ls="$@" 1411 ls=$@
1437 fi 1412 fi
1438 1413
1439 ls=" ${ls} " 1414 ls=" ${ls} "
1440 newls="" 1415 newls=""
1441 for f in ${LINGUAS} ; do 1416 for f in ${LINGUAS} ; do
1442 if [ "${ls/ ${f} /}" != "${ls}" ] ; then 1417 if [[ ${ls/ ${f} /} != ${ls} ]] ; then
1443 newls="${newls} ${f}" 1418 newls="${newls} ${f}"
1444 else 1419 else
1445 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA" 1420 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA"
1446 fi 1421 fi
1447 done 1422 done
1448 if [ -z "${newls}" ] ; then 1423 if [[ -z ${newls} ]] ; then
1449 unset LINGUAS 1424 export LINGUAS=""
1450 else 1425 else
1451 export LINGUAS="${newls}" 1426 export LINGUAS=${newls:1}
1452 fi 1427 fi
1453} 1428}
1454 1429
1455# moved from kernel.eclass since they are generally useful outside of 1430# moved from kernel.eclass since they are generally useful outside of
1456# kernel.eclass -iggy (20041002) 1431# kernel.eclass -iggy (20041002)
1458# the following functions are useful in kernel module ebuilds, etc. 1433# the following functions are useful in kernel module ebuilds, etc.
1459# for an example see ivtv or drbd ebuilds 1434# for an example see ivtv or drbd ebuilds
1460 1435
1461# set's ARCH to match what the kernel expects 1436# set's ARCH to match what the kernel expects
1462set_arch_to_kernel() { 1437set_arch_to_kernel() {
1438 i=10
1439 while ((i--)) ; do
1440 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass"
1441 done
1463 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}" 1442 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}"
1464 case ${ARCH} in 1443 case ${ARCH} in
1465 x86) export ARCH="i386";; 1444 x86) export ARCH="i386";;
1466 amd64) export ARCH="x86_64";; 1445 amd64) export ARCH="x86_64";;
1467 hppa) export ARCH="parisc";; 1446 hppa) export ARCH="parisc";;
1468 mips) export ARCH="mips";; 1447 mips) export ARCH="mips";;
1448 sparc) export ARCH="$(tc-arch-kernel)";; # Yeah this is ugly, but it's even WORSE if you don't do this. linux-info.eclass's set_arch_to_kernel is fixed, but won't get used over this one!
1469 *) export ARCH="${ARCH}";; 1449 *) export ARCH="${ARCH}";;
1470 esac 1450 esac
1471} 1451}
1472 1452
1473# set's ARCH back to what portage expects 1453# set's ARCH back to what portage expects
1474set_arch_to_portage() { 1454set_arch_to_portage() {
1455 i=10
1456 while ((i--)) ; do
1457 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass"
1458 done
1475 export ARCH="${EUTILS_ECLASS_PORTAGE_ARCH}" 1459 export ARCH="${EUTILS_ECLASS_PORTAGE_ARCH}"
1476} 1460}
1477 1461
1478# Jeremy Huddleston <eradicator@gentoo.org>: 1462# Jeremy Huddleston <eradicator@gentoo.org>:
1479# preserve_old_lib /path/to/libblah.so.0 1463# preserve_old_lib /path/to/libblah.so.0
1509 touch ${D}${LIB} 1493 touch ${D}${LIB}
1510 fi 1494 fi
1511} 1495}
1512 1496
1513preserve_old_lib_notify() { 1497preserve_old_lib_notify() {
1514 LIB=$1 1498 LIB=$1
1515 1499
1516 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then 1500 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then
1517 SONAME=`basename ${LIB}` 1501 SONAME=`basename ${LIB}`
1518 1502
1519 einfo "An old version of an installed library was detected on your system." 1503 einfo "An old version of an installed library was detected on your system."
1520 einfo "In order to avoid breaking packages that link against is, this older version" 1504 einfo "In order to avoid breaking packages that link against it, this older version"
1521 einfo "is not being removed. In order to make full use of this newer version," 1505 einfo "is not being removed. In order to make full use of this newer version,"
1522 einfo "you will need to execute the following command:" 1506 einfo "you will need to execute the following command:"
1523 einfo " revdep-rebuild --soname ${SONAME}" 1507 einfo " revdep-rebuild --soname ${SONAME}"
1524 einfo 1508 einfo
1525 einfo "After doing that, you can safely remove ${LIB}" 1509 einfo "After doing that, you can safely remove ${LIB}"
1526 einfo "Note: 'emerge gentoolkit' to get revdep-rebuild" 1510 einfo "Note: 'emerge gentoolkit' to get revdep-rebuild"
1527 fi 1511 fi
1528} 1512}
1529 1513
1530# Hack for people to figure out if a package was built with 1514# Hack for people to figure out if a package was built with
1531# certain USE flags 1515# certain USE flags
1532# 1516#
1533# Usage: built_with_use <DEPEND ATOM> <List of USE flags> 1517# Usage: built_with_use [-a|-o] <DEPEND ATOM> <List of USE flags>
1534# ex: built_with_use xchat gtk2 1518# ex: built_with_use xchat gtk2
1519#
1520# Flags: -a all USE flags should be utilized
1521# -o at least one USE flag should be utilized
1522# Note: the default flag is '-a'
1535built_with_use() { 1523built_with_use() {
1524 local opt=$1
1525 [[ ${opt:0:1} = "-" ]] && shift || opt="-a"
1526
1536 local PKG=$(portageq best_version ${ROOT} $1) 1527 local PKG=$(best_version $1)
1528 shift
1529
1537 local USEFILE="${ROOT}/var/db/pkg/${PKG}/USE" 1530 local USEFILE="${ROOT}/var/db/pkg/${PKG}/USE"
1538 [[ ! -e ${USEFILE} ]] && return 1 1531 [[ ! -e ${USEFILE} ]] && return 1
1539 1532
1540 local USE_BUILT=$(<${USEFILE}) 1533 local USE_BUILT=$(<${USEFILE})
1541
1542 shift
1543 while [ $# -gt 0 ] ; do 1534 while [[ $# -gt 0 ]] ; do
1535 if [[ ${opt} = "-o" ]] ; then
1536 has $1 ${USE_BUILT} && return 0
1537 else
1544 has $1 ${USE_BUILT} || return 1 1538 has $1 ${USE_BUILT} || return 1
1539 fi
1545 shift 1540 shift
1546 done 1541 done
1547 return 0 1542 [[ ${opt} = "-a" ]]
1548} 1543}
1549 1544
1550# Many configure scripts wrongly bail when a C++ compiler 1545# Many configure scripts wrongly bail when a C++ compiler
1551# could not be detected. #73450 1546# could not be detected. #73450
1552epunt_cxx() { 1547epunt_cxx() {
1553 local dir=$1 1548 local dir=$1
1554 [[ -z ${dir} ]] && dir=${S} 1549 [[ -z ${dir} ]] && dir=${S}
1555 ebegin "Removing useless C++ checks" 1550 ebegin "Removing useless C++ checks"
1558 patch -p0 "${f}" "${PORTDIR}/eclass/ELT-patches/nocxx/nocxx.patch" > /dev/null 1553 patch -p0 "${f}" "${PORTDIR}/eclass/ELT-patches/nocxx/nocxx.patch" > /dev/null
1559 done 1554 done
1560 eend 0 1555 eend 0
1561} 1556}
1562 1557
1563# get_abi_var <VAR> [<ABI>] 1558# dopamd <file> [more files]
1564# returns the value of ${<VAR>_<ABI>} which should be set in make.defaults
1565# 1559#
1566# This code is for testing purposes only with the sparc64-multilib ${PROFILE_ARCH} 1560# Install pam auth config file in /etc/pam.d
1567# and getting a more multilib-aware portage layout. It may end up being used, but for now 1561dopamd() {
1568# it is subject to removal if a better way is worked out. 1562 [[ -z $1 ]] && die "dopamd requires at least one argument"
1569#
1570# ex:
1571# CFLAGS=$(get_abi_var CFLAGS sparc32) # CFLAGS=-m32
1572#
1573# Note that the prefered method is to set CC="$(tc-getCC) $(get_abi_CFLAGS)"
1574# This will hopefully be added to portage soon...
1575#
1576# If <ABI> is not specified, ${ABI} is used.
1577# If <ABI> is not specified and ${ABI} is not defined, ${DEFAULT_ABI} is used.
1578# If <ABI> is not specified and ${ABI} and ${DEFAULT_ABI} are not defined, we return an empty string.
1579#
1580# Jeremy Huddleston <eradicator@gentoo.org>
1581get_abi_var() {
1582 local flag=$1
1583 local abi
1584 if [ $# -gt 1 ]; then
1585 abi=$1
1586 elif [ -n "${ABI}" ]; then
1587 abi=${ABI}
1588 elif [ -n "${DEFAULT_ABI}" ]; then
1589 abi=${DEFAULT_ABI}
1590 else
1591 return ""
1592 fi
1593 eval echo \${${flag}_${abi}}
1594}
1595 1563
1596get_abi_CFLAGS() { get_abi_var CFLAGS $1; } 1564 use pam || return 0
1597get_abi_CXXFLAGS() { get_abi_var CXXFLAGS $1; }
1598get_abi_ASFLAGS() { get_abi_var ASFLAGS $1; }
1599get_abi_LIBDIR() { get_abi_var LIBDIR $1; }
1600 1565
1566 INSDESTTREE=/etc/pam.d \
1567 doins "$@" || die "failed to install $@"
1568}
1569# newpamd <old name> <new name>
1570#
1571# Install pam file <old name> as <new name> in /etc/pam.d
1572newpamd() {
1573 [[ $# -ne 2 ]] && die "newpamd requires two arguements"
1574
1575 use pam || return 0
1576
1577 INSDESTTREE=/etc/pam.d \
1578 newins "$1" "$2" || die "failed to install $1 as $2"
1579}
1580
1581# make a wrapper script ...
1582# NOTE: this was originally games_make_wrapper, but I noticed other places where
1583# this could be used, so I have moved it here and made it not games-specific
1584# -- wolf31o2
1585# $1 == wrapper name
1586# $2 == binary to run
1587# $3 == directory to chdir before running binary
1588# $4 == extra LD_LIBRARY_PATH's (make it : delimited)
1589# $5 == path for wrapper
1590make_wrapper() {
1591 local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5
1592 local tmpwrapper=$(emktemp)
1593 cat << EOF > "${tmpwrapper}"
1594#!/bin/sh
1595cd "${chdir}"
1596export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${libdir}"
1597exec ${bin} "\$@"
1598EOF
1599 chmod go+rx "${tmpwrapper}"
1600 if [ -n "${5}" ]
1601 then
1602 exeinto ${5}
1603 newexe "${tmpwrapper}" "${wrapper}"
1604 else
1605 newbin "${tmpwrapper}" "${wrapper}"
1606 fi
1607}

Legend:
Removed from v.1.128  
changed lines
  Added in v.1.188

  ViewVC Help
Powered by ViewVC 1.1.20