Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 298101 Details for
Bug 350423
autotools-utils.eclass doesn't pass --docdir to econf()
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Pass --docdir to configure, and install docs from it.
Pass---docdir-to-configure-and-install-docs-from-i.patch (text/plain), 1.88 KB, created by
Michał Górny
on 2012-01-06 15:40:25 UTC
(
hide
)
Description:
Pass --docdir to configure, and install docs from it.
Filename:
MIME Type:
Creator:
Michał Górny
Created:
2012-01-06 15:40:25 UTC
Size:
1.88 KB
patch
obsolete
>From 360b0adb5955bc98939edd8cc55a13a0961d4900 Mon Sep 17 00:00:00 2001 >From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org> >Date: Fri, 6 Jan 2012 16:32:13 +0100 >Subject: [PATCH] Pass --docdir to configure, and install docs from it. > >As EAPI 2 support is intended, this requires configuring the build >system to install docs into a temporary location and moving files from >it. Due to the lack of 'dodoc -r', directories inside docdir are >supported only with EAPI 4. > >Fixes: https://bugs.gentoo.org/show_bug.cgi?id=350423 >--- > eclass/autotools-utils.eclass | 24 +++++++++++++++++++++++- > 1 files changed, 23 insertions(+), 1 deletions(-) > >diff --git a/eclass/autotools-utils.eclass b/eclass/autotools-utils.eclass >index e5ce908..23f8d0c 100644 >--- a/eclass/autotools-utils.eclass >+++ b/eclass/autotools-utils.eclass >@@ -377,7 +377,12 @@ autotools-utils_src_configure() { > || die 'autotools-utils.eclass: myeconfargs has to be an array.' > > # Common args >- local econfargs=() >+ local econfargs=( >+# for EAPI >= 4, we could: >+# --docdir="${EPREFIX}"/usr/share/doc/${PF} >+# for all EAPIs, it's simpler to: >+ --docdir=/tmp/temporary-docdir >+ ) > > # Handle static-libs found in IUSE, disable them by default > if in_iuse static-libs; then >@@ -442,6 +447,23 @@ autotools-utils_src_install() { > dohtml -r "${HTML_DOCS[@]}" || die "dohtml failed" > fi > >+ # Move docs installed by autotools. >+ if [[ -d ${D}/tmp/temporary-docdir ]]; then >+ if [[ ${EAPI} = 4 ]]; then >+ dodoc -r "${D}"/tmp/temporary-docdir/* || die "docdir dodoc failed" >+ else >+ local f >+ for f in "${D}"/tmp/temporary-docdir/*; do >+ [[ -d ${f} ]] \ >+ && die "directories in docdir require at least EAPI 4" >+ done >+ >+ dodoc "${D}"/tmp/temporary-docdir/* || die "docdir dodoc failed" >+ fi >+ >+ rm -r "${D}"/tmp/temporary-docdir >+ fi >+ > # Remove libtool files and unnecessary static libs > remove_libtool_files > } >-- >1.7.8.2
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 350423
:
258681
|
260461
|
287507
|
298101
|
298139