From patchwork Wed Aug 7 14:04:16 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella X-Patchwork-Id: 1970043 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.a=rsa-sha256 header.s=google header.b=nyeAZZjC; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=sourceware.org (client-ip=8.43.85.97; helo=server2.sourceware.org; envelope-from=libc-alpha-bounces~incoming=patchwork.ozlabs.org@sourceware.org; receiver=patchwork.ozlabs.org) Received: from server2.sourceware.org (server2.sourceware.org [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4WfBlB6G1mz1yXs for ; Thu, 8 Aug 2024 00:05:10 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id EE1A5385C6C2 for ; Wed, 7 Aug 2024 14:05:08 +0000 (GMT) X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-pl1-x62b.google.com (mail-pl1-x62b.google.com [IPv6:2607:f8b0:4864:20::62b]) by sourceware.org (Postfix) with ESMTPS id 149E13858432 for ; Wed, 7 Aug 2024 14:04:27 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 149E13858432 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=linaro.org ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 149E13858432 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2607:f8b0:4864:20::62b ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1723039468; cv=none; b=aBKDIwohombu5Mjtt38Dgxzya79lH3vyc43StDcqJ0G7gXFsjerrc0rufMp/x960LYEjlkQNrR3J4duZtG5vDYUrTOIBNvcNQuAqtruqbn4r9k/Ma40dPVVFfsWINWrIdRrjla4jDqdM+YTT0/zD54MnNRK3uc7Il2JIOh1j82g= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1723039468; c=relaxed/simple; bh=Lk4RHVxP87gMZrmx0kpeXG4Jr5zAuZsw7lc48vJJ3RY=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=i3mL9h46ViTGo1PSWuSDZgY1cNd0ozKgk52yqJBDUToMPFD8Ujh/F2ayXTidbO6CydKqH0c/D2ie3P6q8CReBtGBbGFPys/LmYs3k4y+CgQEH9JnWhDG3AHJC32mb9KHphLHyX8TSkSvquhiP/Cp95m4leocsffsTu6/SIN/No4= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-pl1-x62b.google.com with SMTP id d9443c01a7336-1fc566ac769so18258955ad.1 for ; Wed, 07 Aug 2024 07:04:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1723039465; x=1723644265; darn=sourceware.org; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:from:to:cc:subject:date:message-id:reply-to; bh=xS4eocJ3HrnkQa3roFoYfG9ehhzR0+7MFxTdM/pH5I4=; b=nyeAZZjCW1rGJ3eWBesQ6OXj1h2YpWwLQHum5BU+B9lRNilzgFnNxcRFZIn/DcBIrT 9ldnnERHXQGaOaOVfb6IfIuusqtHTTaHfNTahj1MW2yw9aVT9Vqcm78cZdZsdxNU/HOd uj/lEdQ9QnnLoH0lSjbwbWPruQaGV9LmYiClVbqrLzuxWDKHPC3AriQ7vV0lOT61Gia8 fGK5uKvGdWWgmqfFW8t5ki1xmoa9xX/26fVMSgPxyLzcBBU4qWoTr9phZea62dmSUNtX FUG8iJnCL9T/lyUElFD0PVcCvEsj7l8t/1ZQbFFgDf3/AfV1AipCLY3VlchsnfW+IxTX Pecg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1723039465; x=1723644265; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=xS4eocJ3HrnkQa3roFoYfG9ehhzR0+7MFxTdM/pH5I4=; b=XFYiPrOpzntmB11xV4MxqTN0ISotVj66pYN9zSNWDDj+OF+emGaShozbGL3nwVpD54 kB7zOudWOFTtYC/mTmba1eloEWrQx6VdUt35p//dWCnFrWntpPmKCzKpesbNXznOPSFC nYMXc0GjUioL6L1hpfN4T13SlJGD8RVzttrh8vKoM6dy+UXZvB2IQeyCf0tp1EoWqPac yc332x30AM0YYUnQGe2rS7uYc/nxnunY4ncro2uZ1rHQwwirMUIM5jf6OEahj8ic33PI q57O2RHvrPenw6AY82to6yd+Wpkd12FEcGXSUI8GuOC4jhmBRnPz5oBqno4NG8/d0Yzm Nnig== X-Gm-Message-State: AOJu0YyIQh6CPcB1TwU4g72akiwn6cQGWHR1SU/qP0M0q4SysDKoHYZf lgLBTFfZYie936nldBQ8dYunHnnKrgd/LOEwrMGpzDLvVk1SpajJDUl1o+M0sXpzpRDfZ/4b6+L m X-Google-Smtp-Source: AGHT+IHY96wkKn38kbVV+J869c5JS5VQc67TgPE2DHfzeY0yPciHw7BlZ8PBjXiXmiu0nGlr+TvNnA== X-Received: by 2002:a17:902:fa07:b0:1fd:5ed7:19e4 with SMTP id d9443c01a7336-1ff574cf70dmr133133975ad.60.1723039465175; Wed, 07 Aug 2024 07:04:25 -0700 (PDT) Received: from mandiga.. ([2804:1b3:a7c1:a5f6:164d:db11:5812:d8e3]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-1ff5927ef2bsm106916015ad.227.2024.08.07.07.04.23 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 07 Aug 2024 07:04:24 -0700 (PDT) From: Adhemerval Zanella To: libc-alpha@sourceware.org Subject: [COMMITTED] login: Re-flow and sort multiline Makefile definitions Date: Wed, 7 Aug 2024 11:04:16 -0300 Message-ID: <20240807140421.401583-1-adhemerval.zanella@linaro.org> X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 X-Spam-Status: No, score=-12.8 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libc-alpha-bounces~incoming=patchwork.ozlabs.org@sourceware.org --- login/Makefile | 64 +++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 53 insertions(+), 11 deletions(-) diff --git a/login/Makefile b/login/Makefile index 84563230ef..679a69e4d9 100644 --- a/login/Makefile +++ b/login/Makefile @@ -23,29 +23,71 @@ subdir := login include ../Makeconfig -headers := utmp.h bits/utmp.h lastlog.h pty.h - -routines := getlogin getlogin_r setlogin getlogin_r_chk \ - getutent getutent_r getutid getutline getutid_r getutline_r \ - utmp_file utmpname updwtmp getpt grantpt unlockpt ptsname \ - ptsname_r_chk login login_tty logout logwtmp openpty forkpty +headers := \ + bits/utmp.h \ + lastlog.h \ + pty.h \ + utmp.h \ + # headers + +routines := \ + forkpty \ + getlogin \ + getlogin_r \ + getlogin_r_chk \ + getpt \ + getutent \ + getutent_r \ + getutid \ + getutid_r \ + getutline \ + getutline_r \ + grantpt \ + login \ + login_tty \ + logout \ + logwtmp \ + openpty \ + ptsname \ + ptsname_r_chk \ + setlogin \ + unlockpt \ + updwtmp \ + utmp_file \ + utmpname \ + # routines CFLAGS-grantpt.c += -DLIBEXECDIR='"$(libexecdir)"' others = utmpdump ifeq (yes,$(build-pt-chown)) -others += pt_chown -others-pie = pt_chown +others += \ + pt_chown \ + # others +others-pie = \ + pt_chown \ + # others-pie install-others-programs = $(inst_libexecdir)/pt_chown endif subdir-dirs = programs vpath %.c programs -tests := tst-utmp tst-utmpx tst-grantpt tst-ptsname tst-getlogin tst-updwtmpx \ - tst-pututxline-lockfail tst-pututxline-cache tst-utmp-size tst-utmp-size-64 \ - tst-utmp-unsigned tst-utmp-unsigned-64 +tests := \ + tst-getlogin \ + tst-grantpt \ + tst-ptsname \ + tst-pututxline-cache \ + tst-pututxline-lockfail \ + tst-updwtmpx \ + tst-utmp \ + tst-utmp-size \ + tst-utmp-size-64 \ + tst-utmp-unsigned \ + tst-utmp-unsigned-64 \ + tst-utmpx \ + # tests CFLAGS-tst-utmp-size-64.c += -D_FILE_OFFSET_BITS=64 -D_TIME_BITS=64 CFLAGS-tst-utmp-unsigned-64.c += -D_FILE_OFFSET_BITS=64 -D_TIME_BITS=64