From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 7C9BC1395E2 for ; Wed, 7 Dec 2016 05:09:08 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D27EE21C0C9; Wed, 7 Dec 2016 05:09:07 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B04F321C0C9 for ; Wed, 7 Dec 2016 05:09:07 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 03C5C3411B5 for ; Wed, 7 Dec 2016 05:09:07 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 96BDD24BD for ; Wed, 7 Dec 2016 05:09:05 +0000 (UTC) From: "Mike Frysinger" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Frysinger" Message-ID: <1481087312.93aa4938c198262facb58c264846571b3894c32e.vapier@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-admin/fam/files/, app-admin/fam/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-admin/fam/fam-2.7.0-r7.ebuild app-admin/fam/files/fam-2.7.0-out-of-tree.patch X-VCS-Directories: app-admin/fam/files/ app-admin/fam/ X-VCS-Committer: vapier X-VCS-Committer-Name: Mike Frysinger X-VCS-Revision: 93aa4938c198262facb58c264846571b3894c32e X-VCS-Branch: master Date: Wed, 7 Dec 2016 05:09:05 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 400b778e-7b26-4c5d-b663-61ae6e2b47d2 X-Archives-Hash: be5f6c29217792fd779aa44fed449d41 commit: 93aa4938c198262facb58c264846571b3894c32e Author: Mike Frysinger gentoo org> AuthorDate: Wed Dec 7 05:06:27 2016 +0000 Commit: Mike Frysinger gentoo 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