diff mbox series

[hurd,commited] hurd 64bit: Add missing libanl

Message ID 20230501114806.3842822-1-samuel.thibault@ens-lyon.org
State Committed, archived
Headers
Series [hurd,commited] hurd 64bit: Add missing libanl |

Checks

Context Check Description
dj/TryBot-apply_patch fail Patch failed to apply to master at the time it was sent
dj/TryBot-32bit fail Patch series failed to apply

Commit Message

Samuel Thibault May 1, 2023, 11:48 a.m. UTC 
  The move of libanl to libc was in glibc 2.34 for nptl only.
---
 resolv/Makefile                         | 2 +-
 sysdeps/htl/Makeconfig                  | 1 +
 sysdeps/mach/hurd/x86_64/libanl.abilist | 4 ++++
 sysdeps/nptl/Makeconfig                 | 1 +
 4 files changed, 7 insertions(+), 1 deletion(-)
 create mode 100644 sysdeps/mach/hurd/x86_64/libanl.abilist
diff mbox series

Patch

diff --git a/resolv/Makefile b/resolv/Makefile
index 5128bd0bc1..054b1fa36c 100644
--- a/resolv/Makefile
+++ b/resolv/Makefile
@@ -186,7 +186,7 @@  libresolv-routines := \
   resolv-deprecated \
   # libresolv-routines
 
-ifeq ($(have-GLIBC_2.34)$(have-thread-library),yesyes)
+ifeq ($(have-anl-library),yes)
 # Empty compatibility library for old binaries.
 extra-libs += libanl
 libanl-routines += libanl-compat
diff --git a/sysdeps/htl/Makeconfig b/sysdeps/htl/Makeconfig
index f8b321c8d2..ab22373ae1 100644
--- a/sysdeps/htl/Makeconfig
+++ b/sysdeps/htl/Makeconfig
@@ -2,6 +2,7 @@ 
 # This gets included at the end of the main glibc Makeconfig.
 
 have-thread-library = yes
+have-anl-library = yes
 
 shared-thread-library = $(common-objpfx)htl/libpthread.so
 static-thread-library = $(..)htl/libpthread_syms.a $(common-objpfx)htl/libpthread.a $(common-objpfx)mach/libmachuser.a $(common-objpfx)hurd/libhurduser.a
diff --git a/sysdeps/mach/hurd/x86_64/libanl.abilist b/sysdeps/mach/hurd/x86_64/libanl.abilist
new file mode 100644
index 0000000000..c0a6a00972
--- /dev/null
+++ b/sysdeps/mach/hurd/x86_64/libanl.abilist
@@ -0,0 +1,4 @@ 
+GLIBC_2.38 gai_cancel F
+GLIBC_2.38 gai_error F
+GLIBC_2.38 gai_suspend F
+GLIBC_2.38 getaddrinfo_a F
diff --git a/sysdeps/nptl/Makeconfig b/sysdeps/nptl/Makeconfig
index 2ce1aa7347..77aedd1e73 100644
--- a/sysdeps/nptl/Makeconfig
+++ b/sysdeps/nptl/Makeconfig
@@ -19,6 +19,7 @@ 
 # This gets included at the end of the main glibc Makeconfig.
 
 have-thread-library = yes
+have-anl-library = $(have-GLIBC_2.34)
 
 # The thread library is integrated.
 shared-thread-library =