From patchwork Wed Oct 13 21:20:32 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stafford Horne X-Patchwork-Id: 46188 X-Patchwork-Delegate: azanella@linux.vnet.ibm.com Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 74A763858428 for ; Wed, 13 Oct 2021 21:20:59 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 74A763858428 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1634160059; bh=iM8Gw8xhUh9FPGx3ftYf4N7MFlNcBCiSyzQupd0HLcA=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:Cc:From; b=xi0Thv7yViR7JorVK6jZRWfXuD70dF9k9cybWQVw5iK/wli2UAP/v7aMla8YWHUUf 49+nJZGnQOF97DLI8kWStZL6bTtkJtq8eEF3pHyja6gYqVCihf/zltbgBSUpo2rRdK ROQvZ5SlJWo08GvNbzMtE39v4Ngp6vIeYgZXjPxk= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-pj1-x102c.google.com (mail-pj1-x102c.google.com [IPv6:2607:f8b0:4864:20::102c]) by sourceware.org (Postfix) with ESMTPS id 44E013858403 for ; Wed, 13 Oct 2021 21:20:38 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 44E013858403 Received: by mail-pj1-x102c.google.com with SMTP id om14so3207041pjb.5 for ; Wed, 13 Oct 2021 14:20:38 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=iM8Gw8xhUh9FPGx3ftYf4N7MFlNcBCiSyzQupd0HLcA=; b=YG6jeMHvikS6A20RYcYg1jo85Q0F51o6RHkTLIqUUPs1+Wz3Tuq7ZZEYJImP8yMOdc 2/fJNN2yX/VjXWl/DsDS16EvVdY4ZJO7jIhJHsfK+Sj+LGCGhAXRXpacPfEtKzKJMffs aVQM/alRQv8EK8ubYmF/jLl8DkIpesWecDir5vVD4fyv/lNX1iAXK/84TsR0tgD17K9I wTAJoFNa4p855weCjGSNuAm/m99H8VirUoU1Q15rcvAfSnmgN40TBOBtHFflXAKpDj/Q PDT41sjSAsxGXlhxW+2seOjVOmRRnLDCLAIxwGah1x1ZIfUzyXZZwGJpJLcwq5KiEQn9 ds5Q== X-Gm-Message-State: AOAM533S1nG5YC8TqKUF7O+EaXRlFywvi6s06vEkgf8qoZZ5IdGTkOO2 wdc+16vMngIgzvvOL9QkfolMPaFnBqc= X-Google-Smtp-Source: ABdhPJwW7TMjuZJpaABWfHJS/4S4I4CXpNLnlZ3fHUYWhCP5dpjx4+KqLTNYjPXjHLqp/TWngZcyjA== X-Received: by 2002:a17:90a:718c:: with SMTP id i12mr16309753pjk.182.1634160036940; Wed, 13 Oct 2021 14:20:36 -0700 (PDT) Received: from localhost ([2409:10:24a0:4700:e8ad:216a:2a9d:6d0c]) by smtp.gmail.com with ESMTPSA id x184sm392841pfc.44.2021.10.13.14.20.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Oct 2021 14:20:36 -0700 (PDT) To: GLIBC patches Subject: [PATCH v2] login: Add back libutil as an empty library Date: Thu, 14 Oct 2021 06:20:32 +0900 Message-Id: <20211013212032.2412856-1-shorne@gmail.com> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 X-Spam-Status: No, score=-10.4 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 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-Patchwork-Original-From: Stafford Horne via Libc-alpha From: Stafford Horne Reply-To: Stafford Horne Cc: Florian Weimer Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" There are several packages like sysvinit and buildroot that expect -lutil to work. Rather than impacting them with having to change the linker flags provide an empty libutil.a. --- login/Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/login/Makefile b/login/Makefile index 4e6b97734d..e2bdcb1b0d 100644 --- 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