From 88438656a7b3b5824369043792ce27e63eb76f46 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Sat, 10 Sep 2011 17:47:07 -0700 Subject: ebuild.sh: split out phase-helpers.sh This relocates phase helper functions that are needed for execution of regular phases, but not for the "depend" phase. It reduces the size of ebuild.sh by 25%, so there's less code to be sourced during the "depend" phase. --- bin/ebuild.sh | 524 +--------------------------------------------------------- 1 file changed, 4 insertions(+), 520 deletions(-) (limited to 'bin/ebuild.sh') diff --git a/bin/ebuild.sh b/bin/ebuild.sh index 8df5eefb6..a5cc5efe5 100755 --- a/bin/ebuild.sh +++ b/bin/ebuild.sh @@ -238,50 +238,6 @@ best_version() { esac } -use_with() { - if [ -z "$1" ]; then - echo "!!! use_with() called without a parameter." >&2 - echo "!!! use_with [ [value]]" >&2 - return 1 - fi - - if ! has "${EAPI:-0}" 0 1 2 3 ; then - local UW_SUFFIX=${3+=$3} - else - local UW_SUFFIX=${3:+=$3} - fi - local UWORD=${2:-$1} - - if use $1; then - echo "--with-${UWORD}${UW_SUFFIX}" - else - echo "--without-${UWORD}" - fi - return 0 -} - -use_enable() { - if [ -z "$1" ]; then - echo "!!! use_enable() called without a parameter." >&2 - echo "!!! use_enable [ [value]]" >&2 - return 1 - fi - - if ! has "${EAPI:-0}" 0 1 2 3 ; then - local UE_SUFFIX=${3+=$3} - else - local UE_SUFFIX=${3:+=$3} - fi - local UWORD=${2:-$1} - - if use $1; then - echo "--enable-${UWORD}${UE_SUFFIX}" - else - echo "--disable-${UWORD}" - fi - return 0 -} - register_die_hook() { local x for x in $* ; do @@ -309,161 +265,6 @@ fi #if no perms are specified, dirs/files will have decent defaults #(not secretive, but not stupid) umask 022 -export DESTTREE=/usr -export INSDESTTREE="" -export _E_EXEDESTTREE_="" -export _E_DOCDESTTREE_="" -export INSOPTIONS="-m0644" -export EXEOPTIONS="-m0755" -export LIBOPTIONS="-m0644" -export DIROPTIONS="-m0755" -export MOPREFIX=${PN} -declare -a PORTAGE_DOCOMPRESS=( /usr/share/{doc,info,man} ) -declare -a PORTAGE_DOCOMPRESS_SKIP=( /usr/share/doc/${PF}/html ) - -# adds ".keep" files so that dirs aren't auto-cleaned -keepdir() { - dodir "$@" - local x - if [ "$1" == "-R" ] || [ "$1" == "-r" ]; then - shift - find "$@" -type d -printf "${D}%p/.keep_${CATEGORY}_${PN}-${SLOT}\n" \ - | tr "\n" "\0" | \ - while read -r -d $'\0' ; do - >> "$REPLY" || \ - die "Failed to recursively create .keep files" - done - else - for x in "$@"; do - >> "${D}${x}/.keep_${CATEGORY}_${PN}-${SLOT}" || \ - die "Failed to create .keep in ${D}${x}" - done - fi -} - -unpack() { - local srcdir - local x - local y - local myfail - local eapi=${EAPI:-0} - [ -z "$*" ] && die "Nothing passed to the 'unpack' command" - - for x in "$@"; do - vecho ">>> Unpacking ${x} to ${PWD}" - y=${x%.*} - y=${y##*.} - - if [[ ${x} == "./"* ]] ; then - srcdir="" - elif [[ ${x} == ${DISTDIR%/}/* ]] ; then - die "Arguments to unpack() cannot begin with \${DISTDIR}." - elif [[ ${x} == "/"* ]] ; then - die "Arguments to unpack() cannot be absolute" - else - srcdir="${DISTDIR}/" - fi - [[ ! -s ${srcdir}${x} ]] && die "${x} does not exist" - - _unpack_tar() { - if [ "${y}" == "tar" ]; then - $1 -c -- "$srcdir$x" | tar xof - - assert_sigpipe_ok "$myfail" - else - local cwd_dest=${x##*/} - cwd_dest=${cwd_dest%.*} - $1 -c -- "${srcdir}${x}" > "${cwd_dest}" || die "$myfail" - fi - } - - myfail="failure unpacking ${x}" - case "${x##*.}" in - tar) - tar xof "$srcdir$x" || die "$myfail" - ;; - tgz) - tar xozf "$srcdir$x" || die "$myfail" - ;; - tbz|tbz2) - ${PORTAGE_BUNZIP2_COMMAND:-${PORTAGE_BZIP2_COMMAND} -d} -c -- "$srcdir$x" | tar xof - - assert_sigpipe_ok "$myfail" - ;; - ZIP|zip|jar) - # unzip will interactively prompt under some error conditions, - # as reported in bug #336285 - ( while true ; do echo n || break ; done ) | \ - unzip -qo "${srcdir}${x}" || die "$myfail" - ;; - gz|Z|z) - _unpack_tar "gzip -d" - ;; - bz2|bz) - _unpack_tar "${PORTAGE_BUNZIP2_COMMAND:-${PORTAGE_BZIP2_COMMAND} -d}" - ;; - 7Z|7z) - local my_output - my_output="$(7z x -y "${srcdir}${x}")" - if [ $? -ne 0 ]; then - echo "${my_output}" >&2 - die "$myfail" - fi - ;; - RAR|rar) - unrar x -idq -o+ "${srcdir}${x}" || die "$myfail" - ;; - LHa|LHA|lha|lzh) - lha xfq "${srcdir}${x}" || die "$myfail" - ;; - a) - ar x "${srcdir}${x}" || die "$myfail" - ;; - deb) - # Unpacking .deb archives can not always be done with - # `ar`. For instance on AIX this doesn't work out. If - # we have `deb2targz` installed, prefer it over `ar` for - # that reason. We just make sure on AIX `deb2targz` is - # installed. - if type -P deb2targz > /dev/null; then - y=${x##*/} - local created_symlink=0 - if [ ! "$srcdir$x" -ef "$y" ] ; then - # deb2targz always extracts into the same directory as - # the source file, so create a symlink in the current - # working directory if necessary. - ln -sf "$srcdir$x" "$y" || die "$myfail" - created_symlink=1 - fi - deb2targz "$y" || die "$myfail" - if [ $created_symlink = 1 ] ; then - # Clean up the symlink so the ebuild - # doesn't inadvertently install it. - rm -f "$y" - fi - mv -f "${y%.deb}".tar.gz data.tar.gz || die "$myfail" - else - ar x "$srcdir$x" || die "$myfail" - fi - ;; - lzma) - _unpack_tar "lzma -d" - ;; - xz) - if has $eapi 0 1 2 ; then - vecho "unpack ${x}: file format not recognized. Ignoring." - else - _unpack_tar "xz -d" - fi - ;; - *) - vecho "unpack ${x}: file format not recognized. Ignoring." - ;; - esac - done - # Do not chmod '.' since it's probably ${WORKDIR} and PORTAGE_WORKDIR_MODE - # should be preserved. - find . -mindepth 1 -maxdepth 1 ! -type l -print0 | \ - ${XARGS} -0 chmod -fR a+rX,u+w,g-w,o-w -} strip_duplicate_slashes() { if [[ -n $1 ]] ; then @@ -482,326 +283,6 @@ hasg() { return 1 } hasgq() { hasg "$@" >/dev/null ; } -econf() { - local x - - local phase_func=$(_ebuild_arg_to_phase "$EAPI" "$EBUILD_PHASE") - if [[ -n $phase_func ]] ; then - if has "$EAPI" 0 1 ; then - [[ $phase_func != src_compile ]] && \ - eqawarn "QA Notice: econf called in" \ - "$phase_func instead of src_compile" - else - [[ $phase_func != src_configure ]] && \ - eqawarn "QA Notice: econf called in" \ - "$phase_func instead of src_configure" - fi - fi - - : ${ECONF_SOURCE:=.} - if [ -x "${ECONF_SOURCE}/configure" ]; then - if [[ -n $CONFIG_SHELL && \ - "$(head -n1 "$ECONF_SOURCE/configure")" =~ ^'#!'[[:space:]]*/bin/sh([[:space:]]|$) ]] ; then - sed -e "1s:^#![[:space:]]*/bin/sh:#!$CONFIG_SHELL:" -i "$ECONF_SOURCE/configure" || \ - die "Substition of shebang in '$ECONF_SOURCE/configure' failed" - fi - if [ -e /usr/share/gnuconfig/ ]; then - find "${WORKDIR}" -type f '(' \ - -name config.guess -o -name config.sub ')' -print0 | \ - while read -r -d $'\0' x ; do - vecho " * econf: updating ${x/${WORKDIR}\/} with /usr/share/gnuconfig/${x##*/}" - cp -f /usr/share/gnuconfig/"${x##*/}" "${x}" - done - fi - - # EAPI=4 adds --disable-dependency-tracking to econf - if ! has "$EAPI" 0 1 2 3 3_pre2 && \ - "${ECONF_SOURCE}/configure" --help 2>/dev/null | \ - grep -q disable-dependency-tracking ; then - set -- --disable-dependency-tracking "$@" - fi - - # if the profile defines a location to install libs to aside from default, pass it on. - # if the ebuild passes in --libdir, they're responsible for the conf_libdir fun. - local CONF_LIBDIR LIBDIR_VAR="LIBDIR_${ABI}" - if [[ -n ${ABI} && -n ${!LIBDIR_VAR} ]] ; then - CONF_LIBDIR=${!LIBDIR_VAR} - fi - if [[ -n ${CONF_LIBDIR} ]] && ! hasgq --libdir=\* "$@" ; then - export CONF_PREFIX=$(hasg --exec-prefix=\* "$@") - [[ -z ${CONF_PREFIX} ]] && CONF_PREFIX=$(hasg --prefix=\* "$@") - : ${CONF_PREFIX:=/usr} - CONF_PREFIX=${CONF_PREFIX#*=} - [[ ${CONF_PREFIX} != /* ]] && CONF_PREFIX="/${CONF_PREFIX}" - [[ ${CONF_LIBDIR} != /* ]] && CONF_LIBDIR="/${CONF_LIBDIR}" - set -- --libdir="$(strip_duplicate_slashes ${CONF_PREFIX}${CONF_LIBDIR})" "$@" - fi - - set -- \ - --prefix=/usr \ - ${CBUILD:+--build=${CBUILD}} \ - --host=${CHOST} \ - ${CTARGET:+--target=${CTARGET}} \ - --mandir=/usr/share/man \ - --infodir=/usr/share/info \ - --datadir=/usr/share \ - --sysconfdir=/etc \ - --localstatedir=/var/lib \ - "$@" \ - ${EXTRA_ECONF} - vecho "${ECONF_SOURCE}/configure" "$@" - - if ! "${ECONF_SOURCE}/configure" "$@" ; then - - if [ -s config.log ]; then - echo - echo "!!! Please attach the following file when seeking support:" - echo "!!! ${PWD}/config.log" - fi - die "econf failed" - fi - elif [ -f "${ECONF_SOURCE}/configure" ]; then - die "configure is not executable" - else - die "no configure script found" - fi -} - -einstall() { - # CONF_PREFIX is only set if they didn't pass in libdir above. - local LOCAL_EXTRA_EINSTALL="${EXTRA_EINSTALL}" - LIBDIR_VAR="LIBDIR_${ABI}" - if [ -n "${ABI}" -a -n "${!LIBDIR_VAR}" ]; then - CONF_LIBDIR="${!LIBDIR_VAR}" - fi - unset LIBDIR_VAR - if [ -n "${CONF_LIBDIR}" ] && [ "${CONF_PREFIX:+set}" = set ]; then - EI_DESTLIBDIR="${D}/${CONF_PREFIX}/${CONF_LIBDIR}" - EI_DESTLIBDIR="$(strip_duplicate_slashes ${EI_DESTLIBDIR})" - LOCAL_EXTRA_EINSTALL="libdir=${EI_DESTLIBDIR} ${LOCAL_EXTRA_EINSTALL}" - unset EI_DESTLIBDIR - fi - - if [ -f ./[mM]akefile -o -f ./GNUmakefile ] ; then - if [ "${PORTAGE_DEBUG}" == "1" ]; then - ${MAKE:-make} -n prefix="${D}usr" \ - datadir="${D}usr/share" \ - infodir="${D}usr/share/info" \ - localstatedir="${D}var/lib" \ - mandir="${D}usr/share/man" \ - sysconfdir="${D}etc" \ - ${LOCAL_EXTRA_EINSTALL} \ - ${MAKEOPTS} ${EXTRA_EMAKE} -j1 \ - "$@" install - fi - ${MAKE:-make} prefix="${D}usr" \ - datadir="${D}usr/share" \ - infodir="${D}usr/share/info" \ - localstatedir="${D}var/lib" \ - mandir="${D}usr/share/man" \ - sysconfdir="${D}etc" \ - ${LOCAL_EXTRA_EINSTALL} \ - ${MAKEOPTS} ${EXTRA_EMAKE} -j1 \ - "$@" install || die "einstall failed" - else - die "no Makefile found" - fi -} - -_eapi0_pkg_nofetch() { - [ -z "${SRC_URI}" ] && return - - elog "The following are listed in SRC_URI for ${PN}:" - local x - for x in $(echo ${SRC_URI}); do - elog " ${x}" - done -} - -_eapi0_src_unpack() { - [[ -n ${A} ]] && unpack ${A} -} - -_eapi0_src_compile() { - if [ -x ./configure ] ; then - econf - fi - _eapi2_src_compile -} - -_eapi0_src_test() { - # Since we don't want emake's automatic die - # support (EAPI 4 and later), and we also don't - # want the warning messages that it produces if - # we call it in 'nonfatal' mode, we use emake_cmd - # to emulate the desired parts of emake behavior. - local emake_cmd="${MAKE:-make} ${MAKEOPTS} ${EXTRA_EMAKE}" - if $emake_cmd -j1 check -n &> /dev/null; then - vecho ">>> Test phase [check]: ${CATEGORY}/${PF}" - if ! $emake_cmd -j1 check; then - has test $FEATURES && die "Make check failed. See above for details." - has test $FEATURES || eerror "Make check failed. See above for details." - fi - elif $emake_cmd -j1 test -n &> /dev/null; then - vecho ">>> Test phase [test]: ${CATEGORY}/${PF}" - if ! $emake_cmd -j1 test; then - has test $FEATURES && die "Make test failed. See above for details." - has test $FEATURES || eerror "Make test failed. See above for details." - fi - else - vecho ">>> Test phase [none]: ${CATEGORY}/${PF}" - fi -} - -_eapi1_src_compile() { - _eapi2_src_configure - _eapi2_src_compile -} - -_eapi2_src_configure() { - if [[ -x ${ECONF_SOURCE:-.}/configure ]] ; then - econf - fi -} - -_eapi2_src_compile() { - if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then - emake || die "emake failed" - fi -} - -_eapi4_src_install() { - if [[ -f Makefile || -f GNUmakefile || -f makefile ]] ; then - emake DESTDIR="${D}" install - fi - - if ! declare -p DOCS &>/dev/null ; then - local d - for d in README* ChangeLog AUTHORS NEWS TODO CHANGES \ - THANKS BUGS FAQ CREDITS CHANGELOG ; do - [[ -s "${d}" ]] && dodoc "${d}" - done - elif [[ $(declare -p DOCS) == "declare -a "* ]] ; then - dodoc "${DOCS[@]}" - else - dodoc ${DOCS} - fi -} - -into() { - if [ "$1" == "/" ]; then - export DESTTREE="" - else - export DESTTREE=$1 - if [ ! -d "${D}${DESTTREE}" ]; then - install -d "${D}${DESTTREE}" - local ret=$? - if [[ $ret -ne 0 ]] ; then - helpers_die "${FUNCNAME[0]} failed" - return $ret - fi - fi - fi -} - -insinto() { - if [ "$1" == "/" ]; then - export INSDESTTREE="" - else - export INSDESTTREE=$1 - if [ ! -d "${D}${INSDESTTREE}" ]; then - install -d "${D}${INSDESTTREE}" - local ret=$? - if [[ $ret -ne 0 ]] ; then - helpers_die "${FUNCNAME[0]} failed" - return $ret - fi - fi - fi -} - -exeinto() { - if [ "$1" == "/" ]; then - export _E_EXEDESTTREE_="" - else - export _E_EXEDESTTREE_="$1" - if [ ! -d "${D}${_E_EXEDESTTREE_}" ]; then - install -d "${D}${_E_EXEDESTTREE_}" - local ret=$? - if [[ $ret -ne 0 ]] ; then - helpers_die "${FUNCNAME[0]} failed" - return $ret - fi - fi - fi -} - -docinto() { - if [ "$1" == "/" ]; then - export _E_DOCDESTTREE_="" - else - export _E_DOCDESTTREE_="$1" - if [ ! -d "${D}usr/share/doc/${PF}/${_E_DOCDESTTREE_}" ]; then - install -d "${D}usr/share/doc/${PF}/${_E_DOCDESTTREE_}" - local ret=$? - if [[ $ret -ne 0 ]] ; then - helpers_die "${FUNCNAME[0]} failed" - return $ret - fi - fi - fi -} - -insopts() { - export INSOPTIONS="$@" - - # `install` should never be called with '-s' ... - has -s ${INSOPTIONS} && die "Never call insopts() with -s" -} - -diropts() { - export DIROPTIONS="$@" -} - -exeopts() { - export EXEOPTIONS="$@" - - # `install` should never be called with '-s' ... - has -s ${EXEOPTIONS} && die "Never call exeopts() with -s" -} - -libopts() { - export LIBOPTIONS="$@" - - # `install` should never be called with '-s' ... - has -s ${LIBOPTIONS} && die "Never call libopts() with -s" -} - -docompress() { - has "${EAPI}" 0 1 2 3 && die "'docompress' not supported in this EAPI" - - local f g - if [[ $1 = "-x" ]]; then - shift - for f; do - f=$(strip_duplicate_slashes "${f}"); f=${f%/} - [[ ${f:0:1} = / ]] || f="/${f}" - for g in "${PORTAGE_DOCOMPRESS_SKIP[@]}"; do - [[ ${f} = "${g}" ]] && continue 2 - done - PORTAGE_DOCOMPRESS_SKIP[${#PORTAGE_DOCOMPRESS_SKIP[@]}]=${f} - done - else - for f; do - f=$(strip_duplicate_slashes "${f}"); f=${f%/} - [[ ${f:0:1} = / ]] || f="/${f}" - for g in "${PORTAGE_DOCOMPRESS[@]}"; do - [[ ${f} = "${g}" ]] && continue 2 - done - PORTAGE_DOCOMPRESS[${#PORTAGE_DOCOMPRESS[@]}]=${f} - done - fi -} # debug-print() gets called from many places with verbose status information useful # for tracking down problems. The output is in $T/eclass-debug.log. @@ -1349,7 +830,10 @@ fi export EBUILD_MASTER_PID=$BASHPID trap 'exit 1' SIGTERM -[[ $EBUILD_PHASE == depend ]] || source "${PORTAGE_BIN_PATH}/phase-functions.sh" +if [[ $EBUILD_PHASE != depend ]] ; then + source "${PORTAGE_BIN_PATH}/phase-functions.sh" + source "${PORTAGE_BIN_PATH}/phase-helpers.sh" +fi if ! has "$EBUILD_PHASE" clean cleanrm depend && \ [ -f "${T}"/environment ] ; then -- cgit v1.2.3-1-g7c22