summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2013-04-05 00:33:24 +0000
committerMike Frysinger <vapier@gentoo.org>2013-04-05 00:33:24 +0000
commit84422f75f23b849db10879892083177b442c8488 (patch)
tree14e7f234a369225444751d27257eecdb63d7e82e /sys-libs/glibc
parentDrop MANPAGE_VER/INFOPAGE_VER support as we haven't used it in a long time. (diff)
downloadgentoo-2-84422f75f23b849db10879892083177b442c8488.tar.gz
gentoo-2-84422f75f23b849db10879892083177b442c8488.tar.bz2
gentoo-2-84422f75f23b849db10879892083177b442c8488.zip
Disable info manual generation to simplify older builds #464394 by Jason Mours.
(Portage version: 2.2.0_alpha170/cvs/Linux x86_64, signed Manifest commit with key FB7C4156)
Diffstat (limited to 'sys-libs/glibc')
-rw-r--r--sys-libs/glibc/ChangeLog7
-rw-r--r--sys-libs/glibc/files/eblits/src_compile.eblit9
2 files changed, 14 insertions, 2 deletions
diff --git a/sys-libs/glibc/ChangeLog b/sys-libs/glibc/ChangeLog
index d4fa9d733fd6..3f75864d31c8 100644
--- a/sys-libs/glibc/ChangeLog
+++ b/sys-libs/glibc/ChangeLog
@@ -1,5 +1,10 @@
# ChangeLog for sys-libs/glibc
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.930 2013/04/05 00:25:16 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.931 2013/04/05 00:33:24 vapier Exp $
+
+ 05 Apr 2013; Mike Frysinger <vapier@gentoo.org>
+ files/eblits/src_compile.eblit:
+ Disable info manual generation to simplify older builds #464394 by Jason
+ Mours.
05 Apr 2013; Mike Frysinger <vapier@gentoo.org>
files/eblits/src_install.eblit, files/eblits/src_unpack.eblit,
diff --git a/sys-libs/glibc/files/eblits/src_compile.eblit b/sys-libs/glibc/files/eblits/src_compile.eblit
index 42e5de608375..c058e19bde82 100644
--- a/sys-libs/glibc/files/eblits/src_compile.eblit
+++ b/sys-libs/glibc/files/eblits/src_compile.eblit
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/src_compile.eblit,v 1.33 2013/01/28 19:53:58 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/src_compile.eblit,v 1.34 2013/04/05 00:33:24 vapier Exp $
glibc_do_configure() {
local myconf=()
@@ -98,6 +98,13 @@ glibc_do_configure() {
# this overriding check. #347761
export libc_cv_hashstyle=no
+ # Overtime, generating info pages can be painful. So disable this for
+ # versions older than the latest stable to avoid the issue (this ver
+ # should be updated from time to time). #464394
+ if ! version_is_at_least 2.15 ; then
+ export ac_cv_prog_MAKEINFO=:
+ fi
+
local GBUILDDIR=${WORKDIR}/build-${ABI}-${CTARGET}-$1
mkdir -p "${GBUILDDIR}"
cd "${GBUILDDIR}"