diff options
| author |   Sam James <sam@gentoo.org> | 2021-09-05 06:28:55 +0100 |
|---|---|---|
| committer | Sam James <sam@gentoo.org> | 2021-09-05 06:47:47 +0100 |
| commit | dc67add1a5356531eaaec698807661461abc27e4 (patch) | |
| tree | 2a41166afd3dceb6af39b75e3cb78cb9fb3312a4 /sys-libs | |
| parent | Revert "app-emulation/qemu: change static-libs default for virtual/libudev" (diff) | |
| download | gentoo-dc67add1a5356531eaaec698807661461abc27e4.tar.gz gentoo-dc67add1a5356531eaaec698807661461abc27e4.tar.bz2 gentoo-dc67add1a5356531eaaec698807661461abc27e4.zip | |
sys-libs/glibc: add comment on bumping pax-utils bound
It's important that we remember to do this when bumping
glibc releases. Added a comment as a reminder and used
a variable so that both uses are consistent within *DEPEND.
Bug: https://bugs.gentoo.org/811462
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'sys-libs')
| -rw-r--r-- | sys-libs/glibc/glibc-2.34.ebuild | 7 | ||||
| -rw-r--r-- | sys-libs/glibc/glibc-9999.ebuild | 11 |
2 files changed, 12 insertions, 6 deletions
diff --git a/sys-libs/glibc/glibc-2.34.ebuild b/sys-libs/glibc/glibc-2.34.ebuild index cacddc9065e8..0466160c9319 100644 --- a/sys-libs/glibc/glibc-2.34.ebuild +++ b/sys-libs/glibc/glibc-2.34.ebuild @@ -45,6 +45,9 @@ IUSE="audit caps cet compile-locales +crypt custom-cflags doc gd headers-only +m # Minimum kernel version that glibc requires MIN_KERN_VER="3.2.0" +# Minimum pax-utils version needed (which contains any new syscall changes for +# its seccomp filter!). Please double check this! +MIN_PAX_UTILS_VER="1.3.3" # Here's how the cross-compile logic breaks down ... # CTARGET - machine that will target the binaries @@ -98,7 +101,7 @@ fi BDEPEND=" ${PYTHON_DEPS} - >=app-misc/pax-utils-1.3.3 + >=app-misc/pax-utils-${MIN_PAX_UTILS_VER} sys-devel/bison doc? ( sys-apps/texinfo ) !compile-locales? ( @@ -130,7 +133,7 @@ RDEPEND="${COMMON_DEPEND} sys-apps/grep virtual/awk sys-apps/gentoo-functions - !<app-misc/pax-utils-1.3.3 + !<app-misc/pax-utils-${MIN_PAX_UTILS_VER} !<net-misc/openssh-8.1_p1-r2 " diff --git a/sys-libs/glibc/glibc-9999.ebuild b/sys-libs/glibc/glibc-9999.ebuild index 564367df0b9d..0466160c9319 100644 --- a/sys-libs/glibc/glibc-9999.ebuild +++ b/sys-libs/glibc/glibc-9999.ebuild @@ -17,8 +17,8 @@ SLOT="2.2" EMULTILIB_PKG="true" # Gentoo patchset (ignored for live ebuilds) -PATCH_VER=16 -PATCH_DEV=slyfox +PATCH_VER=2 +PATCH_DEV=dilfridge if [[ ${PV} == 9999* ]]; then inherit git-r3 @@ -45,6 +45,9 @@ IUSE="audit caps cet compile-locales +crypt custom-cflags doc gd headers-only +m # Minimum kernel version that glibc requires MIN_KERN_VER="3.2.0" +# Minimum pax-utils version needed (which contains any new syscall changes for +# its seccomp filter!). Please double check this! +MIN_PAX_UTILS_VER="1.3.3" # Here's how the cross-compile logic breaks down ... # CTARGET - machine that will target the binaries @@ -98,7 +101,7 @@ fi BDEPEND=" ${PYTHON_DEPS} - >=app-misc/pax-utils-1.3.3 + >=app-misc/pax-utils-${MIN_PAX_UTILS_VER} sys-devel/bison doc? ( sys-apps/texinfo ) !compile-locales? ( @@ -130,7 +133,7 @@ RDEPEND="${COMMON_DEPEND} sys-apps/grep virtual/awk sys-apps/gentoo-functions - !<app-misc/pax-utils-1.3.3 + !<app-misc/pax-utils-${MIN_PAX_UTILS_VER} !<net-misc/openssh-8.1_p1-r2 " |