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

Diff of /eclass/eutils.eclass

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

Revision 1.135 Revision 1.247
1# Copyright 1999-2004 Gentoo Foundation 1# Copyright 1999-2006 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.135 2004/12/31 11:28:18 eradicator Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.247 2006/08/11 02:21:47 vapier Exp $
4#
5# Author: Martin Schlemmer <azarah@gentoo.org>
6# 4#
7# This eclass is for general purpose functions that most ebuilds 5# This eclass is for general purpose functions that most ebuilds
8# have to implement themselves. 6# have to implement themselves.
9# 7#
10# NB: If you add anything, please comment it! 8# NB: If you add anything, please comment it!
9#
10# Maintainer: see each individual function, base-system@gentoo.org as default
11 11
12ECLASS=eutils 12inherit multilib portability
13INHERITED="$INHERITED $ECLASS"
14
15DEPEND="!bootstrap? ( sys-devel/patch )"
16 13
17DESCRIPTION="Based on the ${ECLASS} eclass" 14DESCRIPTION="Based on the ${ECLASS} eclass"
18 15
19# Wait for the supplied number of seconds. If no argument is supplied, defaults 16# 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 17# to five seconds. If the EPAUSE_IGNORE env var is set, don't wait. If we're not
21# outputting to a terminal, don't wait. For compatability purposes, the argument 18# outputting to a terminal, don't wait. For compatability purposes, the argument
22# must be an integer greater than zero. 19# must be an integer greater than zero.
23# Bug 62950, Ciaran McCreesh <ciaranm@gentoo.org> (05 Sep 2004) 20# Bug 62950, Ciaran McCreesh <ciaranm@gentoo.org> (05 Sep 2004)
24epause() { 21epause() {
25 if [ -z "$EPAUSE_IGNORE" ] && [ -t 1 ] ; then 22 [[ -z ${EPAUSE_IGNORE} ]] && sleep ${1:-5}
26 sleep ${1:-5}
27 fi
28} 23}
29 24
30# Beep the specified number of times (defaults to five). If our output 25# Beep the specified number of times (defaults to five). If our output
31# is not a terminal, don't beep. If the EBEEP_IGNORE env var is set, 26# is not a terminal, don't beep. If the EBEEP_IGNORE env var is set,
32# don't beep. 27# don't beep.
33# Bug 62950, Ciaran McCreesh <ciaranm@gentoo.org> (05 Sep 2004) 28# Bug 62950, Ciaran McCreesh <ciaranm@gentoo.org> (05 Sep 2004)
34ebeep() { 29ebeep() {
35 local n 30 local n
36 if [ -z "$EBEEP_IGNORE" ] && [ -t 1 ] ; then 31 if [[ -z ${EBEEP_IGNORE} ]] ; then
37 for ((n=1 ; n <= ${1:-5} ; n++)) ; do 32 for ((n=1 ; n <= ${1:-5} ; n++)) ; do
38 echo -ne "\a" 33 echo -ne "\a"
39 sleep 0.1 &>/dev/null ; sleep 0,1 &>/dev/null 34 sleep 0.1 &>/dev/null ; sleep 0,1 &>/dev/null
40 echo -ne "\a" 35 echo -ne "\a"
41 sleep 1 36 sleep 1
42 done 37 done
43 fi 38 fi
44}
45
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...
59get_libdir() {
60 LIBDIR_TEST=$(type econf)
61 if [ ! -z "${CONF_LIBDIR_OVERRIDE}" ] ; then
62 # if there is an override, we want to use that... always.
63 CONF_LIBDIR="${CONF_LIBDIR_OVERRIDE}"
64 # We don't need to know the verison of portage. We only need to know
65 # if there is support for CONF_LIBDIR in econf and co.
66 # Danny van Dyk <kugelfang@gentoo.org> 2004/17/09
67 #elif portageq has_version / '<sys-apps/portage-2.0.51_pre20' ; then
68 # # and if there isnt an override, and we're using a version of
69 # # portage without CONF_LIBDIR support, force the use of lib. dolib
70 # # and friends from portage 2.0.50 wont be too happy otherwise.
71 # CONF_LIBDIR="lib"
72 #fi
73 elif [ -n "$(get_abi_LIBDIR)" ]; then # Using eradicator's LIBDIR_<abi> approach...
74 CONF_LIBDIR="$(get_abi_LIBDIR)"
75 elif [ "${LIBDIR_TEST/CONF_LIBDIR}" == "${LIBDIR_TEST}" ]; then # we don't have CONF_LIBDIR support
76 # will be <portage-2.0.51_pre20
77 CONF_LIBDIR="lib"
78 fi
79 # and of course, default to lib if CONF_LIBDIR isnt set
80 echo ${CONF_LIBDIR:=lib}
81 unset LIBDIR_TEST
82}
83
84get_multilibdir() {
85 [ -n "$(get_abi_LIBDIR)" ] && die "get_multilibdir called, but it shouldn't be needed with the new multilib approach. Please file a bug at http://bugs.gentoo.org and assign it to eradicator@gentoo.org"
86 echo ${CONF_MULTILIBDIR:=lib32}
87}
88
89# Sometimes you need to override the value returned by get_libdir. A good
90# example of this is xorg-x11, where lib32 isnt a supported configuration,
91# and where lib64 -must- be used on amd64 (for applications that need lib
92# to be 32bit, such as adobe acrobat). Note that this override also bypasses
93# portage version sanity checking.
94# get_libdir_override expects one argument, the result get_libdir should
95# return:
96#
97# get_libdir_override lib64
98#
99# Travis Tilley <lv@gentoo.org> (31 Aug 2004)
100get_libdir_override() {
101 [ -n "$(get_abi_LIBDIR)" ] && die "get_libdir_override called, but it shouldn't be needed with the new multilib approach. Please file a bug at http://bugs.gentoo.org and assign it to eradicator@gentoo.org"
102 CONF_LIBDIR="$1"
103 CONF_LIBDIR_OVERRIDE="$1"
104} 39}
105 40
106# This function generate linker scripts in /usr/lib for dynamic 41# This function generate linker scripts in /usr/lib for dynamic
107# libs in /lib. This is to fix linking problems when you have 42# libs in /lib. This is to fix linking problems when you have
108# the .so in /lib, and the .a in /usr/lib. What happens is that 43# the .so in /lib, and the .a in /usr/lib. What happens is that
120# to point to the latest version of the library present. 55# to point to the latest version of the library present.
121# 56#
122# <azarah@gentoo.org> (26 Oct 2002) 57# <azarah@gentoo.org> (26 Oct 2002)
123# 58#
124gen_usr_ldscript() { 59gen_usr_ldscript() {
125 local libdir="$(get_libdir)" 60 local lib libdir=$(get_libdir)
126 # Just make sure it exists 61 # Just make sure it exists
127 dodir /usr/${libdir} 62 dodir /usr/${libdir}
128 63
64 for lib in "${@}" ; do
129 cat > "${D}/usr/${libdir}/${1}" << END_LDSCRIPT 65 cat > "${D}/usr/${libdir}/${lib}" <<-END_LDSCRIPT
130/* GNU ld script 66 /* GNU ld script
131 Because Gentoo have critical dynamic libraries 67 Since Gentoo has critical dynamic libraries
132 in /lib, and the static versions in /usr/lib, we 68 in /lib, and the static versions in /usr/lib,
133 need to have a "fake" dynamic lib in /usr/lib, 69 we need to have a "fake" dynamic lib in /usr/lib,
134 otherwise we run into linking problems. 70 otherwise we run into linking problems.
135 See bug #4411 on http://bugs.gentoo.org/ for 71
136 more info. */ 72 See bug http://bugs.gentoo.org/4411 for more info.
73 */
137GROUP ( /${libdir}/${1} ) 74 GROUP ( /${libdir}/${lib} )
138END_LDSCRIPT 75 END_LDSCRIPT
139 fperms a+x "/usr/${libdir}/${1}" 76 fperms a+x "/usr/${libdir}/${lib}" || die "could not change perms on ${lib}"
140}
141
142# Simple function to draw a line consisting of '=' the same length as $*
143#
144# <azarah@gentoo.org> (11 Nov 2002)
145#
146draw_line() {
147 local i=0
148 local str_length=""
149
150 # Handle calls that do not have args, or wc not being installed ...
151 if [ -z "$1" -o ! -x "$(which wc 2>/dev/null)" ]
152 then
153 echo "==============================================================="
154 return 0
155 fi
156
157 # Get the length of $*
158 str_length="$(echo -n "$*" | wc -m)"
159
160 while [ "$i" -lt "${str_length}" ]
161 do
162 echo -n "="
163
164 i=$((i + 1))
165 done 77 done
166
167 echo
168
169 return 0
170} 78}
79
171 80
172# Default directory where patches are located 81# Default directory where patches are located
173EPATCH_SOURCE="${WORKDIR}/patch" 82EPATCH_SOURCE="${WORKDIR}/patch"
174# Default extension for patches 83# Default extension for patches
175EPATCH_SUFFIX="patch.bz2" 84EPATCH_SUFFIX="patch.bz2"
176# Default options for patch 85# Default options for patch
177# Set -g0 to keep RCS, ClearCase, Perforce and SCCS happy. Bug #24571 86# Set -g0 to keep RCS, ClearCase, Perforce and SCCS happy. Bug #24571
178EPATCH_OPTS="-g0" 87# Set --no-backup-if-mismatch so we don't leave '.orig' files behind.
88# Set -E to automatically remove empty files.
89EPATCH_OPTS="-g0 -E --no-backup-if-mismatch"
179# List of patches not to apply. Not this is only file names, 90# List of patches not to apply. Not this is only file names,
180# and not the full path .. 91# and not the full path ..
181EPATCH_EXCLUDE="" 92EPATCH_EXCLUDE=""
182# Change the printed message for a single patch. 93# Change the printed message for a single patch.
183EPATCH_SINGLE_MSG="" 94EPATCH_SINGLE_MSG=""
95# Change the printed message for multiple patches.
96EPATCH_MULTI_MSG="Applying various patches (bugfixes/updates) ..."
184# Force applying bulk patches even if not following the style: 97# Force applying bulk patches even if not following the style:
185# 98#
186# ??_${ARCH}_foo.${EPATCH_SUFFIX} 99# ??_${ARCH}_foo.${EPATCH_SUFFIX}
187# 100#
188EPATCH_FORCE="no" 101EPATCH_FORCE="no"
219# hand its a directory, it will set EPATCH_SOURCE to this. 132# hand its a directory, it will set EPATCH_SOURCE to this.
220# 133#
221# <azarah@gentoo.org> (10 Nov 2002) 134# <azarah@gentoo.org> (10 Nov 2002)
222# 135#
223epatch() { 136epatch() {
137 _epatch_draw_line() {
138 [[ -z $1 ]] && set "$(printf "%65s" '')"
139 echo "${1//?/=}"
140 }
141 _epatch_assert() { local _pipestatus=${PIPESTATUS[*]}; [[ ${_pipestatus// /} -eq 0 ]] ; }
224 local PIPE_CMD="" 142 local PIPE_CMD=""
225 local STDERR_TARGET="${T}/$$.out" 143 local STDERR_TARGET="${T}/$$.out"
226 local PATCH_TARGET="${T}/$$.patch" 144 local PATCH_TARGET="${T}/$$.patch"
227 local PATCH_SUFFIX="" 145 local PATCH_SUFFIX=""
228 local SINGLE_PATCH="no" 146 local SINGLE_PATCH="no"
229 local x="" 147 local x=""
230 148
149 unset P4CONFIG P4PORT P4USER # keep perforce at bay #56402
150
231 if [ "$#" -gt 1 ] 151 if [ "$#" -gt 1 ]
232 then 152 then
233 local m="" 153 local m=""
234 einfo "${#} patches to apply ..."
235 for m in "$@" ; do 154 for m in "$@" ; do
236 epatch "${m}" 155 epatch "${m}"
237 done 156 done
238 return 0 157 return 0
239 fi 158 fi
264 183
265 echo 184 echo
266 eerror "Cannot find \$EPATCH_SOURCE! Value for \$EPATCH_SOURCE is:" 185 eerror "Cannot find \$EPATCH_SOURCE! Value for \$EPATCH_SOURCE is:"
267 eerror 186 eerror
268 eerror " ${EPATCH_SOURCE}" 187 eerror " ${EPATCH_SOURCE}"
188 eerror " ( ${EPATCH_SOURCE##*/} )"
269 echo 189 echo
270 die "Cannot find \$EPATCH_SOURCE!" 190 die "Cannot find \$EPATCH_SOURCE!"
271 fi 191 fi
272 192
273 local EPATCH_SOURCE="${EPATCH_SOURCE}/*.${EPATCH_SUFFIX}" 193 local EPATCH_SOURCE="${EPATCH_SOURCE}/*.${EPATCH_SUFFIX}"
292 ;; 212 ;;
293 esac 213 esac
294 214
295 if [ "${SINGLE_PATCH}" = "no" ] 215 if [ "${SINGLE_PATCH}" = "no" ]
296 then 216 then
297 einfo "Applying various patches (bugfixes/updates) ..." 217 einfo "${EPATCH_MULTI_MSG}"
298 fi 218 fi
299 for x in ${EPATCH_SOURCE} 219 for x in ${EPATCH_SOURCE}
300 do 220 do
301 # New ARCH dependant patch naming scheme ... 221 # New ARCH dependant patch naming scheme ...
302 # 222 #
303 # ???_arch_foo.patch 223 # ???_arch_foo.patch
304 # 224 #
305 if [ -f ${x} ] && \ 225 if [ -f ${x} ] && \
306 ([ "${SINGLE_PATCH}" = "yes" -o "${x/_all_}" != "${x}" -o "`eval echo \$\{x/_${ARCH}_\}`" != "${x}" ] || \ 226 ([ "${SINGLE_PATCH}" = "yes" -o "${x/_all_}" != "${x}" -o "${x/_${ARCH}_}" != "${x}" ] || \
307 [ "${EPATCH_FORCE}" = "yes" ]) 227 [ "${EPATCH_FORCE}" = "yes" ])
308 then 228 then
309 local count=0 229 local count=0
310 local popts="${EPATCH_OPTS}" 230 local popts="${EPATCH_OPTS}"
231 local patchname=${x##*/}
311 232
312 if [ -n "${EPATCH_EXCLUDE}" ] 233 if [ -n "${EPATCH_EXCLUDE}" ]
313 then 234 then
314 if [ "`eval echo \$\{EPATCH_EXCLUDE/${x##*/}\}`" != "${EPATCH_EXCLUDE}" ] 235 if [ "${EPATCH_EXCLUDE/${patchname}}" != "${EPATCH_EXCLUDE}" ]
315 then 236 then
316 continue 237 continue
317 fi 238 fi
318 fi 239 fi
319 240
321 then 242 then
322 if [ -n "${EPATCH_SINGLE_MSG}" ] 243 if [ -n "${EPATCH_SINGLE_MSG}" ]
323 then 244 then
324 einfo "${EPATCH_SINGLE_MSG}" 245 einfo "${EPATCH_SINGLE_MSG}"
325 else 246 else
326 einfo "Applying ${x##*/} ..." 247 einfo "Applying ${patchname} ..."
327 fi 248 fi
328 else 249 else
329 einfo " ${x##*/} ..." 250 einfo " ${patchname} ..."
330 fi 251 fi
331 252
332 echo "***** ${x##*/} *****" > ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 253 echo "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
333 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 254 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
334 255
335 # Allow for prefix to differ ... im lazy, so shoot me :/ 256 # Allow for prefix to differ ... im lazy, so shoot me :/
336 while [ "${count}" -lt 5 ] 257 while [ "${count}" -lt 5 ]
337 do 258 do
338 # Generate some useful debug info ... 259 # Generate some useful debug info ...
339 draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 260 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
340 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 261 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
341 262
342 if [ "${PATCH_SUFFIX}" != "patch" ] 263 if [ "${PATCH_SUFFIX}" != "patch" ]
343 then 264 then
344 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 265 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
345 echo "${PIPE_CMD} ${x} > ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 266 echo "${PIPE_CMD} ${x} > ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
346 else 267 else
347 PATCH_TARGET="${x}" 268 PATCH_TARGET="${x}"
348 fi 269 fi
349 270
350 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 271 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
351 echo "patch -p${count} ${popts} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 272 echo "patch -p${count} ${popts} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
352 273
353 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 274 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
354 draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 275 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
355 276
356 if [ "${PATCH_SUFFIX}" != "patch" ] 277 if [ "${PATCH_SUFFIX}" != "patch" ]
357 then 278 then
358 if ! (${PIPE_CMD} ${x} > ${PATCH_TARGET}) >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 2>&1 279 if ! (${PIPE_CMD} ${x} > ${PATCH_TARGET}) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1
359 then 280 then
360 echo 281 echo
361 eerror "Could not extract patch!" 282 eerror "Could not extract patch!"
362 #die "Could not extract patch!" 283 #die "Could not extract patch!"
363 count=5 284 count=5
364 break 285 break
365 fi 286 fi
366 fi 287 fi
367 288
368 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f) >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 2>&1 289 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f ; _epatch_assert) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1
369 then 290 then
370 draw_line "***** ${x##*/} *****" > ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 291 _epatch_draw_line "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
371 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 292 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
372 echo "ACTUALLY APPLYING ${x##*/} ..." >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 293 echo "ACTUALLY APPLYING ${patchname} ..." >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
373 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 294 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
374 draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 295 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
375 296
376 cat ${PATCH_TARGET} | patch -p${count} ${popts} >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 2>&1 297 cat ${PATCH_TARGET} | patch -p${count} ${popts} >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 2>&1
298 _epatch_assert
377 299
378 if [ "$?" -ne 0 ] 300 if [ "$?" -ne 0 ]
379 then 301 then
380 cat ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 302 cat ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
381 echo 303 echo
382 eerror "A dry-run of patch command succeeded, but actually" 304 eerror "A dry-run of patch command succeeded, but actually"
383 eerror "applying the patch failed!" 305 eerror "applying the patch failed!"
384 #die "Real world sux compared to the dreamworld!" 306 #die "Real world sux compared to the dreamworld!"
385 count=5 307 count=5
386 fi 308 fi
387 309
388 rm -f ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 310 rm -f ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
389 311
390 break 312 break
391 fi 313 fi
392 314
393 count=$((count + 1)) 315 count=$((count + 1))
399 fi 321 fi
400 322
401 if [ "${count}" -eq 5 ] 323 if [ "${count}" -eq 5 ]
402 then 324 then
403 echo 325 echo
404 eerror "Failed Patch: ${x##*/}!" 326 eerror "Failed Patch: ${patchname} !"
327 eerror " ( ${PATCH_TARGET} )"
405 eerror 328 eerror
406 eerror "Include in your bugreport the contents of:" 329 eerror "Include in your bugreport the contents of:"
407 eerror 330 eerror
408 eerror " ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}" 331 eerror " ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}"
409 echo 332 echo
410 die "Failed Patch: ${x##*/}!" 333 die "Failed Patch: ${patchname}!"
411 fi 334 fi
412 335
413 rm -f ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 336 rm -f ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
414 337
415 eend 0 338 eend 0
416 fi 339 fi
417 done 340 done
418 if [ "${SINGLE_PATCH}" = "no" ] 341 if [ "${SINGLE_PATCH}" = "no" ]
419 then 342 then
420 einfo "Done with patching" 343 einfo "Done with patching"
421 fi 344 fi
422} 345}
423 346
424# This function return true if we are using the NPTL pthreads
425# implementation.
426#
427# <azarah@gentoo.org> (06 March 2003)
428#
429have_NPTL() {
430 cat > ${T}/test-nptl.c <<-"END"
431 #define _XOPEN_SOURCE
432 #include <unistd.h>
433 #include <stdio.h>
434
435 int main()
436 {
437 char buf[255];
438 char *str = buf;
439
440 confstr(_CS_GNU_LIBPTHREAD_VERSION, str, 255);
441 if (NULL != str) {
442 printf("%s\n", str);
443 if (NULL != strstr(str, "NPTL"))
444 return 0;
445 }
446
447 return 1;
448 }
449 END
450
451 einfon "Checking for _CS_GNU_LIBPTHREAD_VERSION support in glibc ..."
452 if gcc -o ${T}/nptl ${T}/test-nptl.c &> /dev/null
453 then
454 echo "yes"
455 einfon "Checking what PTHREADS implementation we have ..."
456 if ${T}/nptl
457 then
458 return 0
459 else
460 return 1
461 fi
462 else
463 echo "no"
464 fi
465
466 return 1
467}
468
469# This function check how many cpu's are present, and then set
470# -j in MAKEOPTS accordingly.
471#
472# Thanks to nall <nall@gentoo.org> for this.
473#
474get_number_of_jobs() {
475 local jobs=0
476
477 if [ ! -r /proc/cpuinfo ]
478 then
479 return 1
480 fi
481
482 # This bit is from H?kan Wessberg <nacka-gentoo@refug.org>, bug #13565.
483 if [ "`egrep "^[[:space:]]*MAKEOPTS=" /etc/make.conf | wc -l`" -gt 0 ]
484 then
485 ADMINOPTS="`egrep "^[[:space:]]*MAKEOPTS=" /etc/make.conf | cut -d= -f2 | sed 's/\"//g'`"
486 ADMINPARAM="`echo ${ADMINOPTS} | gawk '{match($0, /-j *[0-9]*/, opt); print opt[0]}'`"
487 ADMINPARAM="${ADMINPARAM/-j}"
488 fi
489
490 export MAKEOPTS="`echo ${MAKEOPTS} | sed -e 's:-j *[0-9]*::g'`"
491
492 if [ "${ARCH}" = "amd64" -o "${ARCH}" = "x86" -o "${ARCH}" = "hppa" -o \
493 "${ARCH}" = "arm" -o "${ARCH}" = "mips" -o "${ARCH}" = "ia64" ]
494 then
495 # these archs will always have "[Pp]rocessor"
496 jobs="$((`grep -c ^[Pp]rocessor /proc/cpuinfo` * 2))"
497
498 elif [ "${ARCH}" = "sparc" -o "${ARCH}" = "sparc64" ]
499 then
500 # sparc always has "ncpus active"
501 jobs="$((`grep "^ncpus active" /proc/cpuinfo | sed -e "s/^.*: //"` * 2))"
502
503 elif [ "${ARCH}" = "alpha" ]
504 then
505 # alpha has "cpus active", but only when compiled with SMP
506 if [ "`grep -c "^cpus active" /proc/cpuinfo`" -eq 1 ]
507 then
508 jobs="$((`grep "^cpus active" /proc/cpuinfo | sed -e "s/^.*: //"` * 2))"
509 else
510 jobs=2
511 fi
512
513 elif [ "${ARCH}" = "ppc" -o "${ARCH}" = "ppc64" ]
514 then
515 # ppc has "processor", but only when compiled with SMP
516 if [ "`grep -c "^processor" /proc/cpuinfo`" -eq 1 ]
517 then
518 jobs="$((`grep -c ^processor /proc/cpuinfo` * 2))"
519 else
520 jobs=2
521 fi
522 elif [ "${ARCH}" = "s390" ]
523 then
524 # s390 has "# processors : "
525 jobs="$((`grep "^\# processors" /proc/cpuinfo | sed -e "s/^.*: //"` * 2))"
526 else
527 jobs="$((`grep -c ^cpu /proc/cpuinfo` * 2))"
528 die "Unknown ARCH -- ${ARCH}!"
529 fi
530
531 # Make sure the number is valid ...
532 if [ "${jobs}" -lt 1 ]
533 then
534 jobs=1
535 fi
536
537 if [ -n "${ADMINPARAM}" ]
538 then
539 if [ "${jobs}" -gt "${ADMINPARAM}" ]
540 then
541 einfo "Setting make jobs to \"-j${ADMINPARAM}\" to ensure successful merge ..."
542 export MAKEOPTS="${MAKEOPTS} -j${ADMINPARAM}"
543 else
544 einfo "Setting make jobs to \"-j${jobs}\" to ensure successful merge ..."
545 export MAKEOPTS="${MAKEOPTS} -j${jobs}"
546 fi
547 fi
548}
549
550# Cheap replacement for when debianutils (and thus mktemp) 347# Cheap replacement for when debianutils (and thus mktemp)
551# does not exist on the users system 348# does not exist on the users system
552# vapier@gentoo.org 349# vapier@gentoo.org
553# 350#
554# Takes just 1 optional parameter (the directory to create tmpfile in) 351# Takes just 1 optional parameter (the directory to create tmpfile in)
555emktemp() { 352emktemp() {
556 local exe="touch" 353 local exe="touch"
557 [ "$1" == "-d" ] && exe="mkdir" && shift 354 [[ $1 == -d ]] && exe="mkdir" && shift
558 local topdir="$1" 355 local topdir=$1
559 356
560 if [ -z "${topdir}" ] 357 if [[ -z ${topdir} ]] ; then
561 then
562 [ -z "${T}" ] \ 358 [[ -z ${T} ]] \
563 && topdir="/tmp" \ 359 && topdir="/tmp" \
564 || topdir="${T}" 360 || topdir=${T}
565 fi 361 fi
566 362
567 if [ -z "$(type -p mktemp)" ] 363 if [[ -z $(type -p mktemp) ]] ; then
568 then
569 local tmp=/ 364 local tmp=/
570 while [ -e "${tmp}" ] ; do 365 while [[ -e ${tmp} ]] ; do
571 tmp="${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}" 366 tmp=${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}
572 done 367 done
573 ${exe} "${tmp}" 368 ${exe} "${tmp}" || ${exe} -p "${tmp}"
574 echo "${tmp}" 369 echo "${tmp}"
575 else 370 else
576 [ "${exe}" == "touch" ] \ 371 if [[ ${exe} == "touch" ]] ; then
577 && exe="-p" \ 372 [[ ${USERLAND} == "GNU" ]] \
578 || exe="-d" 373 && mktemp -p "${topdir}" \
579 mktemp ${exe} "${topdir}" 374 || TMPDIR="${topdir}" mktemp -t tmp
375 else
376 [[ ${USERLAND} == "GNU" ]] \
377 && mktemp -d "${topdir}" \
378 || TMPDIR="${topdir}" mktemp -dt tmp
379 fi
580 fi 380 fi
581} 381}
582 382
583# Small wrapper for getent (Linux), nidump (Mac OS X), 383# Small wrapper for getent (Linux), nidump (Mac OS X),
584# and pw (FreeBSD) used in enewuser()/enewgroup() 384# and pw (FreeBSD) used in enewuser()/enewgroup()
585# Joe Jezak <josejx@gmail.com> and usata@gentoo.org 385# Joe Jezak <josejx@gmail.com> and usata@gentoo.org
586# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org> 386# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org>
587# 387#
588# egetent(database, key) 388# egetent(database, key)
589egetent() { 389egetent() {
590 if useq ppc-macos ; then 390 case ${CHOST} in
391 *-darwin*)
591 case "$2" in 392 case "$2" in
592 *[!0-9]*) # Non numeric 393 *[!0-9]*) # Non numeric
593 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }" 394 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }"
594 ;; 395 ;;
595 *) # Numeric 396 *) # Numeric
596 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }" 397 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }"
597 ;; 398 ;;
598 esac 399 esac
599 elif useq x86-fbsd ; then 400 ;;
600 local action 401 *-freebsd*|*-dragonfly*)
601 if [ "$1" == "passwd" ] 402 local opts action="user"
602 then 403 [[ $1 == "passwd" ]] || action="group"
603 action="user" 404
604 else 405 # lookup by uid/gid
605 action="group" 406 if [[ $2 == [[:digit:]]* ]] ; then
407 [[ ${action} == "user" ]] && opts="-u" || opts="-g"
606 fi 408 fi
409
607 pw show "${action}" "$2" -q 410 pw show ${action} ${opts} "$2" -q
608 else 411 ;;
412 *-netbsd*|*-openbsd*)
413 grep "$2:\*:" /etc/$1
414 ;;
415 *)
609 which nscd >& /dev/null && nscd -i "$1" 416 type -p nscd >& /dev/null && nscd -i "$1"
610 getent "$1" "$2" 417 getent "$1" "$2"
611 fi 418 ;;
419 esac
612} 420}
613 421
614# Simplify/standardize adding users to the system 422# Simplify/standardize adding users to the system
615# vapier@gentoo.org 423# vapier@gentoo.org
616# 424#
623# shell: /bin/false 431# shell: /bin/false
624# homedir: /dev/null 432# homedir: /dev/null
625# groups: none 433# groups: none
626# extra: comment of 'added by portage for ${PN}' 434# extra: comment of 'added by portage for ${PN}'
627enewuser() { 435enewuser() {
436 case ${EBUILD_PHASE} in
437 unpack|compile|test|install)
438 eerror "'enewuser()' called from '${EBUILD_PHASE}()' which is not a pkg_* function."
439 eerror "Package fails at QA and at life. Please file a bug."
440 die "Bad package! enewuser is only for use in pkg_* functions!"
441 esac
442
628 # get the username 443 # get the username
629 local euser="$1"; shift 444 local euser=$1; shift
630 if [ -z "${euser}" ] 445 if [[ -z ${euser} ]] ; then
631 then
632 eerror "No username specified !" 446 eerror "No username specified !"
633 die "Cannot call enewuser without a username" 447 die "Cannot call enewuser without a username"
634 fi 448 fi
635 449
636 # lets see if the username already exists 450 # lets see if the username already exists
637 if [ "${euser}" == "`egetent passwd \"${euser}\" | cut -d: -f1`" ] 451 if [[ ${euser} == $(egetent passwd "${euser}" | cut -d: -f1) ]] ; then
638 then
639 return 0 452 return 0
640 fi 453 fi
641 einfo "Adding user '${euser}' to your system ..." 454 einfo "Adding user '${euser}' to your system ..."
642 455
643 # options to pass to useradd 456 # options to pass to useradd
644 local opts= 457 local opts=
645 458
646 # handle uid 459 # handle uid
647 local euid="$1"; shift 460 local euid=$1; shift
648 if [ ! -z "${euid}" ] && [ "${euid}" != "-1" ] 461 if [[ ! -z ${euid} ]] && [[ ${euid} != "-1" ]] ; then
649 then
650 if [ "${euid}" -gt 0 ] 462 if [[ ${euid} -gt 0 ]] ; then
651 then
652 if [ ! -z "`egetent passwd ${euid}`" ] 463 if [[ ! -z $(egetent passwd ${euid}) ]] ; then
653 then
654 euid="next" 464 euid="next"
655 fi 465 fi
656 else 466 else
657 eerror "Userid given but is not greater than 0 !" 467 eerror "Userid given but is not greater than 0 !"
658 die "${euid} is not a valid UID" 468 die "${euid} is not a valid UID"
659 fi 469 fi
660 else 470 else
661 euid="next" 471 euid="next"
662 fi 472 fi
663 if [ "${euid}" == "next" ] 473 if [[ ${euid} == "next" ]] ; then
664 then 474 for euid in $(seq 101 999) ; do
665 local pwrange
666 if [ "${USERLAND}" == "BSD" ] ; then
667 pwrange="`jot 898 101`"
668 else
669 pwrange="`seq 101 999`"
670 fi
671 for euid in ${pwrange} ; do
672 [ -z "`egetent passwd ${euid}`" ] && break 475 [[ -z $(egetent passwd ${euid}) ]] && break
673 done 476 done
674 fi 477 fi
675 opts="${opts} -u ${euid}" 478 opts="${opts} -u ${euid}"
676 einfo " - Userid: ${euid}" 479 einfo " - Userid: ${euid}"
677 480
678 # handle shell 481 # handle shell
679 local eshell="$1"; shift 482 local eshell=$1; shift
680 if [ ! -z "${eshell}" ] && [ "${eshell}" != "-1" ] 483 if [[ ! -z ${eshell} ]] && [[ ${eshell} != "-1" ]] ; then
681 then 484 if [[ ! -e ${ROOT}${eshell} ]] ; then
682 if [ ! -e "${eshell}" ]
683 then
684 eerror "A shell was specified but it does not exist !" 485 eerror "A shell was specified but it does not exist !"
685 die "${eshell} does not exist" 486 die "${eshell} does not exist in ${ROOT}"
487 fi
488 if [[ ${eshell} == */false || ${eshell} == */nologin ]] ; then
489 eerror "Do not specify ${eshell} yourself, use -1"
490 die "Pass '-1' as the shell parameter"
686 fi 491 fi
687 else 492 else
688 if [ "${USERLAND}" == "BSD" ] 493 for shell in /sbin/nologin /usr/sbin/nologin /bin/false /usr/bin/false /dev/null ; do
689 then 494 [[ -x ${ROOT}${shell} ]] && break
690 eshell="/usr/bin/false" 495 done
691 else 496
692 eshell="/bin/false" 497 if [[ ${shell} == "/dev/null" ]] ; then
498 eerror "Unable to identify the shell to use"
499 die "Unable to identify the shell to use"
693 fi 500 fi
501
502 eshell=${shell}
694 fi 503 fi
695 einfo " - Shell: ${eshell}" 504 einfo " - Shell: ${eshell}"
696 opts="${opts} -s ${eshell}" 505 opts="${opts} -s ${eshell}"
697 506
698 # handle homedir 507 # handle homedir
699 local ehome="$1"; shift 508 local ehome=$1; shift
700 if [ -z "${ehome}" ] && [ "${eshell}" != "-1" ] 509 if [[ -z ${ehome} ]] || [[ ${ehome} == "-1" ]] ; then
701 then
702 ehome="/dev/null" 510 ehome="/dev/null"
703 fi 511 fi
704 einfo " - Home: ${ehome}" 512 einfo " - Home: ${ehome}"
705 opts="${opts} -d ${ehome}" 513 opts="${opts} -d ${ehome}"
706 514
707 # handle groups 515 # handle groups
708 local egroups="$1"; shift 516 local egroups=$1; shift
709 if [ ! -z "${egroups}" ] 517 if [[ ! -z ${egroups} ]] ; then
710 then
711 local oldifs="${IFS}" 518 local oldifs=${IFS}
712 local defgroup="" exgroups="" 519 local defgroup="" exgroups=""
713 520
714 export IFS="," 521 export IFS=","
715 for g in ${egroups} 522 for g in ${egroups} ; do
716 do
717 export IFS="${oldifs}" 523 export IFS=${oldifs}
718 if [ -z "`egetent group \"${g}\"`" ] 524 if [[ -z $(egetent group "${g}") ]] ; then
719 then
720 eerror "You must add group ${g} to the system first" 525 eerror "You must add group ${g} to the system first"
721 die "${g} is not a valid GID" 526 die "${g} is not a valid GID"
722 fi 527 fi
723 if [ -z "${defgroup}" ] 528 if [[ -z ${defgroup} ]] ; then
724 then
725 defgroup="${g}" 529 defgroup=${g}
726 else 530 else
727 exgroups="${exgroups},${g}" 531 exgroups="${exgroups},${g}"
728 fi 532 fi
729 export IFS="," 533 export IFS=","
730 done 534 done
731 export IFS="${oldifs}" 535 export IFS=${oldifs}
732 536
733 opts="${opts} -g ${defgroup}" 537 opts="${opts} -g ${defgroup}"
734 if [ ! -z "${exgroups}" ] 538 if [[ ! -z ${exgroups} ]] ; then
735 then
736 opts="${opts} -G ${exgroups:1}" 539 opts="${opts} -G ${exgroups:1}"
737 fi 540 fi
738 else 541 else
739 egroups="(none)" 542 egroups="(none)"
740 fi 543 fi
741 einfo " - Groups: ${egroups}" 544 einfo " - Groups: ${egroups}"
742 545
743 # handle extra and add the user 546 # handle extra and add the user
744 local eextra="$@"
745 local oldsandbox="${SANDBOX_ON}" 547 local oldsandbox=${SANDBOX_ON}
746 export SANDBOX_ON="0" 548 export SANDBOX_ON="0"
747 if useq ppc-macos 549 case ${CHOST} in
748 then 550 *-darwin*)
749 ### Make the user 551 ### Make the user
750 if [ -z "${eextra}" ] 552 if [[ -z $@ ]] ; then
751 then
752 dscl . create /users/${euser} uid ${euid} 553 dscl . create /users/${euser} uid ${euid}
753 dscl . create /users/${euser} shell ${eshell} 554 dscl . create /users/${euser} shell ${eshell}
754 dscl . create /users/${euser} home ${ehome} 555 dscl . create /users/${euser} home ${ehome}
755 dscl . create /users/${euser} realname "added by portage for ${PN}" 556 dscl . create /users/${euser} realname "added by portage for ${PN}"
756 ### Add the user to the groups specified 557 ### Add the user to the groups specified
757 local oldifs="${IFS}" 558 local oldifs=${IFS}
758 export IFS="," 559 export IFS=","
759 for g in ${egroups} 560 for g in ${egroups} ; do
760 do
761 dscl . merge /groups/${g} users ${euser} 561 dscl . merge /groups/${g} users ${euser}
762 done 562 done
763 export IFS="${oldifs}" 563 export IFS=${oldifs}
764 else 564 else
765 einfo "Extra options are not supported on macos yet" 565 einfo "Extra options are not supported on Darwin yet"
766 einfo "Please report the ebuild along with the info below" 566 einfo "Please report the ebuild along with the info below"
767 einfo "eextra: ${eextra}" 567 einfo "eextra: $@"
768 die "Required function missing" 568 die "Required function missing"
769 fi 569 fi
770 elif use x86-fbsd ; then 570 ;;
771 if [ -z "${eextra}" ] 571 *-freebsd*|*-dragonfly*)
772 then 572 if [[ -z $@ ]] ; then
773 pw useradd ${euser} ${opts} \ 573 pw useradd ${euser} ${opts} \
774 -c "added by portage for ${PN}" \ 574 -c "added by portage for ${PN}" \
775 die "enewuser failed" 575 die "enewuser failed"
776 else 576 else
777 einfo " - Extra: ${eextra}" 577 einfo " - Extra: $@"
778 pw useradd ${euser} ${opts} \ 578 pw useradd ${euser} ${opts} \
779 -c ${eextra} || die "enewuser failed" 579 "$@" || die "enewuser failed"
780 fi 580 fi
581 ;;
582
583 *-netbsd*)
584 if [[ -z $@ ]] ; then
585 useradd ${opts} ${euser} || die "enewuser failed"
781 else 586 else
782 if [ -z "${eextra}" ] 587 einfo " - Extra: $@"
783 then 588 useradd ${opts} ${euser} "$@" || die "enewuser failed"
589 fi
590 ;;
591
592 *-openbsd*)
593 if [[ -z $@ ]] ; then
594 useradd -u ${euid} -s ${eshell} \
595 -d ${ehome} -c "Added by portage for ${PN}" \
596 -g ${egroups} ${euser} || die "enewuser failed"
597 else
598 einfo " - Extra: $@"
599 useradd -u ${euid} -s ${eshell} \
600 -d ${ehome} -c "Added by portage for ${PN}" \
601 -g ${egroups} ${euser} "$@" || die "enewuser failed"
602 fi
603 ;;
604
605 *)
606 if [[ -z $@ ]] ; then
784 useradd ${opts} ${euser} \ 607 useradd ${opts} ${euser} \
785 -c "added by portage for ${PN}" \ 608 -c "added by portage for ${PN}" \
786 || die "enewuser failed" 609 || die "enewuser failed"
787 else 610 else
788 einfo " - Extra: ${eextra}" 611 einfo " - Extra: $@"
789 useradd ${opts} ${euser} ${eextra} \ 612 useradd ${opts} ${euser} "$@" \
790 || die "enewuser failed" 613 || die "enewuser failed"
791 fi 614 fi
615 ;;
616 esac
617
618 if [[ ! -e ${ROOT}/${ehome} ]] ; then
619 einfo " - Creating ${ehome} in ${ROOT}"
620 mkdir -p "${ROOT}/${ehome}"
621 chown ${euser} "${ROOT}/${ehome}"
622 chmod 755 "${ROOT}/${ehome}"
792 fi 623 fi
624
793 export SANDBOX_ON="${oldsandbox}" 625 export SANDBOX_ON=${oldsandbox}
794
795 if [ ! -e "${ehome}" ] && [ ! -e "${D}/${ehome}" ]
796 then
797 einfo " - Creating ${ehome} in ${D}"
798 dodir ${ehome}
799 fowners ${euser} ${ehome}
800 fperms 755 ${ehome}
801 fi
802} 626}
803 627
804# Simplify/standardize adding groups to the system 628# Simplify/standardize adding groups to the system
805# vapier@gentoo.org 629# vapier@gentoo.org
806# 630#
809# Default values if you do not specify any: 633# Default values if you do not specify any:
810# groupname: REQUIRED ! 634# groupname: REQUIRED !
811# gid: next available (see groupadd(8)) 635# gid: next available (see groupadd(8))
812# extra: none 636# extra: none
813enewgroup() { 637enewgroup() {
638 case ${EBUILD_PHASE} in
639 unpack|compile|test|install)
640 eerror "'enewgroup()' called from '${EBUILD_PHASE}()' which is not a pkg_* function."
641 eerror "Package fails at QA and at life. Please file a bug."
642 die "Bad package! enewgroup is only for use in pkg_* functions!"
643 esac
644
814 # get the group 645 # get the group
815 local egroup="$1"; shift 646 local egroup="$1"; shift
816 if [ -z "${egroup}" ] 647 if [ -z "${egroup}" ]
817 then 648 then
818 eerror "No group specified !" 649 eerror "No group specified !"
835 then 666 then
836 if [ "${egid}" -gt 0 ] 667 if [ "${egid}" -gt 0 ]
837 then 668 then
838 if [ -z "`egetent group ${egid}`" ] 669 if [ -z "`egetent group ${egid}`" ]
839 then 670 then
840 if useq ppc-macos ; then 671 if [[ "${CHOST}" == *-darwin* ]]; then
841 opts="${opts} ${egid}" 672 opts="${opts} ${egid}"
842 else 673 else
843 opts="${opts} -g ${egid}" 674 opts="${opts} -g ${egid}"
844 fi 675 fi
845 else 676 else
859 opts="${opts} ${eextra}" 690 opts="${opts} ${eextra}"
860 691
861 # add the group 692 # add the group
862 local oldsandbox="${SANDBOX_ON}" 693 local oldsandbox="${SANDBOX_ON}"
863 export SANDBOX_ON="0" 694 export SANDBOX_ON="0"
864 if useq ppc-macos ; then 695 case ${CHOST} in
696 *-darwin*)
865 if [ ! -z "${eextra}" ]; 697 if [ ! -z "${eextra}" ];
866 then 698 then
867 einfo "Extra options are not supported on macos yet" 699 einfo "Extra options are not supported on Darwin/OS X yet"
868 einfo "Please report the ebuild along with the info below" 700 einfo "Please report the ebuild along with the info below"
869 einfo "eextra: ${eextra}" 701 einfo "eextra: ${eextra}"
870 die "Required function missing" 702 die "Required function missing"
871 fi 703 fi
872 704
873 # If we need the next available 705 # If we need the next available
874 case ${egid} in 706 case ${egid} in
875 *[!0-9]*) # Non numeric 707 *[!0-9]*) # Non numeric
876 for egid in `jot 898 101`; do 708 for egid in $(seq 101 999); do
877 [ -z "`egetent group ${egid}`" ] && break 709 [ -z "`egetent group ${egid}`" ] && break
878 done 710 done
879 esac 711 esac
880 dscl . create /groups/${egroup} gid ${egid} 712 dscl . create /groups/${egroup} gid ${egid}
881 dscl . create /groups/${egroup} passwd '*' 713 dscl . create /groups/${egroup} passwd '*'
882 elif use x86-fbsd ; then 714 ;;
715
716 *-freebsd*|*-dragonfly*)
883 case ${egid} in 717 case ${egid} in
884 *[!0-9]*) # Non numeric 718 *[!0-9]*) # Non numeric
885 for egid in `jot 898 101`; do 719 for egid in $(seq 101 999); do
886 [ -z "`egetent group ${egid}`" ] && break 720 [ -z "`egetent group ${egid}`" ] && break
887 done 721 done
888 esac 722 esac
889 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed" 723 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed"
890 else 724 ;;
725
726 *-netbsd*)
727 case ${egid} in
728 *[!0-9]*) # Non numeric
729 for egid in $(seq 101 999); do
730 [ -z "`egetent group ${egid}`" ] && break
731 done
732 esac
733 groupadd -g ${egid} ${egroup} || die "enewgroup failed"
734 ;;
735
736 *)
891 groupadd ${opts} ${egroup} || die "enewgroup failed" 737 groupadd ${opts} ${egroup} || die "enewgroup failed"
892 fi 738 ;;
739 esac
893 export SANDBOX_ON="${oldsandbox}" 740 export SANDBOX_ON="${oldsandbox}"
894} 741}
895 742
896# Simple script to replace 'dos2unix' binaries 743# Simple script to replace 'dos2unix' binaries
897# vapier@gentoo.org 744# vapier@gentoo.org
914 761
915# Make a desktop file ! 762# Make a desktop file !
916# Great for making those icons in kde/gnome startmenu ! 763# Great for making those icons in kde/gnome startmenu !
917# Amaze your friends ! Get the women ! Join today ! 764# Amaze your friends ! Get the women ! Join today !
918# 765#
919# make_desktop_entry(<binary>, [name], [icon], [type], [path]) 766# make_desktop_entry(<command>, [name], [icon], [type], [path])
920# 767#
921# binary: what binary does the app run with ? 768# binary: what command does the app run with ?
922# name: the name that will show up in the menu 769# name: the name that will show up in the menu
923# icon: give your little like a pretty little icon ... 770# icon: give your little like a pretty little icon ...
924# this can be relative (to /usr/share/pixmaps) or 771# this can be relative (to /usr/share/pixmaps) or
925# a full path to an icon 772# a full path to an icon
926# type: what kind of application is this ? for categories: 773# type: what kind of application is this ? for categories:
927# http://www.freedesktop.org/standards/menu-spec/ 774# http://www.freedesktop.org/Standards/desktop-entry-spec
928# path: if your app needs to startup in a specific dir 775# path: if your app needs to startup in a specific dir
929make_desktop_entry() { 776make_desktop_entry() {
930 [ -z "$1" ] && eerror "make_desktop_entry: You must specify the executable" && return 1 777 [[ -z $1 ]] && eerror "make_desktop_entry: You must specify the executable" && return 1
931 778
932 local exec="${1}" 779 local exec=${1}
933 local name="${2:-${PN}}" 780 local name=${2:-${PN}}
934 local icon="${3:-${PN}.png}" 781 local icon=${3:-${PN}.png}
935 local type="${4}" 782 local type=${4}
936 local subdir="${6}" 783 local path=${5}
937 local path="${5:-${GAMES_BINDIR}}" 784
938 if [ -z "${type}" ] 785 if [[ -z ${type} ]] ; then
939 then 786 local catmaj=${CATEGORY%%-*}
940 case ${CATEGORY} in 787 local catmin=${CATEGORY##*-}
941 "app-emulation") 788 case ${catmaj} in
942 type=Emulator 789 app)
943 subdir="Emulation" 790 case ${catmin} in
791 admin) type=System;;
792 cdr) type=DiscBurning;;
793 dicts) type=Dictionary;;
794 editors) type=TextEditor;;
795 emacs) type=TextEditor;;
796 emulation) type=Emulator;;
797 laptop) type=HardwareSettings;;
798 office) type=Office;;
799 vim) type=TextEditor;;
800 xemacs) type=TextEditor;;
801 *) type=;;
802 esac
944 ;; 803 ;;
945 "games-"*) 804
946 type=Game 805 dev)
947 subdir="Games" 806 type="Development"
948 ;; 807 ;;
949 "net-"*) 808
950 type=Network 809 games)
951 subdir="${type}" 810 case ${catmin} in
811 action) type=ActionGame;;
812 arcade) type=ArcadeGame;;
813 board) type=BoardGame;;
814 kid) type=KidsGame;;
815 emulation) type=Emulator;;
816 puzzle) type=LogicGame;;
817 rpg) type=RolePlaying;;
818 roguelike) type=RolePlaying;;
819 simulation) type=Simulation;;
820 sports) type=SportsGame;;
821 strategy) type=StrategyGame;;
822 *) type=;;
823 esac
824 type="Game;${type}"
952 ;; 825 ;;
826
827 mail)
828 type="Network;Email"
829 ;;
830
831 media)
832 case ${catmin} in
833 gfx) type=Graphics;;
834 radio) type=Tuner;;
835 sound) type=Audio;;
836 tv) type=TV;;
837 video) type=Video;;
838 *) type=;;
839 esac
840 type="AudioVideo;${type}"
841 ;;
842
843 net)
844 case ${catmin} in
845 dialup) type=Dialup;;
846 ftp) type=FileTransfer;;
847 im) type=InstantMessaging;;
848 irc) type=IRCClient;;
849 mail) type=Email;;
850 news) type=News;;
851 nntp) type=News;;
852 p2p) type=FileTransfer;;
853 *) type=;;
854 esac
855 type="Network;${type}"
856 ;;
857
858 sci)
859 case ${catmin} in
860 astro*) type=Astronomy;;
861 bio*) type=Biology;;
862 calc*) type=Calculator;;
863 chem*) type=Chemistry;;
864 geo*) type=Geology;;
865 math*) type=Math;;
866 *) type=;;
867 esac
868 type="Science;${type}"
869 ;;
870
871 www)
872 case ${catmin} in
873 client) type=WebBrowser;;
874 *) type=;;
875 esac
876 type="Network"
877 ;;
878
953 *) 879 *)
954 type= 880 type=
955 subdir=
956 ;; 881 ;;
957 esac 882 esac
958 fi 883 fi
884 if [ "${SLOT}" == "0" ] ; then
885 local desktop_name="${PN}"
886 else
887 local desktop_name="${PN}-${SLOT}"
888 fi
959 local desktop="${T}/${exec}.desktop" 889 local desktop=${T}/${exec%% *}-${desktop_name}.desktop
890# local desktop=${T}/${exec%% *:-${desktop_name}}.desktop
960 891
961echo "[Desktop Entry] 892echo "[Desktop Entry]
962Encoding=UTF-8 893Encoding=UTF-8
963Version=0.9.2 894Version=0.9.2
964Name=${name} 895Name=${name}
965Type=Application 896Type=Application
966Comment=${DESCRIPTION} 897Comment=${DESCRIPTION}
967Exec=${exec} 898Exec=${exec}
899TryExec=${exec%% *}
968Path=${path} 900Path=${path}
969Icon=${icon} 901Icon=${icon}
970Categories=Application;${type};" > "${desktop}" 902Categories=Application;${type};" > "${desktop}"
971 903
904 (
905 # wrap the env here so that the 'insinto' call
906 # doesn't corrupt the env of the caller
972 insinto /usr/share/applications 907 insinto /usr/share/applications
973 doins "${desktop}" 908 doins "${desktop}"
974 909 )
975 return 0
976} 910}
977 911
978# Make a GDM/KDM Session file 912# Make a GDM/KDM Session file
979# 913#
980# make_desktop_entry(<title>, <command>) 914# make_desktop_entry(<title>, <command>)
981# title: File to execute to start the Window Manager 915# title: File to execute to start the Window Manager
982# command: Name of the Window Manager 916# command: Name of the Window Manager
983 917
984make_session_desktop() { 918make_session_desktop() {
985
986 [ -z "$1" ] && eerror "make_session_desktop: You must specify the title" && return 1 919 [[ -z $1 ]] && eerror "make_session_desktop: You must specify the title" && return 1
987 [ -z "$2" ] && eerror "make_session_desktop: You must specify the command" && return 1 920 [[ -z $2 ]] && eerror "make_session_desktop: You must specify the command" && return 1
988 921
989 local title="${1}" 922 local title=$1
990 local command="${2}" 923 local command=$2
991 local desktop="${T}/${wm}.desktop" 924 local desktop=${T}/${wm}.desktop
992 925
993echo "[Desktop Entry] 926echo "[Desktop Entry]
994Encoding=UTF-8 927Encoding=UTF-8
995Name=${title} 928Name=${title}
996Comment=This session logs you into ${title} 929Comment=This session logs you into ${title}
998TryExec=${command} 931TryExec=${command}
999Type=Application" > "${desktop}" 932Type=Application" > "${desktop}"
1000 933
1001 insinto /usr/share/xsessions 934 insinto /usr/share/xsessions
1002 doins "${desktop}" 935 doins "${desktop}"
1003
1004 return 0
1005} 936}
1006 937
1007domenu() { 938domenu() {
1008 local i 939 local i j
1009 local j
1010 insinto /usr/share/applications 940 insinto /usr/share/applications
1011 for i in ${@} 941 for i in "$@" ; do
1012 do
1013 if [ -f "${i}" ]; 942 if [[ -f ${i} ]] ; then
1014 then
1015 doins ${i} 943 doins "${i}"
1016 elif [ -d "${i}" ]; 944 elif [[ -d ${i} ]] ; then
1017 then
1018 for j in ${i}/*.desktop 945 for j in "${i}"/*.desktop ; do
1019 do
1020 doins ${j} 946 doins "${j}"
1021 done 947 done
1022 fi 948 fi
1023 done 949 done
1024} 950}
951newmenu() {
952 insinto /usr/share/applications
953 newins "$1" "$2"
954}
1025 955
1026doicon() { 956doicon() {
1027 local i 957 local i j
1028 local j
1029 insinto /usr/share/pixmaps 958 insinto /usr/share/pixmaps
1030 for i in ${@} 959 for i in "$@" ; do
1031 do
1032 if [ -f "${i}" ]; 960 if [[ -f ${i} ]] ; then
1033 then
1034 doins ${i} 961 doins "${i}"
1035 elif [ -d "${i}" ]; 962 elif [[ -d ${i} ]] ; then
1036 then
1037 for j in ${i}/*.png 963 for j in "${i}"/*.png ; do
1038 do
1039 doins ${j} 964 doins "${j}"
1040 done 965 done
1041 fi 966 fi
1042 done 967 done
968}
969newicon() {
970 insinto /usr/share/pixmaps
971 newins "$1" "$2"
1043} 972}
1044 973
1045############################################################## 974##############################################################
1046# END: Handle .desktop files and menu entries # 975# END: Handle .desktop files and menu entries #
1047############################################################## 976##############################################################
1048 977
1049 978
1050# for internal use only (unpack_pdv and unpack_makeself) 979# for internal use only (unpack_pdv and unpack_makeself)
1051find_unpackable_file() { 980find_unpackable_file() {
1052 local src="$1" 981 local src=$1
1053 if [ -z "${src}" ] 982 if [[ -z ${src} ]] ; then
1054 then
1055 src="${DISTDIR}/${A}" 983 src=${DISTDIR}/${A}
1056 else 984 else
1057 if [ -e "${DISTDIR}/${src}" ] 985 if [[ -e ${DISTDIR}/${src} ]] ; then
1058 then
1059 src="${DISTDIR}/${src}" 986 src=${DISTDIR}/${src}
1060 elif [ -e "${PWD}/${src}" ] 987 elif [[ -e ${PWD}/${src} ]] ; then
1061 then
1062 src="${PWD}/${src}" 988 src=${PWD}/${src}
1063 elif [ -e "${src}" ] 989 elif [[ -e ${src} ]] ; then
1064 then
1065 src="${src}" 990 src=${src}
1066 fi
1067 fi 991 fi
1068 [ ! -e "${src}" ] && die "Could not find requested archive ${src}" 992 fi
993 [[ ! -e ${src} ]] && return 1
1069 echo "${src}" 994 echo "${src}"
1070} 995}
1071 996
1072# Unpack those pesky pdv generated files ... 997# Unpack those pesky pdv generated files ...
1073# They're self-unpacking programs with the binary package stuffed in 998# They're self-unpacking programs with the binary package stuffed in
1088# lseek 1013# lseek
1089# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin 1014# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin
1090# lseek(3, -4, SEEK_END) = 2981250 1015# lseek(3, -4, SEEK_END) = 2981250
1091# thus we would pass in the value of '4' as the second parameter. 1016# thus we would pass in the value of '4' as the second parameter.
1092unpack_pdv() { 1017unpack_pdv() {
1093 local src="`find_unpackable_file $1`" 1018 local src=$(find_unpackable_file $1)
1094 local sizeoff_t="$2" 1019 local sizeoff_t=$2
1095 1020
1021 [[ -z ${src} ]] && die "Could not locate source for '$1'"
1096 [ -z "${sizeoff_t}" ] && die "No idea what off_t size was used for this pdv :(" 1022 [[ -z ${sizeoff_t} ]] && die "No idea what off_t size was used for this pdv :("
1097 1023
1098 local shrtsrc="`basename ${src}`" 1024 local shrtsrc=$(basename "${src}")
1099 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1025 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1100 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"` 1026 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"`
1101 local tailskip=`tail -c $((${sizeoff_t}*2)) ${src} | head -c ${sizeoff_t} | hexdump -e \"%i\"` 1027 local tailskip=`tail -c $((${sizeoff_t}*2)) ${src} | head -c ${sizeoff_t} | hexdump -e \"%i\"`
1102 1028
1103 # grab metadata for debug reasons 1029 # grab metadata for debug reasons
1167# Usage: unpack_makeself [file to unpack] [offset] [tail|dd] 1093# Usage: unpack_makeself [file to unpack] [offset] [tail|dd]
1168# - If the file is not specified then unpack will utilize ${A}. 1094# - If the file is not specified then unpack will utilize ${A}.
1169# - If the offset is not specified then we will attempt to extract 1095# - If the offset is not specified then we will attempt to extract
1170# the proper offset from the script itself. 1096# the proper offset from the script itself.
1171unpack_makeself() { 1097unpack_makeself() {
1098 local src_input=${1:-${A}}
1172 local src="$(find_unpackable_file "$1")" 1099 local src=$(find_unpackable_file "${src_input}")
1173 local skip="$2" 1100 local skip=$2
1174 local exe="$3" 1101 local exe=$3
1175 1102
1103 [[ -z ${src} ]] && die "Could not locate source for '${src_input}'"
1104
1176 local shrtsrc="$(basename "${src}")" 1105 local shrtsrc=$(basename "${src}")
1177 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1106 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1178 if [ -z "${skip}" ] 1107 if [[ -z ${skip} ]] ; then
1179 then
1180 local ver="`grep -a '#.*Makeself' ${src} | awk '{print $NF}'`" 1108 local ver=$(grep -a '#.*Makeself' "${src}" | awk '{print $NF}')
1181 local skip=0 1109 local skip=0
1182 exe=tail 1110 exe=tail
1183 case ${ver} in 1111 case ${ver} in
1184 1.5.*) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same 1112 1.5.*|1.6.0-nv) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same
1185 skip=$(grep -a ^skip= "${src}" | cut -d= -f2) 1113 skip=$(grep -a ^skip= "${src}" | cut -d= -f2)
1186 ;; 1114 ;;
1187 2.0|2.0.1) 1115 2.0|2.0.1)
1188 skip=$(grep -a ^$'\t'tail "${src}" | awk '{print $2}' | cut -b2-) 1116 skip=$(grep -a ^$'\t'tail "${src}" | awk '{print $2}' | cut -b2-)
1189 ;; 1117 ;;
1197 ;; 1125 ;;
1198 2.1.3) 1126 2.1.3)
1199 skip=`grep -a ^offset= "${src}" | awk '{print $3}'` 1127 skip=`grep -a ^offset= "${src}" | awk '{print $3}'`
1200 let skip="skip + 1" 1128 let skip="skip + 1"
1201 ;; 1129 ;;
1202 2.1.4) 1130 2.1.4|2.1.5)
1203 skip=$(grep -a offset=.*head.*wc "${src}" | awk '{print $3}' | head -n 1) 1131 skip=$(grep -a offset=.*head.*wc "${src}" | awk '{print $3}' | head -n 1)
1204 skip=$(head -n ${skip} "${src}" | wc -c) 1132 skip=$(head -n ${skip} "${src}" | wc -c)
1205 exe="dd" 1133 exe="dd"
1206 ;; 1134 ;;
1207 *) 1135 *)
1252check_license() { 1180check_license() {
1253 local lic=$1 1181 local lic=$1
1254 if [ -z "${lic}" ] ; then 1182 if [ -z "${lic}" ] ; then
1255 lic="${PORTDIR}/licenses/${LICENSE}" 1183 lic="${PORTDIR}/licenses/${LICENSE}"
1256 else 1184 else
1257 if [ -e "${PORTDIR}/licenses/${src}" ] ; then 1185 if [ -e "${PORTDIR}/licenses/${lic}" ] ; then
1258 lic="${PORTDIR}/licenses/${src}" 1186 lic="${PORTDIR}/licenses/${lic}"
1259 elif [ -e "${PWD}/${src}" ] ; then 1187 elif [ -e "${PWD}/${lic}" ] ; then
1260 lic="${PWD}/${src}" 1188 lic="${PWD}/${lic}"
1261 elif [ -e "${src}" ] ; then 1189 elif [ -e "${lic}" ] ; then
1262 lic="${src}" 1190 lic="${lic}"
1263 fi
1264 fi 1191 fi
1192 fi
1265 [ ! -f "${lic}" ] && die "Could not find requested license ${src}" 1193 [ ! -f "${lic}" ] && die "Could not find requested license ${lic}"
1266 local l="`basename ${lic}`" 1194 local l="`basename ${lic}`"
1267 1195
1268 # here is where we check for the licenses the user already 1196 # here is where we check for the licenses the user already
1269 # accepted ... if we don't find a match, we make the user accept 1197 # accepted ... if we don't find a match, we make the user accept
1270 local shopts=$- 1198 local shopts=$-
1312# and when the function returns, you can assume that the cd has been 1240# and when the function returns, you can assume that the cd has been
1313# found at CDROM_ROOT. 1241# found at CDROM_ROOT.
1314# 1242#
1315# normally the cdrom functions will refer to the cds as 'cd #1', 'cd #2', 1243# normally the cdrom functions will refer to the cds as 'cd #1', 'cd #2',
1316# etc... if you want to give the cds better names, then just export 1244# etc... if you want to give the cds better names, then just export
1317# the CDROM_NAME_X variables before calling cdrom_get_cds(). 1245# the appropriate CDROM_NAME variable before calling cdrom_get_cds().
1246# - CDROM_NAME="fooie cd" - for when you only want 1 cd
1247# - CDROM_NAME_1="install cd" - for when you want more than 1 cd
1248# CDROM_NAME_2="data cd"
1249# - CDROM_NAME_SET=( "install cd" "data cd" ) - short hand for CDROM_NAME_#
1318# 1250#
1319# for those multi cd ebuilds, see the cdrom_load_next_cd() below. 1251# for those multi cd ebuilds, see the cdrom_load_next_cd() below.
1320# 1252#
1321# Usage: cdrom_get_cds <file on cd1> [file on cd2] [file on cd3] [...] 1253# Usage: cdrom_get_cds <file on cd1> [file on cd2] [file on cd3] [...]
1322# - this will attempt to locate a cd based upon a file that is on 1254# - this will attempt to locate a cd based upon a file that is on
1326 # first we figure out how many cds we're dealing with by 1258 # first we figure out how many cds we're dealing with by
1327 # the # of files they gave us 1259 # the # of files they gave us
1328 local cdcnt=0 1260 local cdcnt=0
1329 local f= 1261 local f=
1330 for f in "$@" ; do 1262 for f in "$@" ; do
1331 cdcnt=$((cdcnt + 1)) 1263 ((++cdcnt))
1332 export CDROM_CHECK_${cdcnt}="$f" 1264 export CDROM_CHECK_${cdcnt}="$f"
1333 done 1265 done
1334 export CDROM_TOTAL_CDS=${cdcnt} 1266 export CDROM_TOTAL_CDS=${cdcnt}
1335 export CDROM_CURRENT_CD=1 1267 export CDROM_CURRENT_CD=1
1336 1268
1337 # now we see if the user gave use CD_ROOT ... 1269 # now we see if the user gave use CD_ROOT ...
1338 # if they did, let's just believe them that it's correct 1270 # if they did, let's just believe them that it's correct
1339 if [[ ! -z ${CD_ROOT} ]] ; then
1340 export CDROM_ROOT=${CD_ROOT}
1341 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1342 return
1343 fi
1344 # do the same for CD_ROOT_X
1345 if [[ ! -z ${CD_ROOT_1} ]] ; then 1271 if [[ -n ${CD_ROOT}${CD_ROOT_1} ]] ; then
1346 local var= 1272 local var=
1347 cdcnt=0 1273 cdcnt=0
1348 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1274 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1349 cdcnt=$((cdcnt + 1)) 1275 ((++cdcnt))
1350 var="CD_ROOT_${cdcnt}" 1276 var="CD_ROOT_${cdcnt}"
1277 [[ -z ${!var} ]] && var="CD_ROOT"
1351 if [[ -z ${!var} ]] ; then 1278 if [[ -z ${!var} ]] ; then
1352 eerror "You must either use just the CD_ROOT" 1279 eerror "You must either use just the CD_ROOT"
1353 eerror "or specify ALL the CD_ROOT_X variables." 1280 eerror "or specify ALL the CD_ROOT_X variables."
1354 eerror "In this case, you will need ${CDROM_TOTAL_CDS} CD_ROOT_X variables." 1281 eerror "In this case, you will need ${CDROM_TOTAL_CDS} CD_ROOT_X variables."
1355 die "could not locate CD_ROOT_${cdcnt}" 1282 die "could not locate CD_ROOT_${cdcnt}"
1356 fi 1283 fi
1357 export CDROM_ROOTS_${cdcnt}="${!var}"
1358 done 1284 done
1359 export CDROM_ROOT=${CDROM_ROOTS_1} 1285 export CDROM_ROOT=${CD_ROOT_1:-${CD_ROOT}}
1360 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1286 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1287 export CDROM_SET=-1
1288 for f in ${CDROM_CHECK_1//:/ } ; do
1289 ((++CDROM_SET))
1290 [[ -e ${CD_ROOT}/${f} ]] && break
1291 done
1292 export CDROM_MATCH=${f}
1361 return 1293 return
1362 fi 1294 fi
1363 1295
1296 # User didn't help us out so lets make sure they know they can
1297 # simplify the whole process ...
1364 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then 1298 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1365 einfon "This ebuild will need the " 1299 einfo "This ebuild will need the ${CDROM_NAME:-cdrom for ${PN}}"
1366 if [[ -z ${CDROM_NAME} ]] ; then
1367 echo "cdrom for ${PN}."
1368 else
1369 echo "${CDROM_NAME}."
1370 fi
1371 echo 1300 echo
1372 einfo "If you do not have the CD, but have the data files" 1301 einfo "If you do not have the CD, but have the data files"
1373 einfo "mounted somewhere on your filesystem, just export" 1302 einfo "mounted somewhere on your filesystem, just export"
1374 einfo "the variable CD_ROOT so that it points to the" 1303 einfo "the variable CD_ROOT so that it points to the"
1375 einfo "directory containing the files." 1304 einfo "directory containing the files."
1376 echo 1305 echo
1377 einfo "For example:" 1306 einfo "For example:"
1378 einfo "export CD_ROOT=/mnt/cdrom" 1307 einfo "export CD_ROOT=/mnt/cdrom"
1379 echo 1308 echo
1380 else 1309 else
1310 if [[ -n ${CDROM_NAME_SET} ]] ; then
1311 # Translate the CDROM_NAME_SET array into CDROM_NAME_#
1312 cdcnt=0
1313 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1314 ((++cdcnt))
1315 export CDROM_NAME_${cdcnt}="${CDROM_NAME_SET[$((${cdcnt}-1))]}"
1316 done
1317 fi
1318
1381 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds." 1319 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds."
1382 cdcnt=0 1320 cdcnt=0
1383 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1321 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1384 cdcnt=$((cdcnt + 1)) 1322 ((++cdcnt))
1385 var="CDROM_NAME_${cdcnt}" 1323 var="CDROM_NAME_${cdcnt}"
1386 [[ ! -z ${!var} ]] && einfo " CD ${cdcnt}: ${!var}" 1324 [[ ! -z ${!var} ]] && einfo " CD ${cdcnt}: ${!var}"
1387 done 1325 done
1388 echo 1326 echo
1389 einfo "If you do not have the CDs, but have the data files" 1327 einfo "If you do not have the CDs, but have the data files"
1390 einfo "mounted somewhere on your filesystem, just export" 1328 einfo "mounted somewhere on your filesystem, just export"
1391 einfo "the following variables so they point to the right place:" 1329 einfo "the following variables so they point to the right place:"
1392 einfon "" 1330 einfon ""
1393 cdcnt=0 1331 cdcnt=0
1394 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1332 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1395 cdcnt=$((cdcnt + 1)) 1333 ((++cdcnt))
1396 echo -n " CD_ROOT_${cdcnt}" 1334 echo -n " CD_ROOT_${cdcnt}"
1397 done 1335 done
1398 echo 1336 echo
1399 einfo "Or, if you have all the files in the same place, or" 1337 einfo "Or, if you have all the files in the same place, or"
1400 einfo "you only have one cdrom, you can export CD_ROOT" 1338 einfo "you only have one cdrom, you can export CD_ROOT"
1403 echo 1341 echo
1404 einfo "For example:" 1342 einfo "For example:"
1405 einfo "export CD_ROOT_1=/mnt/cdrom" 1343 einfo "export CD_ROOT_1=/mnt/cdrom"
1406 echo 1344 echo
1407 fi 1345 fi
1346
1347 export CDROM_SET=""
1408 export CDROM_CURRENT_CD=0 1348 export CDROM_CURRENT_CD=0
1409 cdrom_load_next_cd 1349 cdrom_load_next_cd
1410} 1350}
1411 1351
1412# this is only used when you need access to more than one cd. 1352# this is only used when you need access to more than one cd.
1413# when you have finished using the first cd, just call this function. 1353# when you have finished using the first cd, just call this function.
1414# when it returns, CDROM_ROOT will be pointing to the second cd. 1354# when it returns, CDROM_ROOT will be pointing to the second cd.
1415# remember, you can only go forward in the cd chain, you can't go back. 1355# remember, you can only go forward in the cd chain, you can't go back.
1416cdrom_load_next_cd() { 1356cdrom_load_next_cd() {
1417 export CDROM_CURRENT_CD=$((CDROM_CURRENT_CD + 1))
1418 local var= 1357 local var
1419 1358 ((++CDROM_CURRENT_CD))
1420 if [[ ! -z ${CD_ROOT} ]] ; then
1421 einfo "Using same root as before for CD #${CDROM_CURRENT_CD}"
1422 return
1423 fi
1424 1359
1425 unset CDROM_ROOT 1360 unset CDROM_ROOT
1426 var=CDROM_ROOTS_${CDROM_CURRENT_CD} 1361 var=CD_ROOT_${CDROM_CURRENT_CD}
1362 [[ -z ${!var} ]] && var="CD_ROOT"
1427 if [[ -z ${!var} ]] ; then 1363 if [[ -z ${!var} ]] ; then
1428 var="CDROM_CHECK_${CDROM_CURRENT_CD}" 1364 var="CDROM_CHECK_${CDROM_CURRENT_CD}"
1429 cdrom_locate_file_on_cd ${!var} 1365 _cdrom_locate_file_on_cd ${!var}
1430 else 1366 else
1431 export CDROM_ROOT=${!var} 1367 export CDROM_ROOT=${!var}
1432 fi 1368 fi
1433 1369
1434 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1370 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1439# all it does is try to locate a give file on a cd ... if the cd isn't 1375# all it does is try to locate a give file on a cd ... if the cd isn't
1440# found, then a message asking for the user to insert the cdrom will be 1376# found, then a message asking for the user to insert the cdrom will be
1441# displayed and we'll hang out here until: 1377# displayed and we'll hang out here until:
1442# (1) the file is found on a mounted cdrom 1378# (1) the file is found on a mounted cdrom
1443# (2) the user hits CTRL+C 1379# (2) the user hits CTRL+C
1444cdrom_locate_file_on_cd() { 1380_cdrom_locate_file_on_cd() {
1381 local mline=""
1382 local showedmsg=0
1383
1445 while [[ -z ${CDROM_ROOT} ]] ; do 1384 while [[ -z ${CDROM_ROOT} ]] ; do
1385 local i=0
1386 local -a cdset=(${*//:/ })
1387 if [[ -n ${CDROM_SET} ]] ; then
1388 cdset=(${cdset[${CDROM_SET}]})
1389 fi
1390
1391 while [[ -n ${cdset[${i}]} ]] ; do
1446 local dir="$(dirname ${@})" 1392 local dir=$(dirname ${cdset[${i}]})
1447 local file="$(basename ${@})" 1393 local file=$(basename ${cdset[${i}]})
1448 local mline=""
1449 local showedmsg=0
1450 1394
1451 for mline in $(mount | egrep -e '(iso|cdrom)' | awk '{print $3}') ; do 1395 for mline in $(mount | gawk '/(iso|cdrom|fs=cdfss)/ {print $3}') ; do
1452 [[ -d ${mline}/${dir} ]] || continue 1396 [[ -d ${mline}/${dir} ]] || continue
1453 [[ ! -z $(find ${mline}/${dir} -iname ${file} -maxdepth 1) ]] \ 1397 if [[ -n $(find ${mline}/${dir} -maxdepth 1 -iname ${file}) ]] ; then
1454 && export CDROM_ROOT=${mline} 1398 export CDROM_ROOT=${mline}
1399 export CDROM_SET=${i}
1400 export CDROM_MATCH=${cdset[${i}]}
1401 return
1402 fi
1403 done
1404
1405 ((++i))
1455 done 1406 done
1456 1407
1457 if [[ -z ${CDROM_ROOT} ]] ; then
1458 echo 1408 echo
1459 if [[ ${showedmsg} -eq 0 ]] ; then 1409 if [[ ${showedmsg} -eq 0 ]] ; then
1460 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then 1410 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1461 if [[ -z ${CDROM_NAME} ]] ; then 1411 if [[ -z ${CDROM_NAME} ]] ; then
1462 einfo "Please insert the cdrom for ${PN} now !" 1412 einfo "Please insert+mount the cdrom for ${PN} now !"
1463 else
1464 einfo "Please insert the ${CDROM_NAME} cdrom now !"
1465 fi
1466 else 1413 else
1467 if [[ -z ${CDROM_NAME_1} ]] ; then
1468 einfo "Please insert cd #${CDROM_CURRENT_CD} for ${PN} now !"
1469 else
1470 local var="CDROM_NAME_${CDROM_CURRENT_CD}"
1471 einfo "Please insert+mount the ${!var} cdrom now !" 1414 einfo "Please insert+mount the ${CDROM_NAME} cdrom now !"
1472 fi
1473 fi 1415 fi
1474 showedmsg=1 1416 else
1417 if [[ -z ${CDROM_NAME_1} ]] ; then
1418 einfo "Please insert+mount cd #${CDROM_CURRENT_CD} for ${PN} now !"
1419 else
1420 local var="CDROM_NAME_${CDROM_CURRENT_CD}"
1421 einfo "Please insert+mount the ${!var} cdrom now !"
1422 fi
1475 fi 1423 fi
1424 showedmsg=1
1425 fi
1476 einfo "Press return to scan for the cd again" 1426 einfo "Press return to scan for the cd again"
1477 einfo "or hit CTRL+C to abort the emerge." 1427 einfo "or hit CTRL+C to abort the emerge."
1478 read 1428 echo
1479 fi 1429 einfo "If you are having trouble with the detection"
1430 einfo "of your CD, it is possible that you do not have"
1431 einfo "Joliet support enabled in your kernel. Please"
1432 einfo "check that CONFIG_JOLIET is enabled in your kernel."
1433 read || die "something is screwed with your system"
1480 done 1434 done
1481} 1435}
1482 1436
1483# Make sure that LINGUAS only contains languages that 1437# Make sure that LINGUAS only contains languages that
1484# a package can support 1438# a package can support
1491# The -i builds a list of po files found in all the 1445# The -i builds a list of po files found in all the
1492# directories and uses the intersection of the lists. 1446# directories and uses the intersection of the lists.
1493# The -u builds a list of po files found in all the 1447# The -u builds a list of po files found in all the
1494# directories and uses the union of the lists. 1448# directories and uses the union of the lists.
1495strip-linguas() { 1449strip-linguas() {
1496 local ls newls 1450 local ls newls nols
1497 if [ "$1" == "-i" ] || [ "$1" == "-u" ] ; then 1451 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then
1498 local op="$1"; shift 1452 local op=$1; shift
1499 ls=" $(find "$1" -name '*.po' -printf '%f ') "; shift 1453 ls=$(find "$1" -name '*.po' -exec basename {} .po \;); shift
1500 local d f 1454 local d f
1501 for d in "$@" ; do 1455 for d in "$@" ; do
1502 if [ "${op}" == "-u" ] ; then 1456 if [[ ${op} == "-u" ]] ; then
1503 newls="${ls}" 1457 newls=${ls}
1504 else 1458 else
1505 newls="" 1459 newls=""
1506 fi 1460 fi
1507 for f in $(find "$d" -name '*.po' -printf '%f ') ; do 1461 for f in $(find "$d" -name '*.po' -exec basename {} .po \;) ; do
1508 if [ "${op}" == "-i" ] ; then 1462 if [[ ${op} == "-i" ]] ; then
1509 [ "${ls/ ${f} /}" != "${ls}" ] && newls="${newls} ${f}" 1463 hasq ${f} ${ls} && newls="${newls} ${f}"
1510 else 1464 else
1511 [ "${ls/ ${f} /}" == "${ls}" ] && newls="${newls} ${f}" 1465 hasq ${f} ${ls} || newls="${newls} ${f}"
1512 fi 1466 fi
1513 done 1467 done
1514 ls="${newls}" 1468 ls=${newls}
1515 done 1469 done
1516 ls="${ls//.po}"
1517 else 1470 else
1518 ls="$@" 1471 ls="$@"
1519 fi 1472 fi
1520 1473
1521 ls=" ${ls} " 1474 nols=""
1522 newls="" 1475 newls=""
1523 for f in ${LINGUAS} ; do 1476 for f in ${LINGUAS} ; do
1524 if [ "${ls/ ${f} /}" != "${ls}" ] ; then 1477 if hasq ${f} ${ls} ; then
1525 newls="${newls} ${f}" 1478 newls="${newls} ${f}"
1526 else 1479 else
1527 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA" 1480 nols="${nols} ${f}"
1528 fi 1481 fi
1529 done 1482 done
1530 if [ -z "${newls}" ] ; then 1483 [[ -n ${nols} ]] \
1531 unset LINGUAS 1484 && ewarn "Sorry, but ${PN} does not support the LINGUAs:" ${nols}
1532 else
1533 export LINGUAS="${newls}" 1485 export LINGUAS=${newls:1}
1534 fi
1535} 1486}
1536 1487
1537# moved from kernel.eclass since they are generally useful outside of 1488# moved from kernel.eclass since they are generally useful outside of
1538# kernel.eclass -iggy (20041002) 1489# kernel.eclass -iggy (20041002)
1539 1490
1540# the following functions are useful in kernel module ebuilds, etc. 1491# the following functions are useful in kernel module ebuilds, etc.
1541# for an example see ivtv or drbd ebuilds 1492# for an example see ivtv or drbd ebuilds
1542 1493
1543# set's ARCH to match what the kernel expects 1494# set's ARCH to match what the kernel expects
1544set_arch_to_kernel() { 1495set_arch_to_kernel() {
1496 i=10
1497 while ((i--)) ; do
1498 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass"
1499 done
1545 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}" 1500 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}"
1546 case ${ARCH} in 1501 case ${ARCH} in
1547 x86) export ARCH="i386";; 1502 x86) export ARCH="i386";;
1548 amd64) export ARCH="x86_64";; 1503 amd64) export ARCH="x86_64";;
1549 hppa) export ARCH="parisc";; 1504 hppa) export ARCH="parisc";;
1550 mips) export ARCH="mips";; 1505 mips) export ARCH="mips";;
1506 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!
1551 *) export ARCH="${ARCH}";; 1507 *) export ARCH="${ARCH}";;
1552 esac 1508 esac
1553} 1509}
1554 1510
1555# set's ARCH back to what portage expects 1511# set's ARCH back to what portage expects
1556set_arch_to_portage() { 1512set_arch_to_portage() {
1513 i=10
1514 while ((i--)) ; do
1515 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass"
1516 done
1557 export ARCH="${EUTILS_ECLASS_PORTAGE_ARCH}" 1517 export ARCH="${EUTILS_ECLASS_PORTAGE_ARCH}"
1558} 1518}
1559 1519
1560# Jeremy Huddleston <eradicator@gentoo.org>: 1520# Jeremy Huddleston <eradicator@gentoo.org>:
1561# preserve_old_lib /path/to/libblah.so.0 1521# preserve_old_lib /path/to/libblah.so.0
1562# preserve_old_lib_notify /path/to/libblah.so.0 1522# preserve_old_lib_notify /path/to/libblah.so.0
1563# 1523#
1564# These functions are useful when a lib in your package changes --soname. Such 1524# These functions are useful when a lib in your package changes --library. Such
1565# an example might be from libogg.so.0 to libogg.so.1. Removing libogg.so.0 1525# an example might be from libogg.so.0 to libogg.so.1. Removing libogg.so.0
1566# would break packages that link against it. Most people get around this 1526# would break packages that link against it. Most people get around this
1567# by using the portage SLOT mechanism, but that is not always a relevant 1527# by using the portage SLOT mechanism, but that is not always a relevant
1568# solution, so instead you can add the following to your ebuilds: 1528# solution, so instead you can add the following to your ebuilds:
1569# 1529#
1596 LIB=$1 1556 LIB=$1
1597 1557
1598 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then 1558 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then
1599 SONAME=`basename ${LIB}` 1559 SONAME=`basename ${LIB}`
1600 1560
1601 einfo "An old version of an installed library was detected on your system." 1561 ewarn "An old version of an installed library was detected on your system."
1602 einfo "In order to avoid breaking packages that link against is, this older version" 1562 ewarn "In order to avoid breaking packages that link against it, this older version"
1603 einfo "is not being removed. In order to make full use of this newer version," 1563 ewarn "is not being removed. In order to make full use of this newer version,"
1604 einfo "you will need to execute the following command:" 1564 ewarn "you will need to execute the following command:"
1605 einfo " revdep-rebuild --soname ${SONAME}" 1565 ewarn " revdep-rebuild --library ${SONAME}"
1606 einfo 1566 ewarn
1607 einfo "After doing that, you can safely remove ${LIB}" 1567 ewarn "After doing that, you can safely remove ${LIB}"
1608 einfo "Note: 'emerge gentoolkit' to get revdep-rebuild" 1568 ewarn "Note: 'emerge gentoolkit' to get revdep-rebuild"
1609 fi 1569 fi
1610} 1570}
1611 1571
1612# Hack for people to figure out if a package was built with 1572# Hack for people to figure out if a package was built with
1613# certain USE flags 1573# certain USE flags
1614# 1574#
1615# Usage: built_with_use [-a|-o] <DEPEND ATOM> <List of USE flags> 1575# Usage: built_with_use [-a|-o] <DEPEND ATOM> <List of USE flags>
1616# ex: built_with_use xchat gtk2 1576# ex: built_with_use xchat gtk2
1617# 1577#
1621built_with_use() { 1581built_with_use() {
1622 local opt=$1 1582 local opt=$1
1623 [[ ${opt:0:1} = "-" ]] && shift || opt="-a" 1583 [[ ${opt:0:1} = "-" ]] && shift || opt="-a"
1624 1584
1625 local PKG=$(best_version $1) 1585 local PKG=$(best_version $1)
1586 [[ -z ${PKG} ]] && die "Unable to resolve $1 to an installed package"
1626 shift 1587 shift
1627 1588
1628 local USEFILE="${ROOT}/var/db/pkg/${PKG}/USE" 1589 local USEFILE=${ROOT}/var/db/pkg/${PKG}/USE
1629 [[ ! -e ${USEFILE} ]] && return 1 1590
1591 # if the USE file doesnt exist, assume the $PKG is either
1592 # injected or package.provided
1593 [[ ! -e ${USEFILE} ]] && die "Unable to determine what USE flags $PKG was built with"
1630 1594
1631 local USE_BUILT=$(<${USEFILE}) 1595 local USE_BUILT=$(<${USEFILE})
1632 while [[ $# -gt 0 ]] ; do 1596 while [[ $# -gt 0 ]] ; do
1633 if [[ ${opt} = "-o" ]] ; then 1597 if [[ ${opt} = "-o" ]] ; then
1634 has $1 ${USE_BUILT} && return 0 1598 has $1 ${USE_BUILT} && return 0
1638 shift 1602 shift
1639 done 1603 done
1640 [[ ${opt} = "-a" ]] 1604 [[ ${opt} = "-a" ]]
1641} 1605}
1642 1606
1643# Many configure scripts wrongly bail when a C++ compiler 1607# Many configure scripts wrongly bail when a C++ compiler
1644# could not be detected. #73450 1608# could not be detected. #73450
1645epunt_cxx() { 1609epunt_cxx() {
1646 local dir=$1 1610 local dir=$1
1647 [[ -z ${dir} ]] && dir=${S} 1611 [[ -z ${dir} ]] && dir=${S}
1648 ebegin "Removing useless C++ checks" 1612 ebegin "Removing useless C++ checks"
1651 patch -p0 "${f}" "${PORTDIR}/eclass/ELT-patches/nocxx/nocxx.patch" > /dev/null 1615 patch -p0 "${f}" "${PORTDIR}/eclass/ELT-patches/nocxx/nocxx.patch" > /dev/null
1652 done 1616 done
1653 eend 0 1617 eend 0
1654} 1618}
1655 1619
1656# get_abi_var <VAR> [<ABI>] 1620# dopamd <file> [more files]
1657# returns the value of ${<VAR>_<ABI>} which should be set in make.defaults
1658# 1621#
1659# ex: 1622# Install pam auth config file in /etc/pam.d
1660# CFLAGS=$(get_abi_var CFLAGS sparc32) # CFLAGS=-m32 1623dopamd() {
1624 [[ -z $1 ]] && die "dopamd requires at least one argument"
1625
1626 use pam || return 0
1627
1628 INSDESTTREE=/etc/pam.d \
1629 doins "$@" || die "failed to install $@"
1630}
1631# newpamd <old name> <new name>
1661# 1632#
1662# Note that the prefered method is to set CC="$(tc-getCC) $(get_abi_CFLAGS)" 1633# Install pam file <old name> as <new name> in /etc/pam.d
1663# This will hopefully be added to portage soon... 1634newpamd() {
1664# 1635 [[ $# -ne 2 ]] && die "newpamd requires two arguements"
1665# If <ABI> is not specified, ${ABI} is used. 1636
1666# If <ABI> is not specified and ${ABI} is not defined, ${DEFAULT_ABI} is used. 1637 use pam || return 0
1667# If <ABI> is not specified and ${ABI} and ${DEFAULT_ABI} are not defined, we return an empty string. 1638
1668# 1639 INSDESTTREE=/etc/pam.d \
1669# Jeremy Huddleston <eradicator@gentoo.org> 1640 newins "$1" "$2" || die "failed to install $1 as $2"
1670get_abi_var() { 1641}
1671 local flag=$1 1642
1672 local abi 1643# make a wrapper script ...
1673 if [ $# -gt 1 ]; then 1644# NOTE: this was originally games_make_wrapper, but I noticed other places where
1674 abi=$1 1645# this could be used, so I have moved it here and made it not games-specific
1646# -- wolf31o2
1647# $1 == wrapper name
1648# $2 == binary to run
1649# $3 == directory to chdir before running binary
1650# $4 == extra LD_LIBRARY_PATH's (make it : delimited)
1651# $5 == path for wrapper
1652make_wrapper() {
1653 local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5
1654 local tmpwrapper=$(emktemp)
1655 # We don't want to quote ${bin} so that people can pass complex
1656 # things as $bin ... "./someprog --args"
1657 cat << EOF > "${tmpwrapper}"
1658#!/bin/sh
1659cd "${chdir:-.}"
1675 elif [ -n "${ABI}" ]; then 1660if [ -n "${libdir}" ] ; then
1676 abi=${ABI} 1661 if [ "\${LD_LIBRARY_PATH+set}" = "set" ] ; then
1677 elif [ -n "${DEFAULT_ABI}" ]; then 1662 export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${libdir}"
1678 abi=${DEFAULT_ABI}
1679 else 1663 else
1680 return 1 1664 export LD_LIBRARY_PATH="${libdir}"
1665 fi
1681 fi 1666fi
1682 eval echo \${${flag}_${abi}} 1667exec ${bin} "\$@"
1668EOF
1669 chmod go+rx "${tmpwrapper}"
1670 if [[ -n ${path} ]] ; then
1671 exeinto "${path}"
1672 newexe "${tmpwrapper}" "${wrapper}"
1673 else
1674 newbin "${tmpwrapper}" "${wrapper}"
1675 fi
1683} 1676}
1684
1685get_abi_CFLAGS() { get_abi_var CFLAGS $1; }
1686get_abi_CXXFLAGS() { get_abi_var CXXFLAGS $1; }
1687get_abi_ASFLAGS() { get_abi_var ASFLAGS $1; }
1688get_abi_LIBDIR() { get_abi_var LIBDIR $1; }
1689

Legend:
Removed from v.1.135  
changed lines
  Added in v.1.247

  ViewVC Help
Powered by ViewVC 1.1.20