From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from albireo.enyo.de (albireo.enyo.de [37.24.231.21]) by sourceware.org (Postfix) with ESMTPS id 3D8EB3858425 for ; Wed, 13 Oct 2021 14:19:50 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 3D8EB3858425 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=deneb.enyo.de Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=deneb.enyo.de Received: from [172.17.203.2] (port=44547 helo=deneb.enyo.de) by albireo.enyo.de ([172.17.140.2]) with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) id 1maf6i-00068h-Ln; Wed, 13 Oct 2021 14:19:48 +0000 Received: from fw by deneb.enyo.de with local (Exim 4.94.2) (envelope-from ) id 1maf6i-000Ttn-Bd; Wed, 13 Oct 2021 16:19:48 +0200 From: Florian Weimer To: Stafford Horne Cc: Stafford Horne via Libc-alpha Subject: Re: [PATCH] login: Add back libutil as an empty library References: <20211013125042.2347805-1-shorne@gmail.com> <87tuhlf5h5.fsf@mid.deneb.enyo.de> Date: Wed, 13 Oct 2021 16:19:48 +0200 In-Reply-To: (Stafford Horne's message of "Wed, 13 Oct 2021 22:21:07 +0900") Message-ID: <87mtndf1mj.fsf@mid.deneb.enyo.de> MIME-Version: 1.0 Content-Type: text/plain X-Spam-Status: No, score=-5.9 required=5.0 tests=BAYES_00, KAM_DMARC_STATUS, SPF_HELO_NONE, SPF_PASS, 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, 13 Oct 2021 14:19:51 -0000 * Stafford Horne: > I think this I am skipping via the existing if statement. > > -Stafford > > So maybe something like this? > > -- > > --- a/login/Makefile > +++ b/login/Makefile > @@ -46,10 +46,10 @@ vpath %.c programs > tests := tst-utmp tst-utmpx tst-grantpt tst-ptsname tst-getlogin tst-updwtmpx \ > tst-pututxline-lockfail tst-pututxline-cache > > -ifeq ($(have-GLIBC_2.33),yes) > # Empty compatibility library for old binaries. > extra-libs := libutil > extra-libs-others := $(extra-libs) > +ifeq ($(have-GLIBC_2.33),yes) > libutil-routines := libutil-compat > libutil-shared-only-routines := libutil-compat > > @@ -57,6 +57,8 @@ libutil-shared-only-routines := libutil-compat > # link is not installed. > install-lib-ldscripts = libutil.so > $(inst_libdir)/libutil.so: > +else # not $(have-GLIBC_2.33) > +libutil-inhibit-o = $(filter-out .o,$(object-suffixes)) > endif # $(have-GLIBC_2.33) > > include ../Rules Yes, at least it matches my expectations. I'm not familiar enough with the build system to confirm it's correct, but hopefully it unblocks your port.