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 E587B13888F for ; Wed, 21 Oct 2015 14:39:15 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B1F0BE080C; Wed, 21 Oct 2015 14:39:13 +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 577E1E080C for ; Wed, 21 Oct 2015 14:39:13 +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 2A52A340806 for ; Wed, 21 Oct 2015 14:39:12 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 35F461555 for ; Wed, 21 Oct 2015 14:39:08 +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: <1445438342.1cf76519807150b1b42c16349e856afeeee37a68.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-1.15.2.ebuild X-VCS-Directories: dev-libs/efl/ X-VCS-Committer: vapier X-VCS-Committer-Name: Mike Frysinger X-VCS-Revision: 1cf76519807150b1b42c16349e856afeeee37a68 X-VCS-Branch: master Date: Wed, 21 Oct 2015 14:39:08 +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: 9e9d224f-fae7-4521-a66f-2ce4bcd7cd49 X-Archives-Hash: a21064f77cad62d89ac30347ba58ea65 commit: 1cf76519807150b1b42c16349e856afeeee37a68 Author: Mike Frysinger gentoo org> AuthorDate: Wed Oct 21 14:37:05 2015 +0000 Commit: Mike Frysinger gentoo org> CommitDate: Wed Oct 21 14:39:02 2015 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1cf76519 dev-libs/efl: fix builds on PaX kernels #547076 The luajit code modifies its mappings at runtime as it jit-compiles code and then executes it. The efl build process creates a lua tool (named elua) and then executes it to compile other efl code. This fails under PaX kernels by default. Hack the src_compile in this situations to build up elua first, tweak the PaX file marks on the new binary, and then resume the compilation. dev-libs/efl/efl-1.15.2.ebuild | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/dev-libs/efl/efl-1.15.2.ebuild b/dev-libs/efl/efl-1.15.2.ebuild index da07704..806219a 100644 --- a/dev-libs/efl/efl-1.15.2.ebuild +++ b/dev-libs/efl/efl-1.15.2.ebuild @@ -18,7 +18,7 @@ else EKEY_STATE="snap" fi -inherit enlightenment +inherit enlightenment pax-utils DESCRIPTION="Enlightenment Foundation Libraries all-in-one package" @@ -256,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"