AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-11-24 22:10:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

resolv: Fix tst-resolv tests for 2.35 ABIs and later

Browse Source 
The commit 737e873b30 ("resolv: Do not build libanl.so for ABIs starting
at 2.35") disabled building libanl for ports supporting only 2.35 and
later like OpenRISC.

However, the if statement was not updated quite correctly and the change
ends up disabling many tst-resolv* tests.  This was not supposed to be
done and it causes test dependency errors like:

     make: Entering directory 'gnu-home/glibc/resolv'
     make: *** No rule to make target 'gnu-home/build-glibc/resolv/tst-resolv-res_ninit.out', needed by 'gnu-home/build-glibc/resolv/mtrace-tst-resolv-res_ninit.out'. Stop.
     make: Leaving directory 'gnu-home/glibc/resolv'

This patch move the extra-libs += libanl definition and condition down
to be closer to other libanl definitions.  The $(have-GLIBC_2.34)
condition now includes libanl-routines and libanl-shared-only-routines as
well.

Also, I have added a comment to endif of $(have-thread-library) to help
show the bondary of the have-thread-library definitions.

Reviewed-by: Adhemerval Zanella  <adhemerval.zanella@linaro.org>
(cherry picked from commit ee5d27bea5)
This commit is contained in:
Stafford Horne 2022-02-12 08:17:55 +09:00
parent e247a3b118
commit 264ad5d7d6
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
resolv/Makefile
View File

@ -79,11 +79,6 @@ generate := mtrace-tst-leaks.out tst-leaks.mtrace tst-leaks2.mtrace
extra-libs := libresolv libnss_dns
ifeq ($(have-thread-library),yes)
routines += gai_sigqueue
endif
ifeq ($(have-GLIBC_2.34)$(have-thread-library),yesyes)
# Empty compatibility library for old binaries.
extra-libs += libanl
tests += \
tst-bug18665 \
@ -144,7 +139,8 @@ xtests += tst-resolv-qtypes
# This test has dropped packet tests and runs for a long time.
xtests += tst-resolv-rotate
endif
endif # $(have-thread-library)
extra-libs-others = $(extra-libs)
libresolv-routines := \
base64 \
@ -168,6 +164,13 @@ libresolv-routines := \
resolv-deprecated \
# libresolv-routines
ifeq ($(have-GLIBC_2.34)$(have-thread-library),yesyes)
# Empty compatibility library for old binaries.
extra-libs += libanl
libanl-routines += libanl-compat
libanl-shared-only-routines += libanl-compat
endif
$(libanl-routines-var) += \
gai_cancel \
gai_error \
@ -177,9 +180,6 @@ $(libanl-routines-var) += \
getaddrinfo_a \
# $(libanl-routines-var)
libanl-routines += libanl-compat
libanl-shared-only-routines += libanl-compat
# Pretend that libanl.so is a linker script, so that the symbolic link
# is not installed.
install-lib-ldscripts = libanl.so