From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by sourceware.org (Postfix) with ESMTPS id DFCB63858D39 for ; Wed, 29 Dec 2021 18:30:42 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org DFCB63858D39 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-144-uhV_VZ0gN0en46GnixTw_Q-1; Wed, 29 Dec 2021 13:30:39 -0500 X-MC-Unique: uhV_VZ0gN0en46GnixTw_Q-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 3FF801898291; Wed, 29 Dec 2021 18:30:38 +0000 (UTC) Received: from oldenburg.str.redhat.com (unknown [10.39.192.44]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 682787745E; Wed, 29 Dec 2021 18:30:37 +0000 (UTC) From: Florian Weimer To: Adhemerval Zanella Cc: libc-alpha@sourceware.org Subject: Re: [PATCH] resolv: Do not build libanl.so for ABIs starting at 2.35 References: <20211229163951.3517051-1-adhemerval.zanella@linaro.org> Date: Wed, 29 Dec 2021 19:30:35 +0100 In-Reply-To: <20211229163951.3517051-1-adhemerval.zanella@linaro.org> (Adhemerval Zanella's message of "Wed, 29 Dec 2021 13:39:51 -0300") Message-ID: <87czlfb6wk.fsf@oldenburg.str.redhat.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain X-Spam-Status: No, score=-12.2 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_NUMSUBJECT, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_NONE, TXREP 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: Wed, 29 Dec 2021 18:30:44 -0000 * 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. Thanks, Florian