From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pg1-x533.google.com (mail-pg1-x533.google.com [IPv6:2607:f8b0:4864:20::533]) by sourceware.org (Postfix) with ESMTPS id 8FA5E3858408 for ; Mon, 21 Feb 2022 21:14:35 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 8FA5E3858408 Received: by mail-pg1-x533.google.com with SMTP id w37so8914305pga.7 for ; Mon, 21 Feb 2022 13:14:35 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=BpQ0WQYoGNULvAoexxiSjq6WBbS91Pn59G08cqMOFYc=; b=WBgVeiSPoYxm3UUMe2s+6T5tdG8to5zpnCZOsdTZCzt9B5THIose/Aod0cBc73sO+B UQzNYV72tK+gvITQ/loBNVj8vSxjoMgETVQ/TmRW/Ffc+kQGBx8SUcIb4KrvbEQxNBYP pMB8IxDrBsQCrqD8/2BpYJ18gPuY4jsoLjC2k0/X8Hb5WNOMbKzSfZUy/10XgieGtW50 0JXrh0r1+ZuPRQWVatFR9HRGLOUL799JcXzTVh5AqEXacCiYUNB3pJFOUKKx5tJ7UIwz c32lJ6XtvjMJR9It0b5+gMijovQDuLeMxtNgUHQFjwGQ7YHBF5ysR2kBoW2k7rX6dt6R aGpQ== X-Gm-Message-State: AOAM532sQmHpwY7E+hm1qV+Lxje8y4nZ92LYrNFBLQZbj6tIQLU56h4T XY99fofWA2Hq1a12lXnKvTNFOaW27Clc9g== X-Google-Smtp-Source: ABdhPJzV49l5fPVohZj/5Pv81cOLPKoQxr39DByTk3o37cMbLgGp5rFUSFxGTxW3+6/aivAQNAc9DQ== X-Received: by 2002:a05:6a00:1a42:b0:4d1:e81a:64cb with SMTP id h2-20020a056a001a4200b004d1e81a64cbmr22101167pfv.78.1645478074305; Mon, 21 Feb 2022 13:14:34 -0800 (PST) Received: from localhost ([2409:10:24a0:4700:e8ad:216a:2a9d:6d0c]) by smtp.gmail.com with ESMTPSA id y27sm18539643pgc.92.2022.02.21.13.14.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 21 Feb 2022 13:14:31 -0800 (PST) Date: Tue, 22 Feb 2022 06:14:29 +0900 From: Stafford Horne To: Adhemerval Zanella Cc: GLIBC patches , Florian Weimer Subject: Re: [PATCH] resolv: Fix tst-resolv tests for 2.35 ABIs and later Message-ID: References: <20220211234239.1251406-1-shorne@gmail.com> <7b97b4ba-b672-5668-5763-dd6d129880ac@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <7b97b4ba-b672-5668-5763-dd6d129880ac@linaro.org> X-Spam-Status: No, score=-10.9 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, GIT_PATCH_0, 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 21:14:37 -0000 On Mon, Feb 21, 2022 at 03:24:21PM -0300, Adhemerval Zanella wrote: > > > 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 Thanks, I think we should backport this to the 2.35 branch as well, I will do that. -Stafford > > > > 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