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

Diff of /eclass/eutils.eclass

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

Revision 1.207 Revision 1.216
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.207 2005/10/12 13:52:01 flameeyes Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.216 2005/11/09 05:57:17 mr_bones_ 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.
166# hand its a directory, it will set EPATCH_SOURCE to this. 166# hand its a directory, it will set EPATCH_SOURCE to this.
167# 167#
168# <azarah@gentoo.org> (10 Nov 2002) 168# <azarah@gentoo.org> (10 Nov 2002)
169# 169#
170epatch() { 170epatch() {
171 _epatch_assert() { local _pipestatus=${PIPESTATUS[*]}; [[ ${_pipestatus// /} -eq 0 ]] ; }
171 local PIPE_CMD="" 172 local PIPE_CMD=""
172 local STDERR_TARGET="${T}/$$.out" 173 local STDERR_TARGET="${T}/$$.out"
173 local PATCH_TARGET="${T}/$$.patch" 174 local PATCH_TARGET="${T}/$$.patch"
174 local PATCH_SUFFIX="" 175 local PATCH_SUFFIX=""
175 local SINGLE_PATCH="no" 176 local SINGLE_PATCH="no"
313 count=5 314 count=5
314 break 315 break
315 fi 316 fi
316 fi 317 fi
317 318
318 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1 319 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f ; _epatch_assert) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1
319 then 320 then
320 draw_line "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 321 draw_line "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
321 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 322 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
322 echo "ACTUALLY APPLYING ${patchname} ..." >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 323 echo "ACTUALLY APPLYING ${patchname} ..." >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
323 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 324 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
324 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 325 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
325 326
326 cat ${PATCH_TARGET} | patch -p${count} ${popts} >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 2>&1 327 cat ${PATCH_TARGET} | patch -p${count} ${popts} >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 2>&1
328 _epatch_assert
327 329
328 if [ "$?" -ne 0 ] 330 if [ "$?" -ne 0 ]
329 then 331 then
330 cat ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 332 cat ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
331 echo 333 echo
846 type="Network;${type}" 848 type="Network;${type}"
847 ;; 849 ;;
848 850
849 sci) 851 sci)
850 case ${catmin} in 852 case ${catmin} in
851 astro*) type=Astronomoy;; 853 astro*) type=Astronomy;;
852 bio*) type=Biology;; 854 bio*) type=Biology;;
853 calc*) type=Calculator;; 855 calc*) type=Calculator;;
854 chem*) type=Chemistry;; 856 chem*) type=Chemistry;;
855 geo*) type=Geology;; 857 geo*) type=Geology;;
856 math*) type=Math;; 858 math*) type=Math;;
1008 local sizeoff_t=$2 1010 local sizeoff_t=$2
1009 1011
1010 [[ -z ${src} ]] && die "Could not locate source for '$1'" 1012 [[ -z ${src} ]] && die "Could not locate source for '$1'"
1011 [[ -z ${sizeoff_t} ]] && die "No idea what off_t size was used for this pdv :(" 1013 [[ -z ${sizeoff_t} ]] && die "No idea what off_t size was used for this pdv :("
1012 1014
1013 local shrtsrc="`basename ${src}`" 1015 local shrtsrc=$(basename "${src}")
1014 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1016 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1015 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"` 1017 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"`
1016 local tailskip=`tail -c $((${sizeoff_t}*2)) ${src} | head -c ${sizeoff_t} | hexdump -e \"%i\"` 1018 local tailskip=`tail -c $((${sizeoff_t}*2)) ${src} | head -c ${sizeoff_t} | hexdump -e \"%i\"`
1017 1019
1018 # grab metadata for debug reasons 1020 # grab metadata for debug reasons
1090 1092
1091 [[ -z ${src} ]] && die "Could not locate source for '$1'" 1093 [[ -z ${src} ]] && die "Could not locate source for '$1'"
1092 1094
1093 local shrtsrc=$(basename "${src}") 1095 local shrtsrc=$(basename "${src}")
1094 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1096 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1095 if [ -z "${skip}" ] 1097 if [[ -z ${skip} ]] ; then
1096 then
1097 local ver="`grep -a '#.*Makeself' ${src} | awk '{print $NF}'`" 1098 local ver=$(grep -a '#.*Makeself' "${src}" | awk '{print $NF}')
1098 local skip=0 1099 local skip=0
1099 exe=tail 1100 exe=tail
1100 case ${ver} in 1101 case ${ver} in
1101 1.5.*) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same 1102 1.5.*) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same
1102 skip=$(grep -a ^skip= "${src}" | cut -d= -f2) 1103 skip=$(grep -a ^skip= "${src}" | cut -d= -f2)
1114 ;; 1115 ;;
1115 2.1.3) 1116 2.1.3)
1116 skip=`grep -a ^offset= "${src}" | awk '{print $3}'` 1117 skip=`grep -a ^offset= "${src}" | awk '{print $3}'`
1117 let skip="skip + 1" 1118 let skip="skip + 1"
1118 ;; 1119 ;;
1119 2.1.4) 1120 2.1.4|2.1.5)
1120 skip=$(grep -a offset=.*head.*wc "${src}" | awk '{print $3}' | head -n 1) 1121 skip=$(grep -a offset=.*head.*wc "${src}" | awk '{print $3}' | head -n 1)
1121 skip=$(head -n ${skip} "${src}" | wc -c) 1122 skip=$(head -n ${skip} "${src}" | wc -c)
1122 exe="dd" 1123 exe="dd"
1123 ;; 1124 ;;
1124 *) 1125 *)
1243 # first we figure out how many cds we're dealing with by 1244 # first we figure out how many cds we're dealing with by
1244 # the # of files they gave us 1245 # the # of files they gave us
1245 local cdcnt=0 1246 local cdcnt=0
1246 local f= 1247 local f=
1247 for f in "$@" ; do 1248 for f in "$@" ; do
1248 cdcnt=$((cdcnt + 1)) 1249 ((++cdcnt))
1249 export CDROM_CHECK_${cdcnt}="$f" 1250 export CDROM_CHECK_${cdcnt}="$f"
1250 done 1251 done
1251 export CDROM_TOTAL_CDS=${cdcnt} 1252 export CDROM_TOTAL_CDS=${cdcnt}
1252 export CDROM_CURRENT_CD=1 1253 export CDROM_CURRENT_CD=1
1253 1254
1254 # now we see if the user gave use CD_ROOT ... 1255 # now we see if the user gave use CD_ROOT ...
1255 # if they did, let's just believe them that it's correct 1256 # if they did, let's just believe them that it's correct
1256 if [[ ! -z ${CD_ROOT} ]] ; then
1257 export CDROM_ROOT=${CD_ROOT}
1258 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1259 return
1260 fi
1261 # do the same for CD_ROOT_X
1262 if [[ ! -z ${CD_ROOT_1} ]] ; then 1257 if [[ -n ${CD_ROOT}${CD_ROOT_1} ]] ; then
1263 local var= 1258 local var=
1264 cdcnt=0 1259 cdcnt=0
1265 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1260 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1266 cdcnt=$((cdcnt + 1)) 1261 ((++cdcnt))
1267 var="CD_ROOT_${cdcnt}" 1262 var="CD_ROOT_${cdcnt}"
1263 [[ -z ${!var} ]] && var="CD_ROOT"
1268 if [[ -z ${!var} ]] ; then 1264 if [[ -z ${!var} ]] ; then
1269 eerror "You must either use just the CD_ROOT" 1265 eerror "You must either use just the CD_ROOT"
1270 eerror "or specify ALL the CD_ROOT_X variables." 1266 eerror "or specify ALL the CD_ROOT_X variables."
1271 eerror "In this case, you will need ${CDROM_TOTAL_CDS} CD_ROOT_X variables." 1267 eerror "In this case, you will need ${CDROM_TOTAL_CDS} CD_ROOT_X variables."
1272 die "could not locate CD_ROOT_${cdcnt}" 1268 die "could not locate CD_ROOT_${cdcnt}"
1273 fi 1269 fi
1274 export CDROM_ROOTS_${cdcnt}="${!var}"
1275 done 1270 done
1276 export CDROM_ROOT=${CDROM_ROOTS_1} 1271 export CDROM_ROOT=${CD_ROOT_1:-${CD_ROOT}}
1277 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1272 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1273 export CDROM_SET=-1
1274 for f in ${CDROM_CHECK_1//:/ } ; do
1275 ((++CDROM_SET))
1276 [[ -e ${CD_ROOT}/${f} ]] && break
1277 done
1278 export CDROM_MATCH=${f}
1278 return 1279 return
1279 fi 1280 fi
1280 1281
1282 # User didn't help us out so lets make sure they know they can
1283 # simplify the whole process ...
1281 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then 1284 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1282 einfon "This ebuild will need the " 1285 einfo "This ebuild will need the ${CDROM_NAME:-cdrom for ${PN}}"
1283 if [[ -z ${CDROM_NAME} ]] ; then
1284 echo "cdrom for ${PN}."
1285 else
1286 echo "${CDROM_NAME}."
1287 fi
1288 echo 1286 echo
1289 einfo "If you do not have the CD, but have the data files" 1287 einfo "If you do not have the CD, but have the data files"
1290 einfo "mounted somewhere on your filesystem, just export" 1288 einfo "mounted somewhere on your filesystem, just export"
1291 einfo "the variable CD_ROOT so that it points to the" 1289 einfo "the variable CD_ROOT so that it points to the"
1292 einfo "directory containing the files." 1290 einfo "directory containing the files."
1296 echo 1294 echo
1297 else 1295 else
1298 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds." 1296 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds."
1299 cdcnt=0 1297 cdcnt=0
1300 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1298 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1301 cdcnt=$((cdcnt + 1)) 1299 ((++cdcnt))
1302 var="CDROM_NAME_${cdcnt}" 1300 var="CDROM_NAME_${cdcnt}"
1303 [[ ! -z ${!var} ]] && einfo " CD ${cdcnt}: ${!var}" 1301 [[ ! -z ${!var} ]] && einfo " CD ${cdcnt}: ${!var}"
1304 done 1302 done
1305 echo 1303 echo
1306 einfo "If you do not have the CDs, but have the data files" 1304 einfo "If you do not have the CDs, but have the data files"
1307 einfo "mounted somewhere on your filesystem, just export" 1305 einfo "mounted somewhere on your filesystem, just export"
1308 einfo "the following variables so they point to the right place:" 1306 einfo "the following variables so they point to the right place:"
1309 einfon "" 1307 einfon ""
1310 cdcnt=0 1308 cdcnt=0
1311 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1309 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1312 cdcnt=$((cdcnt + 1)) 1310 ((++cdcnt))
1313 echo -n " CD_ROOT_${cdcnt}" 1311 echo -n " CD_ROOT_${cdcnt}"
1314 done 1312 done
1315 echo 1313 echo
1316 einfo "Or, if you have all the files in the same place, or" 1314 einfo "Or, if you have all the files in the same place, or"
1317 einfo "you only have one cdrom, you can export CD_ROOT" 1315 einfo "you only have one cdrom, you can export CD_ROOT"
1320 echo 1318 echo
1321 einfo "For example:" 1319 einfo "For example:"
1322 einfo "export CD_ROOT_1=/mnt/cdrom" 1320 einfo "export CD_ROOT_1=/mnt/cdrom"
1323 echo 1321 echo
1324 fi 1322 fi
1323
1324 export CDROM_SET=""
1325 export CDROM_CURRENT_CD=0 1325 export CDROM_CURRENT_CD=0
1326 cdrom_load_next_cd 1326 cdrom_load_next_cd
1327} 1327}
1328 1328
1329# this is only used when you need access to more than one cd. 1329# this is only used when you need access to more than one cd.
1330# when you have finished using the first cd, just call this function. 1330# when you have finished using the first cd, just call this function.
1331# when it returns, CDROM_ROOT will be pointing to the second cd. 1331# when it returns, CDROM_ROOT will be pointing to the second cd.
1332# remember, you can only go forward in the cd chain, you can't go back. 1332# remember, you can only go forward in the cd chain, you can't go back.
1333cdrom_load_next_cd() { 1333cdrom_load_next_cd() {
1334 export CDROM_CURRENT_CD=$((CDROM_CURRENT_CD + 1))
1335 local var= 1334 local var
1336 1335 ((++CDROM_CURRENT_CD))
1337 if [[ ! -z ${CD_ROOT} ]] ; then
1338 einfo "Using same root as before for CD #${CDROM_CURRENT_CD}"
1339 return
1340 fi
1341 1336
1342 unset CDROM_ROOT 1337 unset CDROM_ROOT
1343 var=CDROM_ROOTS_${CDROM_CURRENT_CD} 1338 var=CD_ROOT_${CDROM_CURRENT_CD}
1339 [[ -z ${!var} ]] && var="CD_ROOT"
1344 if [[ -z ${!var} ]] ; then 1340 if [[ -z ${!var} ]] ; then
1345 var="CDROM_CHECK_${CDROM_CURRENT_CD}" 1341 var="CDROM_CHECK_${CDROM_CURRENT_CD}"
1346 cdrom_locate_file_on_cd ${!var} 1342 _cdrom_locate_file_on_cd ${!var}
1347 else 1343 else
1348 export CDROM_ROOT=${!var} 1344 export CDROM_ROOT=${!var}
1349 fi 1345 fi
1350 1346
1351 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1347 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1356# all it does is try to locate a give file on a cd ... if the cd isn't 1352# all it does is try to locate a give file on a cd ... if the cd isn't
1357# found, then a message asking for the user to insert the cdrom will be 1353# found, then a message asking for the user to insert the cdrom will be
1358# displayed and we'll hang out here until: 1354# displayed and we'll hang out here until:
1359# (1) the file is found on a mounted cdrom 1355# (1) the file is found on a mounted cdrom
1360# (2) the user hits CTRL+C 1356# (2) the user hits CTRL+C
1361cdrom_locate_file_on_cd() { 1357_cdrom_locate_file_on_cd() {
1358 local mline=""
1359 local showedmsg=0
1360
1362 while [[ -z ${CDROM_ROOT} ]] ; do 1361 while [[ -z ${CDROM_ROOT} ]] ; do
1363 local dir=$(dirname "$*") 1362 local i=0
1363 local -a cdset=(${*//:/ })
1364 if [[ -n ${CDROM_SET} ]] ; then
1365 cdset=(${cdset[${CDROM_SET}]})
1366 fi
1367
1368 while [[ -n ${cdset[${i}]} ]] ; do
1369 local dir=$(dirname ${cdset[${i}]})
1364 local file=$(basename "$*") 1370 local file=$(basename ${cdset[${i}]})
1365 local mline=""
1366 local showedmsg=0
1367 1371
1368 for mline in $(mount | egrep -e '(iso|cdrom)' | awk '{print $3}') ; do 1372 for mline in $(mount | gawk '/(iso|cdrom|fs=cdfss)/ {print $3}') ; do
1369 [[ -d ${mline}/${dir} ]] || continue 1373 [[ -d ${mline}/${dir} ]] || continue
1370 [[ ! -z $(find ${mline}/${dir} -maxdepth 1 -iname ${file}) ]] \ 1374 if [[ -n $(find ${mline}/${dir} -maxdepth 1 -iname ${file}) ]] ; then
1371 && export CDROM_ROOT=${mline} 1375 export CDROM_ROOT=${mline}
1376 export CDROM_SET=${i}
1377 export CDROM_MATCH=${cdset[${i}]}
1378 return
1379 fi
1380 done
1381
1382 ((++i))
1372 done 1383 done
1373 1384
1374 if [[ -z ${CDROM_ROOT} ]] ; then
1375 echo 1385 echo
1376 if [[ ${showedmsg} -eq 0 ]] ; then 1386 if [[ ${showedmsg} -eq 0 ]] ; then
1377 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then 1387 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1378 if [[ -z ${CDROM_NAME} ]] ; then 1388 if [[ -z ${CDROM_NAME} ]] ; then
1379 einfo "Please insert the cdrom for ${PN} now !" 1389 einfo "Please insert+mount the cdrom for ${PN} now !"
1380 else
1381 einfo "Please insert the ${CDROM_NAME} cdrom now !"
1382 fi
1383 else 1390 else
1384 if [[ -z ${CDROM_NAME_1} ]] ; then
1385 einfo "Please insert cd #${CDROM_CURRENT_CD} for ${PN} now !"
1386 else
1387 local var="CDROM_NAME_${CDROM_CURRENT_CD}"
1388 einfo "Please insert+mount the ${!var} cdrom now !" 1391 einfo "Please insert+mount the ${CDROM_NAME} cdrom now !"
1389 fi
1390 fi 1392 fi
1391 showedmsg=1 1393 else
1394 if [[ -z ${CDROM_NAME_1} ]] ; then
1395 einfo "Please insert+mount cd #${CDROM_CURRENT_CD} for ${PN} now !"
1396 else
1397 local var="CDROM_NAME_${CDROM_CURRENT_CD}"
1398 einfo "Please insert+mount the ${!var} cdrom now !"
1399 fi
1392 fi 1400 fi
1401 showedmsg=1
1402 fi
1393 einfo "Press return to scan for the cd again" 1403 einfo "Press return to scan for the cd again"
1394 einfo "or hit CTRL+C to abort the emerge." 1404 einfo "or hit CTRL+C to abort the emerge."
1395 echo 1405 echo
1396 einfo "If you are having trouble with the detection" 1406 einfo "If you are having trouble with the detection"
1397 einfo "of your CD, it is possible that you do not have" 1407 einfo "of your CD, it is possible that you do not have"
1398 einfo "Joliet support enabled in your kernel. Please" 1408 einfo "Joliet support enabled in your kernel. Please"
1399 einfo "check that CONFIG_JOLIET is enabled in your kernel." 1409 einfo "check that CONFIG_JOLIET is enabled in your kernel."
1400 read 1410 read
1401 fi
1402 done 1411 done
1403} 1412}
1404 1413
1405# Make sure that LINGUAS only contains languages that 1414# Make sure that LINGUAS only contains languages that
1406# a package can support 1415# a package can support
1554 [[ ${opt:0:1} = "-" ]] && shift || opt="-a" 1563 [[ ${opt:0:1} = "-" ]] && shift || opt="-a"
1555 1564
1556 local PKG=$(best_version $1) 1565 local PKG=$(best_version $1)
1557 shift 1566 shift
1558 1567
1559 local USEFILE="${ROOT}/var/db/pkg/${PKG}/USE" 1568 local USEFILE=${ROOT}/var/db/pkg/${PKG}/USE
1569
1570 # if the USE file doesnt exist, assume the $PKG is either
1571 # injected or package.provided
1560 [[ ! -e ${USEFILE} ]] && return 1 1572 [[ ! -e ${USEFILE} ]] && return 0
1561 1573
1562 local USE_BUILT=$(<${USEFILE}) 1574 local USE_BUILT=$(<${USEFILE})
1563 while [[ $# -gt 0 ]] ; do 1575 while [[ $# -gt 0 ]] ; do
1564 if [[ ${opt} = "-o" ]] ; then 1576 if [[ ${opt} = "-o" ]] ; then
1565 has $1 ${USE_BUILT} && return 0 1577 has $1 ${USE_BUILT} && return 0
1622 # We don't want to quote ${bin} so that people can pass complex 1634 # We don't want to quote ${bin} so that people can pass complex
1623 # things as $bin ... "./someprog --args" 1635 # things as $bin ... "./someprog --args"
1624 cat << EOF > "${tmpwrapper}" 1636 cat << EOF > "${tmpwrapper}"
1625#!/bin/sh 1637#!/bin/sh
1626cd "${chdir:-.}" 1638cd "${chdir:-.}"
1639if [ -n "${libdir}" ] ; then
1627if [ "\${LD_LIBRARY_PATH+set}" = "set" ] && [ -n "${libdir}" ] ; then 1640 if [ "\${LD_LIBRARY_PATH+set}" = "set" ] ; then
1628 export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${libdir}" 1641 export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${libdir}"
1642 else
1643 export LD_LIBRARY_PATH="${libdir}"
1644 fi
1629fi 1645fi
1630exec ${bin} "\$@" 1646exec ${bin} "\$@"
1631EOF 1647EOF
1632 chmod go+rx "${tmpwrapper}" 1648 chmod go+rx "${tmpwrapper}"
1633 if [[ -n ${path} ]] ; then 1649 if [[ -n ${path} ]] ; then

Legend:
Removed from v.1.207  
changed lines
  Added in v.1.216

  ViewVC Help
Powered by ViewVC 1.1.20