diff options
author | Mike Frysinger <vapier@gentoo.org> | 2015-12-24 13:56:30 -0500 |
---|---|---|
committer | Mike Frysinger <vapier@gentoo.org> | 2015-12-24 15:16:40 -0500 |
commit | 97a6466309bf66a7c8380681510a0e38c613ed13 (patch) | |
tree | 6005584bf1b1b7ca69d18a406a5e5d2a399ca67a | |
parent | net-fs/cifs-utils: amd64 stable wrt bug #552634 (diff) | |
download | gentoo-97a6466309bf66a7c8380681510a0e38c613ed13.tar.gz gentoo-97a6466309bf66a7c8380681510a0e38c613ed13.tar.bz2 gentoo-97a6466309bf66a7c8380681510a0e38c613ed13.zip |
dev-libs/efl: fix builds on PaX kernels #547076
Sync the logic into the live ebuild.
-rw-r--r-- | dev-libs/efl/efl-9999.ebuild | 25 |
1 files changed, 24 insertions, 1 deletions
diff --git a/dev-libs/efl/efl-9999.ebuild b/dev-libs/efl/efl-9999.ebuild index fcf0d81744ec..806219a27a0d 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" |