From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pj1-x1036.google.com (mail-pj1-x1036.google.com [IPv6:2607:f8b0:4864:20::1036]) by sourceware.org (Postfix) with ESMTPS id CAD7D3858002 for ; Fri, 11 Feb 2022 11:34:57 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org CAD7D3858002 Received: by mail-pj1-x1036.google.com with SMTP id a11-20020a17090a740b00b001b8b506c42fso11720246pjg.0 for ; Fri, 11 Feb 2022 03:34:57 -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=qO+BVTruIJuf1P6AG0zZu7Ilcm91ps/Q5CzPYLMFtGQ=; b=JB5Z2Wwy59b9C1fJ/mKcmmjH8iITJZpOF3vg6tSZP51gPCp/bbsWsfI8pWJk2cX6Eb 2p8yksAe8XidTziJug6KWJulb/d7c5oGS9tf8unCvJ4Yg9cZKx8LdJfqsHuEG7aTIH3+ qxtgm6MAcOp3zl8DgdMqqjXsYW0P2HrUDuIvfoTM0zgoKqHEWusdJxpohS3MB0TbLF2u ufx1fkC4rsNKrP0AE6Ze23S7Xd5eWxAl9ranyfRY8k7OZW2+Vl70JjzKqGvR4dqnOxdy LcMilNUkr8JjybfhvGdIU0NTqH/vzwpyYNb2OxGvby+yFyB/lWBXwGOV3tek4ltAWSx3 kknA== X-Gm-Message-State: AOAM531QmTTD3Vtb0xJpweo64nfnPq/aQWi+z3f2LrsUy+Bh1+eyMUxe 532y2OcVwzAlfJ/BIaJTBiXSLMM2zWu7Xd4z X-Google-Smtp-Source: ABdhPJzTFoO9skLgqjChMmPVLYdPfYoO3cXym908aL8gOyyO6MivlwHybQ4mbZ6Ng8ylRTOfSGCCRw== X-Received: by 2002:a17:90b:4d0e:: with SMTP id mw14mr1266592pjb.133.1644579296870; Fri, 11 Feb 2022 03:34:56 -0800 (PST) Received: from localhost ([2409:10:24a0:4700:e8ad:216a:2a9d:6d0c]) by smtp.gmail.com with ESMTPSA id lw3sm1336571pjb.24.2022.02.11.03.34.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 11 Feb 2022 03:34:56 -0800 (PST) Date: Fri, 11 Feb 2022 20:34:54 +0900 From: Stafford Horne To: Adhemerval Zanella Cc: Florian Weimer , libc-alpha@sourceware.org Subject: Re: [PATCH] resolv: Do not build libanl.so for ABIs starting at 2.35 Message-ID: References: <20211229163951.3517051-1-adhemerval.zanella@linaro.org> <87czlfb6wk.fsf@oldenburg.str.redhat.com> <7b27dffe-c63a-fc3e-9f2b-741f96ac2b21@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <7b27dffe-c63a-fc3e-9f2b-741f96ac2b21@linaro.org> X-Spam-Status: No, score=-10.6 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, GIT_PATCH_0, KAM_NUMSUBJECT, 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: Fri, 11 Feb 2022 11:35:00 -0000 On Mon, Jan 03, 2022 at 10:58:53AM -0300, Adhemerval Zanella wrote: > > > On 03/01/2022 01:53, Stafford Horne wrote: > > On Thu, Dec 30, 2021 at 11:06:31AM -0300, Adhemerval Zanella via Libc-alpha wrote: > >> > >> > >> On 29/12/2021 15:30, Florian Weimer wrote: > >>> * Adhemerval Zanella: > >>> > >>>> --- > >>>> resolv/Makefile | 11 ++++++++++- > >>>> 1 file changed, 10 insertions(+), 1 deletion(-) > >>>> > >>>> diff --git a/resolv/Makefile b/resolv/Makefile > >>>> index 59e599535c..5606eab1fd 100644 > >>>> --- a/resolv/Makefile > >>>> +++ b/resolv/Makefile > >>>> @@ -78,8 +78,12 @@ generate := mtrace-tst-leaks.out tst-leaks.mtrace tst-leaks2.mtrace > >>>> > >>>> extra-libs := libresolv libnss_dns > >>>> ifeq ($(have-thread-library),yes) > >>>> -extra-libs += libanl > >>>> 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 \ > >>>> @@ -176,6 +180,11 @@ $(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 > >>>> +$(inst_libdir)/libanl.so: > >>>> + > >>> > >>> Looks okay. But the second hunk should be in a separate commit; I think > >>> we should backport it. > >> > >> Done. > > > > After this make check fails on the OpenRISC port. > > > > tst-linkall-static fails with: > > > > make[3]: *** No rule to make target 'build/glibcs/or1k-linux-gnu-soft/glibc/resolv/libanl.a', needed by 'build/glibcs/or1k-linux-gnu-soft/glibc/elf/tst-linkall-static'. Stop. > > > > We may want to keep libanl.a around as an empty binary for build compatibility > > reasons like we did with libutil. There may be builds wheck hard code -lanl, > > maybe not as much as -lutil though. > > > > Never the less, this patch seems to fix it: > > I think should just remove the libanl.a reference, as per 699361795f6af8. > I will fix it. One more thing, sorry I just picked this up now. After the fixes we are now getting: make: Entering directory '/home/shorne/work/gnu-toolchain/glibc/resolv' make: *** No rule to make target '/home/shorne/work/gnu-toolchain/build-glibc/resolv/tst-resolv-res_ninit.out', needed by '/home/shorne/work/gnu-toolchain/build-glibc/resolv/mtrace-tst-resolv-res_ninit.out'. Stop. make: Leaving directory '/home/shorne/work/gnu-toolchain/glibc/resolv' The "if" condition change blocked many of the tst-resolv* tests from being built or run for 2.35 only ports. Is that expected? There are now a few things like above that are missing their dependencies. Do we need: diff --git a/resolv/Makefile b/resolv/Makefile index c465479e8b..11e3b203a3 100644 --- a/resolv/Makefile +++ b/resolv/Makefile @@ -84,7 +84,9 @@ endif ifeq ($(have-GLIBC_2.34)$(have-thread-library),yesyes) # Empty compatibility library for old binaries. extra-libs += libanl +endif +ifeq ($(have-thread-library),yes) tests += \ tst-bug18665 \ tst-bug18665-tcp \