Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 294375 Details for
Bug 392651
autotools-utils.eclass: remove base eclass inherit
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
autotools-utils: drop base.eclass inherit and thus src_unpack() export.
autotools-utils-drop-baseeclass-inherit-and-thus-s.patch (text/plain), 2.73 KB, created by
Michał Górny
on 2011-11-30 18:20:45 UTC
(
hide
)
Description:
autotools-utils: drop base.eclass inherit and thus src_unpack() export.
Filename:
MIME Type:
Creator:
Michał Górny
Created:
2011-11-30 18:20:45 UTC
Size:
2.73 KB
patch
obsolete
>From ab991be42e2de7d9610ac7af24056f48e8fbfb38 Mon Sep 17 00:00:00 2001 >From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org> >Date: Wed, 30 Nov 2011 18:50:12 +0100 >Subject: [PATCH] autotools-utils: drop base.eclass inherit and thus > src_unpack() export. > >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
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 392651
: 294375