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

diff --git a/app-admin/fam/fam-2.7.0-r7.ebuild b/app-admin/fam/fam-2.7.0-r7.ebuild
index 166061bae0053a742e31b3eddedbd5fe11abf29b..179ada610e01239c80a7dee0fd9800f237165650 100644 (file)
--- 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 (file)
index 0000000..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