Gentoo Archives: gentoo-commits

From: Marek Szuba <marecki@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/libffi/
Date: Thu, 01 Jul 2021 09:21:59
Message-Id: 1625131255.971f30e1fe52029690d95e4be85ba714113048ac.marecki@gentoo
1 commit: 971f30e1fe52029690d95e4be85ba714113048ac
2 Author: Marek Szuba <marecki <AT> gentoo <DOT> org>
3 AuthorDate: Thu Jul 1 09:17:40 2021 +0000
4 Commit: Marek Szuba <marecki <AT> gentoo <DOT> org>
5 CommitDate: Thu Jul 1 09:20:55 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=971f30e1
7
8 dev-libs/libffi: add compatibility guard for USE=pax-kernel
9
10 Exactly as previously implemented by slyfox in (ultimately yanked) 3.4_rc1.
11
12 Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>
13
14 dev-libs/libffi/libffi-3.3-r2.ebuild | 5 ++++-
15 dev-libs/libffi/metadata.xml | 1 +
16 2 files changed, 5 insertions(+), 1 deletion(-)
17
18 diff --git a/dev-libs/libffi/libffi-3.3-r2.ebuild b/dev-libs/libffi/libffi-3.3-r2.ebuild
19 index 95c00185605..40e5b2deafa 100644
20 --- a/dev-libs/libffi/libffi-3.3-r2.ebuild
21 +++ b/dev-libs/libffi/libffi-3.3-r2.ebuild
22 @@ -14,9 +14,12 @@ SRC_URI="https://github.com/libffi/libffi/releases/download/v${MY_PV}/${MY_P}.ta
23 LICENSE="MIT"
24 SLOT="0/7" # SONAME=libffi.so.7
25 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
26 -IUSE="debug pax-kernel static-libs test"
27 +IUSE="debug pax-kernel pax_kernel static-libs test"
28
29 RESTRICT="!test? ( test )"
30 +# If you are USE=pax_kernel user you really want USE=pax-kernel as well.
31 +# That's a flag rename: https://archives.gentoo.org/gentoo-dev/message/273f5ec9ebc8075f6ee8d8cdda9e759e
32 +REQUIRED_USE="pax_kernel? ( pax-kernel )"
33
34 RDEPEND=""
35 DEPEND=""
36
37 diff --git a/dev-libs/libffi/metadata.xml b/dev-libs/libffi/metadata.xml
38 index 1c295db1236..85b52eeb3e0 100644
39 --- a/dev-libs/libffi/metadata.xml
40 +++ b/dev-libs/libffi/metadata.xml
41 @@ -35,6 +35,7 @@
42 </longdescription>
43 <use>
44 <flag name="pax-kernel">Use PaX emulated trampolines, for we can't use PROT_EXEC</flag>
45 + <flag name="pax_kernel">DEPRECATED alias for 'pax-kernel'. Do not use.</flag>
46 </use>
47 <upstream>
48 <remote-id type="cpe">cpe:/a:libffi_project:libffi</remote-id>