summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichał Górny <mgorny@gentoo.org>2013-11-24 10:53:43 +0000
committerMichał Górny <mgorny@gentoo.org>2013-11-24 10:53:43 +0000
commitf7f0e00a8069d5a954d27c436c24dc4e7be83902 (patch)
treef2dd66f3532d4234bc32db3bf8102b67f7d4d0c2
parentRespect BUILD_DIR in in-source builds when set earlier. (diff)
downloadhistorical-f7f0e00a8069d5a954d27c436c24dc4e7be83902.tar.gz
historical-f7f0e00a8069d5a954d27c436c24dc4e7be83902.tar.bz2
historical-f7f0e00a8069d5a954d27c436c24dc4e7be83902.zip
Support in-source builds.
-rw-r--r--eclass/ChangeLog5
-rw-r--r--eclass/autotools-multilib.eclass5
2 files changed, 8 insertions, 2 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog
index 86d36e93a80f..b160913b1243 100644
--- a/eclass/ChangeLog
+++ b/eclass/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1066 2013/11/24 10:53:13 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1067 2013/11/24 10:53:43 mgorny Exp $
+
+ 24 Nov 2013; Michał Górny <mgorny@gentoo.org> autotools-multilib.eclass:
+ Support in-source builds.
24 Nov 2013; Michał Górny <mgorny@gentoo.org> autotools-utils.eclass:
Respect BUILD_DIR in in-source builds when set earlier.
diff --git a/eclass/autotools-multilib.eclass b/eclass/autotools-multilib.eclass
index 9b133b29f84c..655c55dc1025 100644
--- a/eclass/autotools-multilib.eclass
+++ b/eclass/autotools-multilib.eclass
@@ -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/eclass/autotools-multilib.eclass,v 1.18 2013/11/24 10:25:52 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/autotools-multilib.eclass,v 1.19 2013/11/24 10:53:43 mgorny Exp $
# @ECLASS: autotools-multilib.eclass
# @MAINTAINER:
@@ -50,9 +50,12 @@ _autotools-multilib_fix_multilib_minimal
autotools-multilib_src_prepare() {
autotools-utils_src_prepare "${@}"
+
+ [[ ${AUTOTOOLS_IN_SOURCE_BUILD} ]] && multilib_copy_sources
}
multilib_src_configure() {
+ [[ ${AUTOTOOLS_IN_SOURCE_BUILD} ]] && local ECONF_SOURCE=${BUILD_DIR}
autotools-utils_src_configure "${_at_args[@]}"
}