From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 39A321384B4 for ; Thu, 24 Dec 2015 20:18:28 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 47F8021C041; Thu, 24 Dec 2015 20:18:25 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A0DD221C041 for ; Thu, 24 Dec 2015 20:18:24 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 99C643408E5 for ; Thu, 24 Dec 2015 20:18:23 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D012AD4 for ; Thu, 24 Dec 2015 20:18:21 +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: <1450988200.97a6466309bf66a7c8380681510a0e38c613ed13.vapier@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/efl/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-libs/efl/efl-9999.ebuild X-VCS-Directories: dev-libs/efl/ X-VCS-Committer: vapier X-VCS-Committer-Name: Mike Frysinger X-VCS-Revision: 97a6466309bf66a7c8380681510a0e38c613ed13 X-VCS-Branch: master Date: Thu, 24 Dec 2015 20:18:21 +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: 4ec1de42-6dbc-47a5-b43c-7e823b7100d3 X-Archives-Hash: 417daa73572a2510af4264fbd5288510 commit: 97a6466309bf66a7c8380681510a0e38c613ed13 Author: Mike Frysinger gentoo org> AuthorDate: Thu Dec 24 18:56:30 2015 +0000 Commit: Mike Frysinger gentoo org> CommitDate: Thu Dec 24 20:16:40 2015 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=97a64663 dev-libs/efl: fix builds on PaX kernels #547076 Sync the logic into the live ebuild. dev-libs/efl/efl-9999.ebuild | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/dev-libs/efl/efl-9999.ebuild b/dev-libs/efl/efl-9999.ebuild index fcf0d81..806219a 100644 --- a/dev-libs/efl/efl-9999.ebuild +++ b/dev-libs/efl/efl-9999.ebuild @@ -18,7 +18,7 @@ else EKEY_STATE="snap" fi -inherit enlightenment +inherit enlightenment pax-utils DESCRIPTION="Enlightenment Foundation Libraries all-in-one package" @@ -163,6 +163,17 @@ DEPEND=" S=${WORKDIR}/${MY_P} +src_prepare() { + enlightenment_src_prepare + + # Remove stupid sleep command. + # Also back out gnu make hack that causes regen of Makefiles. + sed -i \ + -e '/sleep 10/d' \ + -e '/^#### Work around bug in automake check macro$/,/^#### Info$/d' \ + configure || die +} + src_configure() { if use ssl && use gnutls ; then einfo "You enabled both USE=ssl and USE=gnutls, but only one can be used;" @@ -245,6 +256,18 @@ src_configure() { enlightenment_src_configure } +src_compile() { + if host-is-pax && ! use oldlua ; then + # We need to build the lua code first so we can pax-mark it. #547076 + local target='_e_built_sources_target_gogogo_' + printf '%s: $(BUILT_SOURCES)\n' "${target}" >> src/Makefile || die + emake -C src "${target}" + emake -C src bin/elua/elua + pax-mark m src/bin/elua/.libs/elua + fi + enlightenment_src_compile +} + src_install() { MAKEOPTS+=" -j1"