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

Diff of /eclass/eutils.eclass

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

Revision 1.157 Revision 1.176
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/eutils.eclass,v 1.157 2005/03/07 17:45:07 carlo Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.176 2005/05/25 22:07:31 vapier 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.
14INHERITED="$INHERITED $ECLASS" 14INHERITED="$INHERITED $ECLASS"
15 15
16DEPEND="!bootstrap? ( sys-devel/patch )" 16DEPEND="!bootstrap? ( sys-devel/patch )"
17 17
18DESCRIPTION="Based on the ${ECLASS} eclass" 18DESCRIPTION="Based on the ${ECLASS} eclass"
19
20# ecpu_check
21# Usage:
22#
23# ecpu_check array_of_cpu_flags
24#
25# array_of_cpu_flags - An array of cpu flags to check against USE flags
26#
27# Checks user USE related cpu flags against /proc/cpuinfo. If user enables a
28# cpu flag that is not supported in their processor flags, it will warn the
29# user if CROSSCOMPILE is not set to 1 ( because cross compile users are
30# obviously using different cpu flags than their own cpu ). Examples:
31#
32# CPU_FLAGS=(mmx mmx2 sse sse2)
33# ecpu_check CPU_FLAGS
34# Chris White <chriswhite@gentoo.org> (03 Feb 2005)
35
36ecpu_check() {
37 # Think about changing below to: if [ "${CROSSCOMPILE}" -ne 1 -a -e "/proc/cpuinfo" ]
38 # and dropping the else if you do not plan on adding anything to that
39 # empty block ....
40 # PS: also try to add some quoting, and consider rather using ${foo} than $foo ...
41 if [ "${CROSSCOMPILE}" != "1" -a -e "/proc/cpuinfo" ]
42 then
43 CPU_FLAGS=${1}
44 USER_CPU=`grep "flags" /proc/cpuinfo`
45
46 for flags in `seq 1 ${#CPU_FLAGS[@]}`
47 do
48 if has ${CPU_FLAGS[${flags} - 1]} ${USER_CPU} && ! has ${CPU_FLAGS[${flags} - 1]} ${USE}
49 then
50 ewarn "Your system is ${CPU_FLAGS[${flags} - 1]} capable but you don't have it enabled!"
51 ewarn "You might be cross compiling (in this case set CROSSCOMPILE to 1 to disable this warning."
52 fi
53
54 if ! has ${CPU_FLAGS[${flags} - 1]} ${USER_CPU} && has ${CPU_FLAGS[${flags} -1]} ${USE}
55 then
56 ewarn "You have ${CPU_FLAGS[${flags} - 1]} support enabled but your processor doesn't"
57 ewarn "Seem to support it! You might be cross compiling or do not have /proc filesystem"
58 ewarn "enabled. If either is the case, set CROSSCOMPILE to 1 to disable this warning."
59 fi
60 done
61 fi
62}
63 19
64# Wait for the supplied number of seconds. If no argument is supplied, defaults 20# Wait for the supplied number of seconds. If no argument is supplied, defaults
65# to five seconds. If the EPAUSE_IGNORE env var is set, don't wait. If we're not 21# to five seconds. If the EPAUSE_IGNORE env var is set, don't wait. If we're not
66# outputting to a terminal, don't wait. For compatability purposes, the argument 22# outputting to a terminal, don't wait. For compatability purposes, the argument
67# must be an integer greater than zero. 23# must be an integer greater than zero.
109gen_usr_ldscript() { 65gen_usr_ldscript() {
110 local libdir="$(get_libdir)" 66 local libdir="$(get_libdir)"
111 # Just make sure it exists 67 # Just make sure it exists
112 dodir /usr/${libdir} 68 dodir /usr/${libdir}
113 69
70 for lib in "${@}" ; do
114 cat > "${D}/usr/${libdir}/${1}" << END_LDSCRIPT 71 cat > "${D}/usr/${libdir}/${lib}" <<-END_LDSCRIPT
115/* GNU ld script 72 /* GNU ld script
116 Because Gentoo have critical dynamic libraries 73 Since Gentoo has critical dynamic libraries
117 in /lib, and the static versions in /usr/lib, we 74 in /lib, and the static versions in /usr/lib,
118 need to have a "fake" dynamic lib in /usr/lib, 75 we need to have a "fake" dynamic lib in /usr/lib,
119 otherwise we run into linking problems. 76 otherwise we run into linking problems.
120 See bug #4411 on http://bugs.gentoo.org/ for 77
121 more info. */ 78 See bug http://bugs.gentoo.org/4411 for more info.
79 */
122GROUP ( /${libdir}/${1} ) 80 GROUP ( /${libdir}/${lib} )
123END_LDSCRIPT 81 END_LDSCRIPT
124 fperms a+x "/usr/${libdir}/${1}" 82 fperms a+x "/usr/${libdir}/${lib}"
83 done
125} 84}
126 85
127# Simple function to draw a line consisting of '=' the same length as $* 86# Simple function to draw a line consisting of '=' the same length as $*
87# - only to be used by epatch()
128# 88#
129# <azarah@gentoo.org> (11 Nov 2002) 89# <azarah@gentoo.org> (11 Nov 2002)
130# 90#
131draw_line() { 91draw_line() {
132 local i=0 92 local i=0
158EPATCH_SOURCE="${WORKDIR}/patch" 118EPATCH_SOURCE="${WORKDIR}/patch"
159# Default extension for patches 119# Default extension for patches
160EPATCH_SUFFIX="patch.bz2" 120EPATCH_SUFFIX="patch.bz2"
161# Default options for patch 121# Default options for patch
162# Set -g0 to keep RCS, ClearCase, Perforce and SCCS happy. Bug #24571 122# Set -g0 to keep RCS, ClearCase, Perforce and SCCS happy. Bug #24571
163EPATCH_OPTS="-g0" 123# Set --no-backup-if-mismatch so we don't leave '.orig' files behind.
124EPATCH_OPTS="-g0 --no-backup-if-mismatch"
164# List of patches not to apply. Not this is only file names, 125# List of patches not to apply. Not this is only file names,
165# and not the full path .. 126# and not the full path ..
166EPATCH_EXCLUDE="" 127EPATCH_EXCLUDE=""
167# Change the printed message for a single patch. 128# Change the printed message for a single patch.
168EPATCH_SINGLE_MSG="" 129EPATCH_SINGLE_MSG=""
130# Change the printed message for multiple patches.
131EPATCH_MULTI_MSG="Applying various patches (bugfixes/updates) ..."
169# Force applying bulk patches even if not following the style: 132# Force applying bulk patches even if not following the style:
170# 133#
171# ??_${ARCH}_foo.${EPATCH_SUFFIX} 134# ??_${ARCH}_foo.${EPATCH_SUFFIX}
172# 135#
173EPATCH_FORCE="no" 136EPATCH_FORCE="no"
214 local x="" 177 local x=""
215 178
216 if [ "$#" -gt 1 ] 179 if [ "$#" -gt 1 ]
217 then 180 then
218 local m="" 181 local m=""
219 einfo "${#} patches to apply ..."
220 for m in "$@" ; do 182 for m in "$@" ; do
221 epatch "${m}" 183 epatch "${m}"
222 done 184 done
223 return 0 185 return 0
224 fi 186 fi
278 ;; 240 ;;
279 esac 241 esac
280 242
281 if [ "${SINGLE_PATCH}" = "no" ] 243 if [ "${SINGLE_PATCH}" = "no" ]
282 then 244 then
283 einfo "Applying various patches (bugfixes/updates) ..." 245 einfo "${EPATCH_MULTI_MSG}"
284 fi 246 fi
285 for x in ${EPATCH_SOURCE} 247 for x in ${EPATCH_SOURCE}
286 do 248 do
287 # New ARCH dependant patch naming scheme ... 249 # New ARCH dependant patch naming scheme ...
288 # 250 #
386 fi 348 fi
387 349
388 if [ "${count}" -eq 5 ] 350 if [ "${count}" -eq 5 ]
389 then 351 then
390 echo 352 echo
391 eerror "Failed Patch: ${patchname}!" 353 eerror "Failed Patch: ${patchname} !"
354 eerror " ( ${PATCH_TARGET} )"
392 eerror 355 eerror
393 eerror "Include in your bugreport the contents of:" 356 eerror "Include in your bugreport the contents of:"
394 eerror 357 eerror
395 eerror " ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}" 358 eerror " ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}"
396 echo 359 echo
403 fi 366 fi
404 done 367 done
405 if [ "${SINGLE_PATCH}" = "no" ] 368 if [ "${SINGLE_PATCH}" = "no" ]
406 then 369 then
407 einfo "Done with patching" 370 einfo "Done with patching"
408 fi
409}
410
411# This function return true if we are using the NPTL pthreads
412# implementation.
413#
414# <azarah@gentoo.org> (06 March 2003)
415#
416have_NPTL() {
417 cat > ${T}/test-nptl.c <<-"END"
418 #define _XOPEN_SOURCE
419 #include <unistd.h>
420 #include <stdio.h>
421
422 int main()
423 {
424 char buf[255];
425 char *str = buf;
426
427 confstr(_CS_GNU_LIBPTHREAD_VERSION, str, 255);
428 if (NULL != str) {
429 printf("%s\n", str);
430 if (NULL != strstr(str, "NPTL"))
431 return 0;
432 }
433
434 return 1;
435 }
436 END
437
438 einfon "Checking for _CS_GNU_LIBPTHREAD_VERSION support in glibc ..."
439 if gcc -o ${T}/nptl ${T}/test-nptl.c &> /dev/null
440 then
441 echo "yes"
442 einfon "Checking what PTHREADS implementation we have ..."
443 if ${T}/nptl
444 then
445 return 0
446 else
447 return 1
448 fi
449 else
450 echo "no"
451 fi
452
453 return 1
454}
455
456# This function check how many cpu's are present, and then set
457# -j in MAKEOPTS accordingly.
458#
459# Thanks to nall <nall@gentoo.org> for this.
460#
461get_number_of_jobs() {
462 local jobs=0
463
464 if [ ! -r /proc/cpuinfo ]
465 then
466 return 1
467 fi
468
469 # This bit is from H?kan Wessberg <nacka-gentoo@refug.org>, bug #13565.
470 if [ "`egrep "^[[:space:]]*MAKEOPTS=" /etc/make.conf | wc -l`" -gt 0 ]
471 then
472 ADMINOPTS="`egrep "^[[:space:]]*MAKEOPTS=" /etc/make.conf | cut -d= -f2 | sed 's/\"//g'`"
473 ADMINPARAM="`echo ${ADMINOPTS} | gawk '{match($0, /-j *[0-9]*/, opt); print opt[0]}'`"
474 ADMINPARAM="${ADMINPARAM/-j}"
475 fi
476
477 export MAKEOPTS="`echo ${MAKEOPTS} | sed -e 's:-j *[0-9]*::g'`"
478
479 if [ "${ARCH}" = "amd64" -o "${ARCH}" = "x86" -o "${ARCH}" = "hppa" -o \
480 "${ARCH}" = "arm" -o "${ARCH}" = "mips" -o "${ARCH}" = "ia64" ]
481 then
482 # these archs will always have "[Pp]rocessor"
483 jobs="$((`grep -c ^[Pp]rocessor /proc/cpuinfo` * 2))"
484
485 elif [ "${ARCH}" = "sparc" -o "${ARCH}" = "sparc64" ]
486 then
487 # sparc always has "ncpus active"
488 jobs="$((`grep "^ncpus active" /proc/cpuinfo | sed -e "s/^.*: //"` * 2))"
489
490 elif [ "${ARCH}" = "alpha" ]
491 then
492 # alpha has "cpus active", but only when compiled with SMP
493 if [ "`grep -c "^cpus active" /proc/cpuinfo`" -eq 1 ]
494 then
495 jobs="$((`grep "^cpus active" /proc/cpuinfo | sed -e "s/^.*: //"` * 2))"
496 else
497 jobs=2
498 fi
499
500 elif [ "${ARCH}" = "ppc" -o "${ARCH}" = "ppc64" ]
501 then
502 # ppc has "processor", but only when compiled with SMP
503 if [ "`grep -c "^processor" /proc/cpuinfo`" -eq 1 ]
504 then
505 jobs="$((`grep -c ^processor /proc/cpuinfo` * 2))"
506 else
507 jobs=2
508 fi
509 elif [ "${ARCH}" = "s390" ]
510 then
511 # s390 has "# processors : "
512 jobs="$((`grep "^\# processors" /proc/cpuinfo | sed -e "s/^.*: //"` * 2))"
513 else
514 jobs="$((`grep -c ^cpu /proc/cpuinfo` * 2))"
515 die "Unknown ARCH -- ${ARCH}!"
516 fi
517
518 # Make sure the number is valid ...
519 if [ "${jobs}" -lt 1 ]
520 then
521 jobs=1
522 fi
523
524 if [ -n "${ADMINPARAM}" ]
525 then
526 if [ "${jobs}" -gt "${ADMINPARAM}" ]
527 then
528 einfo "Setting make jobs to \"-j${ADMINPARAM}\" to ensure successful merge ..."
529 export MAKEOPTS="${MAKEOPTS} -j${ADMINPARAM}"
530 else
531 einfo "Setting make jobs to \"-j${jobs}\" to ensure successful merge ..."
532 export MAKEOPTS="${MAKEOPTS} -j${jobs}"
533 fi
534 fi 371 fi
535} 372}
536 373
537# Cheap replacement for when debianutils (and thus mktemp) 374# Cheap replacement for when debianutils (and thus mktemp)
538# does not exist on the users system 375# does not exist on the users system
682 einfo " - Shell: ${eshell}" 519 einfo " - Shell: ${eshell}"
683 opts="${opts} -s ${eshell}" 520 opts="${opts} -s ${eshell}"
684 521
685 # handle homedir 522 # handle homedir
686 local ehome="$1"; shift 523 local ehome="$1"; shift
687 if [ -z "${ehome}" ] && [ "${eshell}" != "-1" ] 524 if [ -z "${ehome}" ] || [ "${eshell}" == "-1" ]
688 then 525 then
689 ehome="/dev/null" 526 ehome="/dev/null"
690 fi 527 fi
691 einfo " - Home: ${ehome}" 528 einfo " - Home: ${ehome}"
692 opts="${opts} -d ${ehome}" 529 opts="${opts} -d ${ehome}"
912# a full path to an icon 749# a full path to an icon
913# type: what kind of application is this ? for categories: 750# type: what kind of application is this ? for categories:
914# http://www.freedesktop.org/wiki/Standards_2fmenu_2dspec 751# http://www.freedesktop.org/wiki/Standards_2fmenu_2dspec
915# path: if your app needs to startup in a specific dir 752# path: if your app needs to startup in a specific dir
916make_desktop_entry() { 753make_desktop_entry() {
917 [ -z "$1" ] && eerror "make_desktop_entry: You must specify the executable" && return 1 754 [[ -z $1 ]] && eerror "make_desktop_entry: You must specify the executable" && return 1
918 755
919 local exec="${1}" 756 local exec=${1}
920 local name="${2:-${PN}}" 757 local name=${2:-${PN}}
921 local icon="${3:-${PN}.png}" 758 local icon=${3:-${PN}.png}
922 local type="${4}" 759 local type=${4}
923 local subdir="${6}" 760 local path=${5}
924 local path="${5:-${GAMES_BINDIR}}" 761
925 if [ -z "${type}" ] 762 if [[ -z ${type} ]] ; then
926 then 763 local catmaj=${CATEGORY%%-*}
927 case ${CATEGORY} in 764 local catmin=${CATEGORY##*-}
928 "app-emulation") 765 case ${catmaj} in
929 type=Emulator 766 app)
930 subdir="Emulation" 767 case ${catmin} in
768 admin) type=System;;
769 cdr) type=DiscBurning;;
770 dicts) type=Dictionary;;
771 editors) type=TextEditor;;
772 emacs) type=TextEditor;;
773 emulation) type=Emulator;;
774 laptop) type=HardwareSettings;;
775 office) type=Office;;
776 vim) type=TextEditor;;
777 xemacs) type=TextEditor;;
778 *) type=;;
779 esac
931 ;; 780 ;;
932 "games-"*) 781
933 type=Game 782 dev)
934 subdir="Games" 783 type="Development"
935 ;; 784 ;;
936 "net-"*) 785
937 type=Network 786 games)
938 subdir="${type}" 787 [[ -z ${path} ]] && path=${GAMES_BINDIR}
788
789 case ${catmin} in
790 action) type=ActionGame;;
791 arcade) type=ArcadeGame;;
792 board) type=BoardGame;;
793 kid) type=KidsGame;;
794 emulation) type=Emulator;;
795 puzzle) type=LogicGame;;
796 rpg) type=RolePlaying;;
797 roguelike) type=RolePlaying;;
798 simulation) type=Simulation;;
799 sports) type=SportsGame;;
800 strategy) type=StrategyGame;;
801 *) type=;;
802 esac
803 type="Game;${type}"
939 ;; 804 ;;
805
806 mail)
807 type="Network;Email"
808 ;;
809
810 media)
811 case ${catmin} in
812 gfx) type=Graphics;;
813 radio) type=Tuner;;
814 sound) type=Audio;;
815 tv) type=TV;;
816 video) type=Video;;
817 *) type=;;
818 esac
819 type="AudioVideo;${type}"
820 ;;
821
822 net)
823 case ${catmin} in
824 dialup) type=Dialup;;
825 ftp) type=FileTransfer;;
826 im) type=InstantMessaging;;
827 irc) type=IRCClient;;
828 mail) type=Email;;
829 news) type=News;;
830 nntp) type=News;;
831 p2p) type=FileTransfer;;
832 *) type=;;
833 esac
834 type="Network;${type}"
835 ;;
836
837 sci)
838 case ${catmin} in
839 astro*) type=Astronomoy;;
840 bio*) type=Biology;;
841 calc*) type=Calculator;;
842 chem*) type=Chemistry;;
843 geo*) type=Geology;;
844 math*) type=Math;;
845 *) type=;;
846 esac
847 type="Science;${type}"
848 ;;
849
850 www)
851 case ${catmin} in
852 client) type=WebBrowser;;
853 *) type=;;
854 esac
855 type="Network"
856 ;;
857
940 *) 858 *)
941 type= 859 type=
942 subdir=
943 ;; 860 ;;
944 esac 861 esac
945 fi 862 fi
863
946 local desktop="${T}/${exec%% *}-${P}.desktop" 864 local desktop=${T}/${exec%% *}-${P}.desktop
947 865
948echo "[Desktop Entry] 866echo "[Desktop Entry]
949Encoding=UTF-8 867Encoding=UTF-8
950Version=0.9.2 868Version=0.9.2
951Name=${name} 869Name=${name}
967# make_desktop_entry(<title>, <command>) 885# make_desktop_entry(<title>, <command>)
968# title: File to execute to start the Window Manager 886# title: File to execute to start the Window Manager
969# command: Name of the Window Manager 887# command: Name of the Window Manager
970 888
971make_session_desktop() { 889make_session_desktop() {
972
973 [ -z "$1" ] && eerror "make_session_desktop: You must specify the title" && return 1 890 [[ -z $1 ]] && eerror "make_session_desktop: You must specify the title" && return 1
974 [ -z "$2" ] && eerror "make_session_desktop: You must specify the command" && return 1 891 [[ -z $2 ]] && eerror "make_session_desktop: You must specify the command" && return 1
975 892
976 local title="${1}" 893 local title=$1
977 local command="${2}" 894 local command=$2
978 local desktop="${T}/${wm}.desktop" 895 local desktop=${T}/${wm}.desktop
979 896
980echo "[Desktop Entry] 897echo "[Desktop Entry]
981Encoding=UTF-8 898Encoding=UTF-8
982Name=${title} 899Name=${title}
983Comment=This session logs you into ${title} 900Comment=This session logs you into ${title}
985TryExec=${command} 902TryExec=${command}
986Type=Application" > "${desktop}" 903Type=Application" > "${desktop}"
987 904
988 insinto /usr/share/xsessions 905 insinto /usr/share/xsessions
989 doins "${desktop}" 906 doins "${desktop}"
990
991 return 0
992} 907}
993 908
994domenu() { 909domenu() {
995 local i 910 local i j
996 local j
997 insinto /usr/share/applications 911 insinto /usr/share/applications
998 for i in ${@} 912 for i in "$@" ; do
999 do
1000 if [ -f "${i}" ]; 913 if [[ -f ${i} ]] ; then
1001 then
1002 doins ${i} 914 doins "${i}"
1003 elif [ -d "${i}" ]; 915 elif [[ -d ${i} ]] ; then
1004 then
1005 for j in ${i}/*.desktop 916 for j in "${i}"/*.desktop ; do
1006 do
1007 doins ${j} 917 doins "${j}"
1008 done 918 done
1009 fi 919 fi
1010 done 920 done
1011} 921}
922newmenu() {
923 insinto /usr/share/applications
924 newins "$1" "$2"
925}
1012 926
1013doicon() { 927doicon() {
1014 local i 928 local i j
1015 local j
1016 insinto /usr/share/pixmaps 929 insinto /usr/share/pixmaps
1017 for i in ${@} 930 for i in "$@" ; do
1018 do
1019 if [ -f "${i}" ]; 931 if [[ -f ${i} ]] ; then
1020 then
1021 doins ${i} 932 doins "${i}"
1022 elif [ -d "${i}" ]; 933 elif [[ -d ${i} ]] ; then
1023 then
1024 for j in ${i}/*.png 934 for j in "${i}"/*.png ; do
1025 do
1026 doins ${j} 935 doins "${j}"
1027 done 936 done
1028 fi 937 fi
1029 done 938 done
939}
940newicon() {
941 insinto /usr/share/pixmaps
942 newins "$1" "$2"
1030} 943}
1031 944
1032############################################################## 945##############################################################
1033# END: Handle .desktop files and menu entries # 946# END: Handle .desktop files and menu entries #
1034############################################################## 947##############################################################
1435 local mline="" 1348 local mline=""
1436 local showedmsg=0 1349 local showedmsg=0
1437 1350
1438 for mline in $(mount | egrep -e '(iso|cdrom)' | awk '{print $3}') ; do 1351 for mline in $(mount | egrep -e '(iso|cdrom)' | awk '{print $3}') ; do
1439 [[ -d ${mline}/${dir} ]] || continue 1352 [[ -d ${mline}/${dir} ]] || continue
1440 [[ ! -z $(find ${mline}/${dir} -iname ${file} -maxdepth 1) ]] \ 1353 [[ ! -z $(find ${mline}/${dir} -maxdepth 1 -iname ${file}) ]] \
1441 && export CDROM_ROOT=${mline} 1354 && export CDROM_ROOT=${mline}
1442 done 1355 done
1443 1356
1444 if [[ -z ${CDROM_ROOT} ]] ; then 1357 if [[ -z ${CDROM_ROOT} ]] ; then
1445 echo 1358 echo
1513 else 1426 else
1514 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA" 1427 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA"
1515 fi 1428 fi
1516 done 1429 done
1517 if [[ -z ${newls} ]] ; then 1430 if [[ -z ${newls} ]] ; then
1518 unset LINGUAS 1431 export LINGUAS=""
1519 else 1432 else
1520 export LINGUAS=${newls:1} 1433 export LINGUAS=${newls:1}
1521 fi 1434 fi
1522} 1435}
1523 1436
1655dopamd() { 1568dopamd() {
1656 [[ -z $1 ]] && die "dopamd requires at least one argument" 1569 [[ -z $1 ]] && die "dopamd requires at least one argument"
1657 1570
1658 use pam || return 0 1571 use pam || return 0
1659 1572
1660 insinto /etc/pam.d 1573 INSDESTTREE=/etc/pam.d \
1661 # these are the default doins options, but be explicit just in case
1662 insopts -m 0644 -o root -g root
1663 doins "$@" || die "failed to install $@" 1574 doins "$@" || die "failed to install $@"
1664} 1575}
1665# newpamd <old name> <new name> 1576# newpamd <old name> <new name>
1666# 1577#
1667# Install pam file <old name> as <new name> in /etc/pam.d 1578# Install pam file <old name> as <new name> in /etc/pam.d
1668newpamd() { 1579newpamd() {
1669 [[ $# -ne 2 ]] && die "newpamd requires two arguements" 1580 [[ $# -ne 2 ]] && die "newpamd requires two arguements"
1670 1581
1671 use pam || return 0 1582 use pam || return 0
1672 1583
1673 insinto /etc/pam.d 1584 INSDESTTREE=/etc/pam.d \
1674 # these are the default doins options, but be explicit just in case
1675 insopts -m 0644 -o root -g root
1676 newins "$1" "$2" || die "failed to install $1 as $2" 1585 newins "$1" "$2" || die "failed to install $1 as $2"
1677} 1586}
1587
1588# make a wrapper script ...
1589# NOTE: this was originally games_make_wrapper, but I noticed other places where
1590# this could be used, so I have moved it here and made it not games-specific
1591# -- wolf31o2
1592# $1 == wrapper name
1593# $2 == binary to run
1594# $3 == directory to chdir before running binary
1595# $4 == extra LD_LIBRARY_PATH's (make it : delimited)
1596# $5 == path for wrapper
1597make_wrapper() {
1598 local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5
1599 local tmpwrapper=$(emktemp)
1600 cat << EOF > "${tmpwrapper}"
1601#!/bin/sh
1602cd "${chdir}"
1603export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${libdir}"
1604exec ${bin} "\$@"
1605EOF
1606 chmod go+rx "${tmpwrapper}"
1607 if [ -n "${5}" ]
1608 then
1609 exeinto ${5}
1610 newexe "${tmpwrapper}" "${wrapper}"
1611 else
1612 newbin "${tmpwrapper}" "${wrapper}"
1613 fi
1614}

Legend:
Removed from v.1.157  
changed lines
  Added in v.1.176

  ViewVC Help
Powered by ViewVC 1.1.20