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 1RVopO-0005r1-79 for garchives@archives.gentoo.org; Wed, 30 Nov 2011 18:24:18 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id ECF95E06CC; Wed, 30 Nov 2011 18:24:08 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id CC601E06B0 for ; Wed, 30 Nov 2011 18:23:29 +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 094DE1B4012; Wed, 30 Nov 2011 18:23:27 +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: Wed, 30 Nov 2011 19:23:53 +0100 Message-Id: <1322677433-5034-1-git-send-email-mgorny@gentoo.org> X-Mailer: git-send-email 1.7.8.rc4.dirty 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: 377ad006-6f06-45e3-bc2e-9538cc25ef5d X-Archives-Hash: d7ff48c180a077aa3f17d7bdf10ca82a 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 | 38 +++++++++++++++++++++++++++++++++----- 1 files changed, 33 insertions(+), 5 deletions(-) diff --git a/eclass/autotools-utils.eclass b/eclass/autotools-utils.eclass index 0aa1679..7a5b77c 100644 --- a/eclass/autotools-utils.eclass +++ b/eclass/autotools-utils.eclass @@ -93,7 +93,7 @@ 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 @@ -125,6 +125,24 @@ EXPORT_FUNCTIONS src_prepare src_configure src_compile src_install src_test # } # @CODE +# @ECLASS-VARIABLE: DOCS +# @DESCRIPTION: +# Array containing documents passed to dodoc command. +# +# DOCS=( NEWS README ) + +# @ECLASS-VARIABLE: HTML_DOCS +# @DESCRIPTION: +# Array containing documents passed to dohtml command. +# +# HTML_DOCS=( doc/html/ ) + +# @ECLASS-VARIABLE: PATCHES +# @DESCRIPTION: +# PATCHES array variable containing all various patches to be applied. +# +# PATCHES=( "${FILESDIR}/mypatch.patch" ) + # Determine using IN or OUT source build _check_build_dir() { : ${ECONF_SOURCE:=${S}} @@ -224,7 +242,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 +280,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[@]}" "$@" + default_src_configure "${econfargs[@]}" "$@" popd > /dev/null } @@ -272,7 +292,7 @@ autotools-utils_src_compile() { _check_build_dir pushd "${AUTOTOOLS_BUILD_DIR}" > /dev/null - base_src_compile "$@" + default_src_compile "$@" popd > /dev/null } @@ -289,9 +309,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