mirror of
https://github.com/dashpay/dash.git
synced 2024-12-24 19:42:46 +01:00
merge bitcoin#28069: Remove librt usage from release binaries
This commit is contained in:
parent
5d51aa940d
commit
ed1f7fe812
@ -959,8 +959,6 @@ if test x$ac_cv_sys_large_files != x &&
|
|||||||
CPPFLAGS="$CPPFLAGS -D_LARGE_FILES=$ac_cv_sys_large_files"
|
CPPFLAGS="$CPPFLAGS -D_LARGE_FILES=$ac_cv_sys_large_files"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
AC_SEARCH_LIBS([clock_gettime],[rt])
|
|
||||||
|
|
||||||
if test "x$enable_gprof" = xyes; then
|
if test "x$enable_gprof" = xyes; then
|
||||||
dnl -pg is incompatible with -pie. Since hardening and profiling together doesn't make sense,
|
dnl -pg is incompatible with -pie. Since hardening and profiling together doesn't make sense,
|
||||||
dnl we simply make them mutually exclusive here. Additionally, hardened toolchains may force
|
dnl we simply make them mutually exclusive here. Additionally, hardened toolchains may force
|
||||||
|
@ -101,7 +101,6 @@ ELF_ALLOWED_LIBRARIES = {
|
|||||||
'libc.so.6', # C library
|
'libc.so.6', # C library
|
||||||
'libpthread.so.0', # threading
|
'libpthread.so.0', # threading
|
||||||
'libm.so.6', # math library
|
'libm.so.6', # math library
|
||||||
'librt.so.1', # real-time (clock)
|
|
||||||
'libatomic.so.1',
|
'libatomic.so.1',
|
||||||
'ld-linux-x86-64.so.2', # 64-bit dynamic linker
|
'ld-linux-x86-64.so.2', # 64-bit dynamic linker
|
||||||
'ld-linux.so.2', # 32-bit dynamic linker
|
'ld-linux.so.2', # 32-bit dynamic linker
|
||||||
|
@ -561,7 +561,8 @@ inspecting signatures in Mach-O binaries.")
|
|||||||
(base32
|
(base32
|
||||||
"0wm0if2n4z48kpn85va6yb4iac34crds2f55ddpz1hykx6jp1pb6"))
|
"0wm0if2n4z48kpn85va6yb4iac34crds2f55ddpz1hykx6jp1pb6"))
|
||||||
(patches (search-our-patches "glibc-2.27-fcommon.patch"
|
(patches (search-our-patches "glibc-2.27-fcommon.patch"
|
||||||
"glibc-2.27-guix-prefix.patch"))))))
|
"glibc-2.27-guix-prefix.patch"
|
||||||
|
"glibc-2.27-no-librt.patch"))))))
|
||||||
|
|
||||||
(packages->manifest
|
(packages->manifest
|
||||||
(append
|
(append
|
||||||
|
53
contrib/guix/patches/glibc-2.27-no-librt.patch
Normal file
53
contrib/guix/patches/glibc-2.27-no-librt.patch
Normal file
@ -0,0 +1,53 @@
|
|||||||
|
This patch can be dropped when we are building with glibc 2.30+.
|
||||||
|
|
||||||
|
commit 6e41ef56c9baab719a02f1377b1e7ce7bff61e73
|
||||||
|
Author: Florian Weimer <fweimer@redhat.com>
|
||||||
|
Date: Fri Feb 8 10:21:56 2019 +0100
|
||||||
|
|
||||||
|
rt: Turn forwards from librt to libc into compat symbols [BZ #24194]
|
||||||
|
|
||||||
|
As the result of commit 6e6249d0b461b952d0f544792372663feb6d792a
|
||||||
|
("BZ#14743: Move clock_* symbols from librt to libc."), in glibc 2.17,
|
||||||
|
clock_gettime, clock_getres, clock_settime, clock_getcpuclockid,
|
||||||
|
clock_nanosleep were added to libc, and the file rt/clock-compat.c
|
||||||
|
was added with forwarders to the actual implementations in libc.
|
||||||
|
These forwarders were wrapped in
|
||||||
|
|
||||||
|
#if SHLIB_COMPAT (librt, GLIBC_2_2, GLIBC_2_17)
|
||||||
|
|
||||||
|
so that they are not present for newer architectures (such as
|
||||||
|
powerpc64le) with a 2.17 or later ABI baseline. But the forwarders
|
||||||
|
were not marked as compatibility symbols. As a result, on older
|
||||||
|
architectures, historic configure checks such as
|
||||||
|
|
||||||
|
AC_CHECK_LIB(rt, clock_gettime)
|
||||||
|
|
||||||
|
still cause linking against librt, even though this is completely
|
||||||
|
unnecessary. It also creates a needless porting hazard because
|
||||||
|
architectures behave differently when it comes to symbol availability.
|
||||||
|
|
||||||
|
Reviewed-by: Carlos O'Donell <carlos@redhat.com>
|
||||||
|
|
||||||
|
diff --git a/rt/clock-compat.c b/rt/clock-compat.c
|
||||||
|
index f816973c05..11e71aa890 100644
|
||||||
|
--- a/rt/clock-compat.c
|
||||||
|
+++ b/rt/clock-compat.c
|
||||||
|
@@ -30,14 +30,16 @@
|
||||||
|
#if HAVE_IFUNC
|
||||||
|
# undef INIT_ARCH
|
||||||
|
# define INIT_ARCH()
|
||||||
|
-# define COMPAT_REDIRECT(name, proto, arglist) libc_ifunc (name, &__##name)
|
||||||
|
+# define COMPAT_REDIRECT(name, proto, arglist) libc_ifunc (name, &__##name) \
|
||||||
|
+ compat_symbol (librt, name, name, GLIBC_2_2);
|
||||||
|
#else
|
||||||
|
# define COMPAT_REDIRECT(name, proto, arglist) \
|
||||||
|
int \
|
||||||
|
name proto \
|
||||||
|
{ \
|
||||||
|
return __##name arglist; \
|
||||||
|
- }
|
||||||
|
+ } \
|
||||||
|
+ compat_symbol (librt, name, name, GLIBC_2_2);
|
||||||
|
#endif
|
||||||
|
|
||||||
|
COMPAT_REDIRECT (clock_getres,
|
Loading…
Reference in New Issue
Block a user