From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1RVtDY-0006Zu-Nj for garchives@archives.gentoo.org; Wed, 30 Nov 2011 23:05:33 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 02EBB21C121; Wed, 30 Nov 2011 23:05:13 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id B532921C0CB for ; Wed, 30 Nov 2011 23:04:19 +0000 (UTC) Received: from pomiocik.lan (77-255-13-206.adsl.inetia.pl [77.255.13.206]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) (Authenticated sender: mgorny) by smtp.gentoo.org (Postfix) with ESMTPSA id B55E41B400A; Wed, 30 Nov 2011 23:04:17 +0000 (UTC) From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= To: gentoo-dev@lists.gentoo.org Cc: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= Subject: [gentoo-dev] [PATCH] autotools-utils: drop base.eclass inherit and thus src_unpack() export. Date: Thu, 1 Dec 2011 00:04:50 +0100 Message-Id: <1322694290-6766-1-git-send-email-mgorny@gentoo.org> X-Mailer: git-send-email 1.7.8.rc4.dirty In-Reply-To: <20111130235810.7816324b@pomiocik.lan> References: <20111130235810.7816324b@pomiocik.lan> Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-dev@lists.gentoo.org Reply-to: gentoo-dev@lists.gentoo.org X-Archives-Salt: 33777030-4a3b-42f2-87e6-7e9605acd643 X-Archives-Hash: 419d09b161cd202ce50fb53c4456c90e Importing base.eclass causes us to export src_unpack() phase function which is entirely useless in EAPIs 2+ (which we only support), and causes trouble importing autotools-utils e.g. after VCS eclasses. Fixes: https://bugs.gentoo.org/show_bug.cgi?id=392651 --- eclass/autotools-utils.eclass | 54 +++++++++++++++++++++++++++++++++++++---- 1 files changed, 49 insertions(+), 5 deletions(-) diff --git a/eclass/autotools-utils.eclass b/eclass/autotools-utils.eclass index 0aa1679..87cbd4a 100644 --- a/eclass/autotools-utils.eclass +++ b/eclass/autotools-utils.eclass @@ -93,24 +93,28 @@ case ${EAPI:-0} in *) die "EAPI=${EAPI} is not supported" ;; esac -inherit autotools base eutils libtool +inherit autotools eutils libtool EXPORT_FUNCTIONS src_prepare src_configure src_compile src_install src_test # @ECLASS-VARIABLE: AUTOTOOLS_BUILD_DIR +# @DEFAULT_UNSET # @DESCRIPTION: # Build directory, location where all autotools generated files should be # placed. For out of source builds it defaults to ${WORKDIR}/${P}_build. # @ECLASS-VARIABLE: AUTOTOOLS_IN_SOURCE_BUILD +# @DEFAULT_UNSET # @DESCRIPTION: # Set to enable in-source build. # @ECLASS-VARIABLE: ECONF_SOURCE +# @DEFAULT_UNSET # @DESCRIPTION: # Specify location of autotools' configure script. By default it uses ${S}. # @ECLASS-VARIABLE: myeconfargs +# @DEFAULT_UNSET # @DESCRIPTION: # Optional econf arguments as Bash array. Should be defined before calling src_configure. # @CODE @@ -125,6 +129,36 @@ EXPORT_FUNCTIONS src_prepare src_configure src_compile src_install src_test # } # @CODE +# @ECLASS-VARIABLE: DOCS +# @DEFAULT_UNSET +# @DESCRIPTION: +# Array containing documents passed to dodoc command. +# +# Example: +# @CODE +# DOCS=( NEWS README ) +# @CODE + +# @ECLASS-VARIABLE: HTML_DOCS +# @DEFAULT_UNSET +# @DESCRIPTION: +# Array containing documents passed to dohtml command. +# +# Example: +# @CODE +# HTML_DOCS=( doc/html/ ) +# @CODE + +# @ECLASS-VARIABLE: PATCHES +# @DEFAULT_UNSET +# @DESCRIPTION: +# PATCHES array variable containing all various patches to be applied. +# +# Example: +# @CODE +# PATCHES=( "${FILESDIR}"/${P}-mypatch.patch ) +# @CODE + # Determine using IN or OUT source build _check_build_dir() { : ${ECONF_SOURCE:=${S}} @@ -224,7 +258,9 @@ remove_libtool_files() { autotools-utils_src_prepare() { debug-print-function ${FUNCNAME} "$@" - base_src_prepare + [[ ${PATCHES} ]] && epatch "${PATCHES[@]}" + epatch_user + elibtoolize --patch-only } @@ -260,7 +296,7 @@ autotools-utils_src_configure() { _check_build_dir mkdir -p "${AUTOTOOLS_BUILD_DIR}" || die "mkdir '${AUTOTOOLS_BUILD_DIR}' failed" pushd "${AUTOTOOLS_BUILD_DIR}" > /dev/null - base_src_configure "${econfargs[@]}" "$@" + econf "${econfargs[@]}" "$@" popd > /dev/null } @@ -272,7 +308,7 @@ autotools-utils_src_compile() { _check_build_dir pushd "${AUTOTOOLS_BUILD_DIR}" > /dev/null - base_src_compile "$@" + emake "$@" || die 'emake failed' popd > /dev/null } @@ -289,9 +325,17 @@ autotools-utils_src_install() { _check_build_dir pushd "${AUTOTOOLS_BUILD_DIR}" > /dev/null - base_src_install "$@" + emake DESTDIR="${D}" "$@" install || die "emake install failed" popd > /dev/null + # XXX: support installing them from builddir as well? + if [[ ${DOCS} ]]; then + dodoc "${DOCS[@]}" || die "dodoc failed" + fi + if [[ ${HTML_DOCS} ]]; then + dohtml -r "${HTML_DOCS[@]}" || die "dohtml failed" + fi + # Remove libtool files and unnecessary static libs remove_libtool_files } -- 1.7.8.rc4.dirty