| 1 |
commit: 28de41f0523327e9f7334595017b5cdc37d0513b |
| 2 |
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Dec 2 15:49:01 2021 +0000 |
| 4 |
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Dec 5 10:24:54 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=28de41f0 |
| 7 |
|
| 8 |
sys-libs/glibc: Update live ebuild |
| 9 |
|
| 10 |
Package-Manager: Portage-3.0.28, Repoman-3.0.3 |
| 11 |
Signed-off-by: Andreas K. Huettel <dilfridge <AT> gentoo.org> |
| 12 |
|
| 13 |
sys-libs/glibc/glibc-9999.ebuild | 31 ++++++++++++++----------------- |
| 14 |
1 file changed, 14 insertions(+), 17 deletions(-) |
| 15 |
|
| 16 |
diff --git a/sys-libs/glibc/glibc-9999.ebuild b/sys-libs/glibc/glibc-9999.ebuild |
| 17 |
index 79318fb53543..f5422fcf72cb 100644 |
| 18 |
--- a/sys-libs/glibc/glibc-9999.ebuild |
| 19 |
+++ b/sys-libs/glibc/glibc-9999.ebuild |
| 20 |
@@ -47,7 +47,7 @@ SRC_URI+=" https://gitweb.gentoo.org/proj/locale-gen.git/snapshot/locale-gen-${L |
| 21 |
SRC_URI+=" multilib-bootstrap? ( https://dev.gentoo.org/~dilfridge/distfiles/gcc-multilib-bootstrap-${GCC_BOOTSTRAP_VER}.tar.xz )" |
| 22 |
SRC_URI+=" systemd? ( https://gitweb.gentoo.org/proj/toolchain/glibc-systemd.git/snapshot/glibc-systemd-${GLIBC_SYSTEMD_VER}.tar.gz )" |
| 23 |
|
| 24 |
-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" |
| 25 |
+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" |
| 26 |
|
| 27 |
# Minimum kernel version that glibc requires |
| 28 |
MIN_KERN_VER="3.2.0" |
| 29 |
@@ -723,20 +723,6 @@ sanity_prechecks() { |
| 30 |
fi |
| 31 |
} |
| 32 |
|
| 33 |
-upgrade_warning() { |
| 34 |
- if [[ ${MERGE_TYPE} != buildonly && -n ${REPLACING_VERSIONS} && -z ${ROOT} ]]; then |
| 35 |
- local oldv newv=$(ver_cut 1-2 ${PV}) |
| 36 |
- for oldv in ${REPLACING_VERSIONS}; do |
| 37 |
- if ver_test ${oldv} -lt ${newv}; then |
| 38 |
- ewarn "After upgrading glibc, please restart all running processes." |
| 39 |
- ewarn "Be sure to include init (telinit u) or systemd (systemctl daemon-reexec)." |
| 40 |
- ewarn "Alternatively, reboot your system." |
| 41 |
- break |
| 42 |
- fi |
| 43 |
- done |
| 44 |
- fi |
| 45 |
-} |
| 46 |
- |
| 47 |
# |
| 48 |
# the phases |
| 49 |
# |
| 50 |
@@ -747,7 +733,6 @@ pkg_pretend() { |
| 51 |
# All the checks... |
| 52 |
einfo "Checking general environment sanity." |
| 53 |
sanity_prechecks |
| 54 |
- upgrade_warning |
| 55 |
} |
| 56 |
|
| 57 |
pkg_setup() { |
| 58 |
@@ -799,6 +784,14 @@ src_prepare() { |
| 59 |
einfo "Done." |
| 60 |
fi |
| 61 |
|
| 62 |
+ if use clone3 ; then |
| 63 |
+ append-cppflags -DGENTOO_USE_CLONE3 |
| 64 |
+ else |
| 65 |
+ # See e.g. bug #827386, bug #819045. |
| 66 |
+ elog "Disabling the clone3 syscall for compatibility with older Electron apps." |
| 67 |
+ elog "Please re-enable this flag before filing bugs!" |
| 68 |
+ fi |
| 69 |
+ |
| 70 |
default |
| 71 |
|
| 72 |
gnuconfig_update |
| 73 |
@@ -1555,7 +1548,11 @@ pkg_postinst() { |
| 74 |
use compile-locales || run_locale_gen "${EROOT}/" |
| 75 |
fi |
| 76 |
|
| 77 |
- upgrade_warning |
| 78 |
+ if systemd_is_booted && [[ -z ${ROOT} ]] ; then |
| 79 |
+ # We need to restart systemd when upgrading from < 2.34 |
| 80 |
+ # bug #823756 |
| 81 |
+ systemctl daemon-reexec |
| 82 |
+ fi |
| 83 |
|
| 84 |
# Check for sanity of /etc/nsswitch.conf, take 2 |
| 85 |
if [[ -e ${EROOT}/etc/nsswitch.conf ]] && ! has_version sys-auth/libnss-nis ; then |
Archives