From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from bumble.maple.relay.mailchannels.net (bumble.maple.relay.mailchannels.net [23.83.214.25]) by sourceware.org (Postfix) with ESMTPS id 84E443858D33 for ; Mon, 2 Oct 2023 14:13:01 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 84E443858D33 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=gotplt.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gotplt.org X-Sender-Id: dreamhost|x-authsender|siddhesh@gotplt.org Received: from relay.mailchannels.net (localhost [127.0.0.1]) by relay.mailchannels.net (Postfix) with ESMTP id 7443E81A18; Mon, 2 Oct 2023 14:13:00 +0000 (UTC) Received: from pdx1-sub0-mail-a272.dreamhost.com (unknown [127.0.0.6]) (Authenticated sender: dreamhost) by relay.mailchannels.net (Postfix) with ESMTPA id 1483681B34; Mon, 2 Oct 2023 14:13:00 +0000 (UTC) ARC-Seal: i=1; s=arc-2022; d=mailchannels.net; t=1696255980; a=rsa-sha256; cv=none; b=7t6Dx6tjnEAOezf7MaF6SpHX2rlivGBnK8bQ+NyqxpjIFcVLfwZFy/JRr8RG2YlrC3lcFm QaaTAixPRwvc8OzfNI57yR7HzI290yIvKFXWFFaK27fRre8GHH2NMHVxF4yOB0aXbVhLSG c8bFQGeDe4QYOQB7fwckF5QQy0f2cHdn/eCrTkYeVLY7w7GBtp83y+gGZLP2ktsT2LhRm4 0ob61O1QypquWv2ukZgWLaEKqP9CMuXm+F4ixxx76TJMGoEDVPm+vkWjkhis9auptCHinH 62+nl1CnIRYxqaeZhvBN7P8NlPZInrB4wokuXQod3naP/dxmanE5DcLwivxC/w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=mailchannels.net; s=arc-2022; t=1696255980; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=DnNo7Mt1/X82kmV567s/Z/xYMagZNDIXHiLz9Cr6C9Y=; b=a35mMZu/5vXKLsuApl5nRc3CyHtfSgOpmZ2Nepmxr/iTsnz3VXINL+r5kiZHnB6YLHFg7c 5k016RHkic6YGSg86qa/P4rI5b5R7muO5b/S9VyCbs4+xm8VpmYv1O7vKuySgtFA0q8KwL Z8PU3+o3ZgO+MPUYkHpRl6chtf5CeEPK8SlPUcG362xFOtF0/FbQaHoxJm2oeJ05FQt+17 PhmHlJY9jll+ZgoseK0XgCZzTld1H0trHlKcEQGawp8eT0NA3EplCJ7vAz0skoK7+Zq0fR lu7zK0UqOH2ZfeUFcKOpSdGYR6IkH0JWXhpz54Fd+Ea620lyhG738NXhcFmyuw== ARC-Authentication-Results: i=1; rspamd-7d5dc8fd68-5f85c; auth=pass smtp.auth=dreamhost smtp.mailfrom=siddhesh@gotplt.org X-Sender-Id: dreamhost|x-authsender|siddhesh@gotplt.org X-MC-Relay: Neutral X-MailChannels-SenderId: dreamhost|x-authsender|siddhesh@gotplt.org X-MailChannels-Auth-Id: dreamhost X-Illegal-Hook: 61f58f031e7573a6_1696255980311_1176742311 X-MC-Loop-Signature: 1696255980311:3098433186 X-MC-Ingress-Time: 1696255980311 Received: from pdx1-sub0-mail-a272.dreamhost.com (pop.dreamhost.com [64.90.62.162]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384) by 100.109.140.241 (trex/6.9.1); Mon, 02 Oct 2023 14:13:00 +0000 Received: from [192.168.2.12] (bras-vprn-toroon4834w-lp130-02-142-113-138-41.dsl.bell.ca [142.113.138.41]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) (Authenticated sender: siddhesh@gotplt.org) by pdx1-sub0-mail-a272.dreamhost.com (Postfix) with ESMTPSA id 4RzjbH5CvqzC7; Mon, 2 Oct 2023 07:12:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gotplt.org; s=dreamhost; t=1696255979; bh=DnNo7Mt1/X82kmV567s/Z/xYMagZNDIXHiLz9Cr6C9Y=; h=Date:Subject:To:From:Content-Type:Content-Transfer-Encoding; b=lFdYuux2XhJ4snrBZqsUmVxarkAG+34fBivcMGUNs3N792QMadyORnoXIyF/aVdBS lxFS7GqdMqJxosK2tcvtlCARirELi6C6dkd6YIE5Nbt526pG45dsMJb8Phn9zwQbnn LwnUhocTUCFRK2zV6hksEe55zS6hnnoK95bJYHATpkKuZs8BjHYYS6oRCe/unJ8Wdt SKVEJ7QcEy6+jKaVaBCImTCCWS8hJfeGmn3WartBuBqL86oEMnWVBwAjB5hmy9DHsa dYuVGVmXxz8Odh6ulAgUQ+pmlKuuHG+irP0bNRF3/MhZLuKxMuseC1a1YtM1trPVuP Jj7QkwfGhcFuw== Message-ID: <762f5c08-b341-0c0e-148f-59106b201b3d@gotplt.org> Date: Mon, 2 Oct 2023 10:12:58 -0400 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.13.0 Subject: Re: [PATCH 02/16] nss: Rearrange and sort Makefile variables Content-Language: en-US To: Arjun Shankar , libc-alpha@sourceware.org References: <20231002130150.1497733-1-arjun@redhat.com> <20231002130150.1497733-3-arjun@redhat.com> From: Siddhesh Poyarekar In-Reply-To: <20231002130150.1497733-3-arjun@redhat.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=-3037.6 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,NICE_REPLY_A,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL,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 List-Id: On 2023-10-02 08:55, Arjun Shankar wrote: > Rearrange lists of routines, tests, etc. into one-per-line in > nss/Makefile and sort them using scripts/sort-makefile-lines.py. > --- This is a trivial, independent cleanup, please push. Oh, and apologies for putting the hv2-canonname test in the wrong place :) Reviewed-by: Siddhesh Poyarekar > nss/Makefile | 55 +++++++++++++++++++++++++++++++++++++++------------- > 1 file changed, 41 insertions(+), 14 deletions(-) > > diff --git a/nss/Makefile b/nss/Makefile > index 668ba34b18..32764b74c0 100644 > --- a/nss/Makefile > +++ b/nss/Makefile > @@ -22,23 +22,50 @@ subdir := nss > > include ../Makeconfig > > -headers := nss.h > +headers := \ > + nss.h \ > + # headers > > # This is the trivial part which goes into libc itself. > -routines = nsswitch getnssent getnssent_r digits_dots \ > - valid_field valid_list_field rewrite_field \ > - $(addsuffix -lookup,$(databases)) \ > - compat-lookup nss_hash nss_files_fopen \ > - nss_readline nss_parse_line_result \ > - nss_fgetent_r nss_module nss_action \ > - nss_action_parse nss_database nss_files_data \ > - nss_files_functions > +routines = \ > + $(addsuffix -lookup,$(databases)) \ > + compat-lookup \ > + digits_dots \ > + getnssent \ > + getnssent_r \ > + nss_action \ > + nss_action_parse \ > + nss_database \ > + nss_fgetent_r \ > + nss_files_data \ > + nss_files_fopen \ > + nss_files_functions \ > + nss_hash \ > + nss_module \ > + nss_parse_line_result \ > + nss_readline \ > + nsswitch \ > + rewrite_field \ > + valid_field \ > + valid_list_field \ > + # routines > > # These are the databases that go through nss dispatch. > # Caution: if you add a database here, you must add its real name > # in databases.def, too. > -databases = proto service hosts network grp pwd ethers \ > - spwd netgrp alias sgrp > +databases = \ > + alias \ > + ethers \ > + grp \ > + hosts \ > + netgrp \ > + network \ > + proto \ > + pwd \ > + service \ > + sgrp \ > + spwd \ > + # databases > > ifneq (,$(filter sunrpc,$(subdirs))) > databases += key rpc > @@ -68,7 +95,7 @@ tests := \ > tst-nss-test4 \ > tst-nss-test5 \ > tst-nss-test_errno \ > -# tests > + # tests > > xtests = bug-erange > > @@ -79,11 +106,11 @@ tests-container := \ > tst-nss-files-hosts-long \ > tst-nss-files-hosts-v4mapped \ > tst-nss-gai-actions \ > + tst-nss-gai-hv2-canonname \ > tst-nss-test3 \ > tst-reload1 \ > tst-reload2 \ > - tst-nss-gai-hv2-canonname \ > -# tests-container > + # tests-container > > # Tests which need libdl > ifeq (yes,$(build-shared))