diff options
| author | Stafford Horne <shorne@gmail.com> | 2022-02-12 08:17:55 +0900 |
|---|---|---|
| committer | Stafford Horne <shorne@gmail.com> | 2022-02-24 16:25:26 +0900 |
| commit | ee5d27bea53626c0187f77feec2c883f2c6ac4b3 (patch) | |
| tree | d3510aa553f7c95dd738fd00d58f10feb91318c9 /resolv | |
| parent | 1153f7158608cfa3e7372e03bb82566a3dab1a19 (diff) | |
| download | glibc-ee5d27bea53626c0187f77feec2c883f2c6ac4b3.zip glibc-ee5d27bea53626c0187f77feec2c883f2c6ac4b3.tar.gz glibc-ee5d27bea53626c0187f77feec2c883f2c6ac4b3.tar.bz2 | |
resolv: Fix tst-resolv tests for 2.35 ABIs and later
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>
Diffstat (limited to 'resolv')
| -rw-r--r-- | resolv/Makefile | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/resolv/Makefile b/resolv/Makefile index c465479..4386727 100644 --- a/resolv/Makefile +++ b/resolv/Makefile @@ -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 |