From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-oo1-xc2c.google.com (mail-oo1-xc2c.google.com [IPv6:2607:f8b0:4864:20::c2c]) by sourceware.org (Postfix) with ESMTPS id 9AAE43858C2C for ; Mon, 21 Feb 2022 18:24:24 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 9AAE43858C2C Received: by mail-oo1-xc2c.google.com with SMTP id i6-20020a4ac506000000b0031c5ac6c078so6472468ooq.6 for ; Mon, 21 Feb 2022 10:24:24 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:message-id:date:mime-version:user-agent:subject :content-language:to:cc:references:from:in-reply-to :content-transfer-encoding; bh=MwDkKaQMLWyhmvNM0ge6uwYqGQ9cxOl3J5Dh45IoHfE=; b=ls/cdgBBVihatuMUdnwDZUVvv0owPWRaQpoSxBJ57rxMfNSBKABBOpOW6sMHSXGuWn p3HYyPs/YaCRAO5MaBGthHjgDcCkHt2dK3Nyl0cluuCwLLZvSyoNN7W2GxFdJcRwc3+e 9oxemVooPoeX2zgg//c+0d39YPa0V9LWVqnPNclA0WQMh4WsFmbmEedZ4ZRUs8GRbUSN tz6N7MksFMD8hMx1+C8ssEfwd4rjvEe2ovBSBWH66X3XjzjP5nqok/nMHLz/DxP23/o5 V+4+UXms290fGLzl6mtIipa4hr81OmbgfooFOx4PBko42k60J9aDVU0JR6mS6/QszjUJ HwZg== X-Gm-Message-State: AOAM532mj+uQy/75Bw4bED36dCuw12/vTzUh5vwtyrS0NFs/m47aqBej qA8ASWdr+epD3DNCk9mvA7zXcNZ76XI/iw== X-Google-Smtp-Source: ABdhPJyTwT9Tjen6jm9BL/fV0Z/XDMmpJiGG0FbzDdLG2pZBTmMCyPHsKk4x6p2yZbmC2lWDwtgNrQ== X-Received: by 2002:a05:6870:c45:b0:d2:a8f5:6524 with SMTP id lf5-20020a0568700c4500b000d2a8f56524mr108797oab.251.1645467863967; Mon, 21 Feb 2022 10:24:23 -0800 (PST) Received: from ?IPV6:2804:431:c7ca:cb36:ae42:babb:bfa3:4f13? ([2804:431:c7ca:cb36:ae42:babb:bfa3:4f13]) by smtp.gmail.com with ESMTPSA id c5sm5138178otm.64.2022.02.21.10.24.22 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 21 Feb 2022 10:24:23 -0800 (PST) Message-ID: <7b97b4ba-b672-5668-5763-dd6d129880ac@linaro.org> Date: Mon, 21 Feb 2022 15:24:21 -0300 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.6.1 Subject: Re: [PATCH] resolv: Fix tst-resolv tests for 2.35 ABIs and later Content-Language: en-US To: Stafford Horne , GLIBC patches Cc: Florian Weimer References: <20220211234239.1251406-1-shorne@gmail.com> From: Adhemerval Zanella In-Reply-To: <20220211234239.1251406-1-shorne@gmail.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=-12.0 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, NICE_REPLY_A, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 21 Feb 2022 18:24:26 -0000 On 11/02/2022 20:42, Stafford Horne via Libc-alpha wrote: > 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. > --- > Notes: > - I also moved libanl-shared-only-routines into the have-GLIBC_2.34 condition, > Florian didn't mention this in his mail but it seems correct. > - I documented the boundary of the have-thread-library condition. I think this > highlights that for non have-thread-library builds the tst-resolv-res_ninit > will still be broken, because tst-resolv-res_ninit is outside the > have-thread-library condition. LGTM, thanks. Reviewed-by: Adhemerval Zanella > > resolv/Makefile | 18 +++++++++--------- > 1 file changed, 9 insertions(+), 9 deletions(-) > > diff --git a/resolv/Makefile b/resolv/Makefile > index c465479e8b..438672786f 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