From patchwork Wed Jan 10 21:13:37 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Carlos O'Donell X-Patchwork-Id: 83793 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 B26D73857C4A for ; Wed, 10 Jan 2024 21:14:23 +0000 (GMT) X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org 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 D29553858C66 for ; Wed, 10 Jan 2024 21:14:02 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org D29553858C66 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org D29553858C66 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=170.10.133.124 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1704921245; cv=none; b=K5jwLfBSXa/pCZ15VwVY9aPkEKhL/iUIzYy63cx5AuKJu0KWZNzVKnavD8QdFe3dBgqPTKZTVCh1I3PYRcPmMx0S15ytkV0V4U1UEde0BXBtHELtgdT8JJifS+1Wm8V1wCrPnCfpn6nnR9nqhjc5pF1JV2+wRb6uKeIR6szn/Sw= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1704921245; c=relaxed/simple; bh=NpuN2K4C2U/Xlxv0feF+MIf0QDEuM7lIdlAfQcUeFqk=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=BEsReIri2Ess88d/OQtDEPLyojEOT0ku1GcpO1Pud8NwkjO3+Dcrn9TNiVGjUwHTd0/efQOxT+lIUcVIZKZi0YcTmBK4g/tlV+wd/lt3d9mFa5zh1cFlJIPzxx7vykcG0U47WGUNgf8cPTJgejxymggxWbg0tKQIShdx7Wd85/M= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1704921242; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JcF4/pggAgNFJb25RPfg2W3oJ7iYLym5OR+XvOXqx/0=; b=d908PhUc73Y/eNIqyvBxZLh66ifhD9nbSGyXB1OnYerqU28EE3c9EZZqW/do7R/j3r0jgL qffwq7RRiADxSII8in2WwW4rQbTy8coOJXPHFZEROH/kt8ppvFTGJ4rl2CPUX3X31nrQLE EcGd/b2rAllgUZMdk5iyYqUXk/8eC7Q= Received: from mail-qk1-f199.google.com (mail-qk1-f199.google.com [209.85.222.199]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-212-CizdS2noM0Oyfmj5fHCJNg-1; Wed, 10 Jan 2024 16:14:01 -0500 X-MC-Unique: CizdS2noM0Oyfmj5fHCJNg-1 Received: by mail-qk1-f199.google.com with SMTP id af79cd13be357-78315f41c6cso615319085a.1 for ; Wed, 10 Jan 2024 13:14:01 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1704921240; x=1705526040; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=JcF4/pggAgNFJb25RPfg2W3oJ7iYLym5OR+XvOXqx/0=; b=OpN7X8noFpD8ntjy6vKAeIhEZrGI4RH3AAa7MOlZNl+8RGcEqYNTDkVV3giYfD4C2s 4Q8bJ4NFTJa0h4uqScUUxBV0n0wxKjfCgtfyMte8CkbqyL7/BlMxQBhwcsRDiBjajHIP DnE/O6lz71d3eEYdX0mcgZAk/WBif7XKJv/O4heOzEYwJc2yhL/4XY4H9qSMt85c4wQU denGqmRJv43cbrhUhJN8Hc1KYD4GB5cblOE3GZRAcGwla0jjvqtHvjY5FmefjsVmFunl 9ApcjycPDSiEdLgcavoinPhs3kFgxu7+e9dqm89aK37C7AdufxVlEwDNejAuDQzdlLXM +Naw== X-Gm-Message-State: AOJu0YxubuANPVQI3Ov0hLTh8iH8WkfW4oo2/H9LahlNJ7HM/nu1bBBv y5dfJtGxqM/eCCufLVHtkjM5VJ9nc4B4kIfztwyRA8D2IWfsR1rOOt/jjmH0h5UF/p0N7L3yM4w UuVfUlcWQxSYiyjrEN3MKVH1VWCSYtFoLDvSKRTD9PT3s6Bsz73OmJGr6pFZYBoG5otufhKt9Ch mIlIn0qHLdUQ== X-Received: by 2002:a05:620a:bc6:b0:783:2b14:eca7 with SMTP id s6-20020a05620a0bc600b007832b14eca7mr285317qki.48.1704921239903; Wed, 10 Jan 2024 13:13:59 -0800 (PST) X-Google-Smtp-Source: AGHT+IH6vMhL3rtn/f9AgVyct+bH2mMlcrN8E4KzKk4Awgcque7oJy0J3wg4nrWg6UGY6W846Hc63w== X-Received: by 2002:a05:620a:bc6:b0:783:2b14:eca7 with SMTP id s6-20020a05620a0bc600b007832b14eca7mr285302qki.48.1704921239555; Wed, 10 Jan 2024 13:13:59 -0800 (PST) Received: from localhost.localdomain ([198.48.244.52]) by smtp.gmail.com with ESMTPSA id e9-20020a37ac09000000b00781d3f29215sm1868753qkm.91.2024.01.10.13.13.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 10 Jan 2024 13:13:57 -0800 (PST) From: Carlos O'Donell To: libc-alpha@sourceware.org Cc: Carlos O'Donell Subject: [COMMITTED] locale: Sort Makefile variables. Date: Wed, 10 Jan 2024 16:13:37 -0500 Message-ID: <20240110211343.532748-1-carlos@redhat.com> X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-12.5 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, RCVD_IN_SORBS_WEB, SPF_HELO_NONE, SPF_NONE, TXREP, T_FILL_THIS_FORM_SHORT, T_SCC_BODY_TEXT_LINE 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+patchwork=sourceware.org@sourceware.org Sort Makefile variables using scrips/sort-makefile-lines.py. No regressions on x86_64. --- locale/Makefile | 126 +++++++++++++++++++++++++++++++++++++----------- 1 file changed, 97 insertions(+), 29 deletions(-) diff --git a/locale/Makefile b/locale/Makefile index 022bf81101..2810f28605 100644 --- a/locale/Makefile +++ b/locale/Makefile @@ -22,43 +22,111 @@ subdir := locale include ../Makeconfig -headers = langinfo.h locale.h bits/locale.h \ - bits/types/locale_t.h bits/types/__locale_t.h -routines = setlocale findlocale loadlocale loadarchive \ - localeconv nl_langinfo nl_langinfo_l mb_cur_max \ - newlocale duplocale freelocale uselocale -tests = tst-C-locale tst-locname tst-duplocale -tests-container = tst-localedef-path-norm -categories = ctype messages monetary numeric time paper name \ - address telephone measurement identification collate -aux = $(categories:%=lc-%) $(categories:%=C-%) SYS_libc C_name \ - xlocale localename global-locale coll-lookup -others = localedef locale -#others-static = localedef locale -install-bin = localedef locale -extra-objs = $(localedef-modules:=.o) $(localedef-aux:=.o) \ - $(locale-modules:=.o) $(lib-modules:=.o) -generated += C-translit.h -before-compile += $(objpfx)C-translit.h - -extra-libs = libBrokenLocale +headers = \ + bits/locale.h \ + bits/types/__locale_t.h \ + bits/types/locale_t.h \ + langinfo.h \ + locale.h \ + # headers +routines = \ + duplocale \ + findlocale \ + freelocale \ + loadarchive \ + loadlocale \ + localeconv \ + mb_cur_max \ + newlocale \ + nl_langinfo \ + nl_langinfo_l \ + setlocale \ + uselocale + # routines +tests = \ + tst-C-locale \ + tst-duplocale \ + tst-locname \ + # tests +tests-container = \ + tst-localedef-path-norm \ + # tests-container +categories = \ + address \ + collate \ + ctype \ + identification \ + measurement \ + messages \ + monetary \ + name \ + numeric \ + paper \ + telephone \ + time \ + # categories +aux = \ + $(categories:%=C-%) \ + $(categories:%=lc-%) \ + C_name \ + SYS_libc \ + coll-lookup \ + global-locale \ + localename \ + xlocale \ + # aux +others = \ + locale \ + localedef \ + # others +#others-static = \ +# localedef \ +# locale \ +# # others-static +install-bin = \ + locale \ + localedef \ + # install-bin +extra-objs = \ + $(lib-modules:=.o) \ + $(locale-modules:=.o) \ + $(localedef-aux:=.o) \ + $(localedef-modules:=.o) \ + # extra-objs +generated += C-translit.h +before-compile += $(objpfx)C-translit.h + +extra-libs = libBrokenLocale extra-libs-others = $(extra-libs) libBrokenLocale-routines = broken_cur_max -subdir-dirs = programs +subdir-dirs = programs vpath %.c programs vpath %.h programs vpath %.gperf programs -localedef-modules := localedef $(categories:%=ld-%) \ - charmap linereader locfile \ - repertoire locarchive -localedef-aux := md5 -locale-modules := locale locale-spec -lib-modules := charmap-dir simple-hash xmalloc xstrdup \ - record-status xasprintf - +localedef-modules := \ + charmap \ + linereader \ + localedef $(categories:%=ld-%) \ + locarchive \ + locfile \ + repertoire \ + # localedef-modules +localedef-aux := md5 +locale-modules := \ + locale \ + locale-spec \ + # locale-modules +lib-modules := \ + charmap-dir \ + record-status \ + simple-hash \ + xasprintf \ + xmalloc \ + xstrdup \ + # lib-modules GPERF = gperf GPERFFLAGS = -acCgopt -k1,2,5,9,$$ -L ANSI-C