commit:     ec02fa205231d94d8e4b35e3c58c02b99313ff26
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 20 21:06:11 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Mar 20 21:06:11 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ec02fa20

sys-libs/glibc: drop USE=clone3 in >= 2.34-r10

All -clone3 deps are gone now, so we always enable
clone3 in these versions and beyond.

Signed-off-by: Sam James <sam <AT> gentoo.org>

 sys-libs/glibc/glibc-2.34-r10.ebuild | 11 +++--------
 sys-libs/glibc/glibc-2.35.ebuild     | 11 +++--------
 sys-libs/glibc/glibc-9999.ebuild     | 11 +++--------
 3 files changed, 9 insertions(+), 24 deletions(-)

diff --git a/sys-libs/glibc/glibc-2.34-r10.ebuild 
b/sys-libs/glibc/glibc-2.34-r10.ebuild
index 5c7b4c9a1936..4dea22b5ab39 100644
--- a/sys-libs/glibc/glibc-2.34-r10.ebuild
+++ b/sys-libs/glibc/glibc-2.34-r10.ebuild
@@ -46,7 +46,7 @@ SRC_URI+=" 
https://gitweb.gentoo.org/proj/locale-gen.git/snapshot/locale-gen-${L
 SRC_URI+=" multilib-bootstrap? ( 
https://dev.gentoo.org/~dilfridge/distfiles/gcc-multilib-bootstrap-${GCC_BOOTSTRAP_VER}.tar.xz
 )"
 SRC_URI+=" systemd? ( 
https://gitweb.gentoo.org/proj/toolchain/glibc-systemd.git/snapshot/glibc-systemd-${GLIBC_SYSTEMD_VER}.tar.gz
 )"
 
-IUSE="audit caps cet +clone3 compile-locales +crypt custom-cflags doc gd 
headers-only +multiarch multilib multilib-bootstrap nscd profile selinux +ssp 
+static-libs static-pie suid systemd systemtap test vanilla"
+IUSE="audit caps cet compile-locales +crypt custom-cflags doc gd headers-only 
+multiarch multilib multilib-bootstrap nscd profile selinux +ssp +static-libs 
static-pie suid systemd systemtap test vanilla"
 
 # Minimum kernel version that glibc requires
 MIN_KERN_VER="3.2.0"
@@ -863,13 +863,8 @@ src_prepare() {
                einfo "Done."
        fi
 
-       if use clone3 ; then
-               append-cppflags -DGENTOO_USE_CLONE3
-       else
-               # See e.g. bug #827386, bug #819045.
-               elog "Disabling the clone3 syscall for compatibility with older 
Electron apps."
-               elog "Please re-enable this flag before filing bugs!"
-       fi
+       # TODO: We can drop this once patch is gone from our patchset
+       append-cppflags -DGENTOO_USE_CLONE3
 
        default
 

diff --git a/sys-libs/glibc/glibc-2.35.ebuild b/sys-libs/glibc/glibc-2.35.ebuild
index b37bf4d692ac..d656aea8f10a 100644
--- a/sys-libs/glibc/glibc-2.35.ebuild
+++ b/sys-libs/glibc/glibc-2.35.ebuild
@@ -44,7 +44,7 @@ SRC_URI+=" 
https://gitweb.gentoo.org/proj/locale-gen.git/snapshot/locale-gen-${L
 SRC_URI+=" multilib-bootstrap? ( 
https://dev.gentoo.org/~dilfridge/distfiles/gcc-multilib-bootstrap-${GCC_BOOTSTRAP_VER}.tar.xz
 )"
 SRC_URI+=" systemd? ( 
https://gitweb.gentoo.org/proj/toolchain/glibc-systemd.git/snapshot/glibc-systemd-${GLIBC_SYSTEMD_VER}.tar.gz
 )"
 
-IUSE="audit caps cet +clone3 compile-locales +crypt custom-cflags doc gd 
headers-only +multiarch multilib multilib-bootstrap nscd profile selinux +ssp 
+static-libs suid systemd systemtap test vanilla"
+IUSE="audit caps cet compile-locales +crypt custom-cflags doc gd headers-only 
+multiarch multilib multilib-bootstrap nscd profile selinux +ssp +static-libs 
suid systemd systemtap test vanilla"
 
 # Minimum kernel version that glibc requires
 MIN_KERN_VER="3.2.0"
@@ -850,13 +850,8 @@ src_prepare() {
                einfo "Done."
        fi
 
-       if use clone3 ; then
-               append-cppflags -DGENTOO_USE_CLONE3
-       else
-               # See e.g. bug #827386, bug #819045.
-               elog "Disabling the clone3 syscall for compatibility with older 
Electron apps."
-               elog "Please re-enable this flag before filing bugs!"
-       fi
+       # TODO: We can drop this once patch is gone from our patchset
+       append-cppflags -DGENTOO_USE_CLONE3
 
        default
 

diff --git a/sys-libs/glibc/glibc-9999.ebuild b/sys-libs/glibc/glibc-9999.ebuild
index 6928c0dc4788..ffc7af277618 100644
--- a/sys-libs/glibc/glibc-9999.ebuild
+++ b/sys-libs/glibc/glibc-9999.ebuild
@@ -44,7 +44,7 @@ SRC_URI+=" 
https://gitweb.gentoo.org/proj/locale-gen.git/snapshot/locale-gen-${L
 SRC_URI+=" multilib-bootstrap? ( 
https://dev.gentoo.org/~dilfridge/distfiles/gcc-multilib-bootstrap-${GCC_BOOTSTRAP_VER}.tar.xz
 )"
 SRC_URI+=" systemd? ( 
https://gitweb.gentoo.org/proj/toolchain/glibc-systemd.git/snapshot/glibc-systemd-${GLIBC_SYSTEMD_VER}.tar.gz
 )"
 
-IUSE="audit caps cet +clone3 compile-locales +crypt custom-cflags doc gd 
headers-only +multiarch multilib multilib-bootstrap nscd profile selinux +ssp 
+static-libs suid systemd systemtap test vanilla"
+IUSE="audit caps cet compile-locales +crypt custom-cflags doc gd headers-only 
+multiarch multilib multilib-bootstrap nscd profile selinux +ssp +static-libs 
suid systemd systemtap test vanilla"
 
 # Minimum kernel version that glibc requires
 MIN_KERN_VER="3.2.0"
@@ -850,13 +850,8 @@ src_prepare() {
                einfo "Done."
        fi
 
-       if use clone3 ; then
-               append-cppflags -DGENTOO_USE_CLONE3
-       else
-               # See e.g. bug #827386, bug #819045.
-               elog "Disabling the clone3 syscall for compatibility with older 
Electron apps."
-               elog "Please re-enable this flag before filing bugs!"
-       fi
+       # TODO: We can drop this once patch is gone from our patchset
+       append-cppflags -DGENTOO_USE_CLONE3
 
        default
 

Reply via email to