/[gentoo-x86]/eclass/autotools-utils.eclass
Gentoo

Diff of /eclass/autotools-utils.eclass

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

Revision 1.51 Revision 1.52
1# Copyright 1999-2012 Gentoo Foundation 1# Copyright 1999-2012 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/autotools-utils.eclass,v 1.51 2012/05/28 07:34:43 mgorny Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/autotools-utils.eclass,v 1.52 2012/05/28 07:45:19 mgorny Exp $
4 4
5# @ECLASS: autotools-utils.eclass 5# @ECLASS: autotools-utils.eclass
6# @MAINTAINER: 6# @MAINTAINER:
7# Maciej Mrozowski <reavertm@gentoo.org> 7# Maciej Mrozowski <reavertm@gentoo.org>
8# Michał Górny <mgorny@gentoo.org> 8# Michał Górny <mgorny@gentoo.org>
… …
335 FROM_EAUTORECONF=sure eautomake 335 FROM_EAUTORECONF=sure eautomake
336 336
337 local x 337 local x
338 for x in $(autotools_check_macro_val AC_CONFIG_SUBDIRS); do 338 for x in $(autotools_check_macro_val AC_CONFIG_SUBDIRS); do
339 if [[ -d ${x} ]] ; then 339 if [[ -d ${x} ]] ; then
340 pushd "${x}" >/dev/null 340 pushd "${x}" >/dev/null || die
341 autotools-utils_autoreconf 341 autotools-utils_autoreconf
342 popd >/dev/null 342 popd >/dev/null || die
343 fi 343 fi
344 done 344 done
345} 345}
346 346
347# @FUNCTION: autotools-utils_src_prepare 347# @FUNCTION: autotools-utils_src_prepare
… …
413 413
414 # Append user args 414 # Append user args
415 econfargs+=("${myeconfargs[@]}") 415 econfargs+=("${myeconfargs[@]}")
416 416
417 mkdir -p "${AUTOTOOLS_BUILD_DIR}" || die "mkdir '${AUTOTOOLS_BUILD_DIR}' failed" 417 mkdir -p "${AUTOTOOLS_BUILD_DIR}" || die "mkdir '${AUTOTOOLS_BUILD_DIR}' failed"
418 pushd "${AUTOTOOLS_BUILD_DIR}" > /dev/null 418 pushd "${AUTOTOOLS_BUILD_DIR}" > /dev/null || die
419 econf "${econfargs[@]}" "$@" 419 econf "${econfargs[@]}" "$@"
420 popd > /dev/null 420 popd > /dev/null || die
421} 421}
422 422
423# @FUNCTION: autotools-utils_src_compile 423# @FUNCTION: autotools-utils_src_compile
424# @DESCRIPTION: 424# @DESCRIPTION:
425# The autotools src_compile function, invokes emake in specified AUTOTOOLS_BUILD_DIR. 425# The autotools src_compile function, invokes emake in specified AUTOTOOLS_BUILD_DIR.
426autotools-utils_src_compile() { 426autotools-utils_src_compile() {
427 debug-print-function ${FUNCNAME} "$@" 427 debug-print-function ${FUNCNAME} "$@"
428 428
429 _check_build_dir 429 _check_build_dir
430 pushd "${AUTOTOOLS_BUILD_DIR}" > /dev/null 430 pushd "${AUTOTOOLS_BUILD_DIR}" > /dev/null || die
431 emake "$@" || die 'emake failed' 431 emake "$@" || die 'emake failed'
432 popd > /dev/null 432 popd > /dev/null || die
433} 433}
434 434
435# @FUNCTION: autotools-utils_src_install 435# @FUNCTION: autotools-utils_src_install
436# @DESCRIPTION: 436# @DESCRIPTION:
437# The autotools src_install function. Runs emake install, unconditionally 437# The autotools src_install function. Runs emake install, unconditionally
… …
442# DOCS and HTML_DOCS arrays are supported. See base.eclass(5) for reference. 442# DOCS and HTML_DOCS arrays are supported. See base.eclass(5) for reference.
443autotools-utils_src_install() { 443autotools-utils_src_install() {
444 debug-print-function ${FUNCNAME} "$@" 444 debug-print-function ${FUNCNAME} "$@"
445 445
446 _check_build_dir 446 _check_build_dir
447 pushd "${AUTOTOOLS_BUILD_DIR}" > /dev/null 447 pushd "${AUTOTOOLS_BUILD_DIR}" > /dev/null || die
448 emake DESTDIR="${D}" "$@" install || die "emake install failed" 448 emake DESTDIR="${D}" "$@" install || die "emake install failed"
449 popd > /dev/null 449 popd > /dev/null || die
450 450
451 # Move docs installed by autotools (in EAPI < 4). 451 # Move docs installed by autotools (in EAPI < 4).
452 if [[ ${EAPI} == [23] ]] \ 452 if [[ ${EAPI} == [23] ]] \
453 && path_exists "${D}${EPREFIX}"/usr/share/doc/${PF}/*; then 453 && path_exists "${D}${EPREFIX}"/usr/share/doc/${PF}/*; then
454 if [[ $(find "${D}${EPREFIX}"/usr/share/doc/${PF}/* -type d) ]]; then 454 if [[ $(find "${D}${EPREFIX}"/usr/share/doc/${PF}/* -type d) ]]; then
… …
489# The autotools src_test function. Runs emake check in build directory. 489# The autotools src_test function. Runs emake check in build directory.
490autotools-utils_src_test() { 490autotools-utils_src_test() {
491 debug-print-function ${FUNCNAME} "$@" 491 debug-print-function ${FUNCNAME} "$@"
492 492
493 _check_build_dir 493 _check_build_dir
494 pushd "${AUTOTOOLS_BUILD_DIR}" > /dev/null 494 pushd "${AUTOTOOLS_BUILD_DIR}" > /dev/null || die
495 # Run default src_test as defined in ebuild.sh 495 # Run default src_test as defined in ebuild.sh
496 default_src_test 496 default_src_test
497 popd > /dev/null 497 popd > /dev/null || die
498} 498}
Legend:
Removed from v.1.51  
changed lines
  Added in v.1.52
  ViewVC Help
Powered by ViewVC 1.1.20