[gentoo-commits] repo/gentoo:master commit in: app-admin/fam/files/, app-admin/fam/

["Mike Frysinger" <vapier@gentoo.org>]

commit:     93aa4938c198262facb58c264846571b3894c32e
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Wed Dec  7 05:06:27 2016 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Wed Dec  7 05:08:32 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=93aa4938

app-admin/fam: make out of tree builds work to avoid pointless source tree copies

 app-admin/fam/fam-2.7.0-r7.ebuild               |  4 ++--
 app-admin/fam/files/fam-2.7.0-out-of-tree.patch | 13 +++++++++++++
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/app-admin/fam/fam-2.7.0-r7.ebuild b/app-admin/fam/fam-2.7.0-r7.ebuild
index 166061b..179ada6 100644
--- a/app-admin/fam/fam-2.7.0-r7.ebuild
+++ b/app-admin/fam/fam-2.7.0-r7.ebuild
@@ -28,14 +28,14 @@ src_prepare() {
 	EPATCH_SUFFIX="patch" EPATCH_FORCE="yes" epatch "${S}"/${P}/debian/patches
 	sed -i configure.ac -e 's|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|g' || die
 
+	epatch "${FILESDIR}"/${P}-out-of-tree.patch
 	epatch "${FILESDIR}"/${P}-sysmacros.patch #580702
 
 	eautoreconf
-	multilib_copy_sources
 }
 
 multilib_src_configure() {
-	econf $(use_enable static-libs static)
+	ECONF_SOURCE=${S} econf $(use_enable static-libs static)
 
 	# These are thrown away later
 	if ! multilib_is_native_abi ; then

diff --git a/app-admin/fam/files/fam-2.7.0-out-of-tree.patch b/app-admin/fam/files/fam-2.7.0-out-of-tree.patch
new file mode 100644
index 00000000..51fdadf
--- /dev/null
+++ b/app-admin/fam/files/fam-2.7.0-out-of-tree.patch
@@ -0,0 +1,13 @@
+fix out of tree builds
+
+--- a/lib/Makefile.am
++++ b/lib/Makefile.am
+@@ -7,7 +7,7 @@
+ 	Client.h \
+ 	fam.c++
+ 
+-libfam_la_LDFLAGS = -export-symbols fam.sym
++libfam_la_LDFLAGS = -export-symbols $(srcdir)/fam.sym
+ libfam_la_LIBADD = -lstdc++
+ 
+ EXTRA_DIST = fam.sym