From patchwork Fri Dec 17 00:26:17 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= X-Patchwork-Id: 12683151 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7C24BC433FE for ; Fri, 17 Dec 2021 00:26:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230302AbhLQA0f (ORCPT ); Thu, 16 Dec 2021 19:26:35 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42288 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230289AbhLQA0e (ORCPT ); Thu, 16 Dec 2021 19:26:34 -0500 Received: from mail-wr1-x42a.google.com (mail-wr1-x42a.google.com [IPv6:2a00:1450:4864:20::42a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AEE13C061574 for ; Thu, 16 Dec 2021 16:26:33 -0800 (PST) Received: by mail-wr1-x42a.google.com with SMTP id v11so916244wrw.10 for ; Thu, 16 Dec 2021 16:26:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=mD1ADEh8sx4q3ET0R/HJXMIivGNzFyhNomPJnoSUOE0=; b=cGwwLkiX/F76zHd8ZENyhkwfmo86GsWWlnNRt59XAyFvtp0MoRLxgk94OmKuGz7lPq 7t5jOOAoDaa39fRsmBvl3/Fmb/AmPAMOhLGcQ7yA8Pq88511PaRJReyM3zpoOOy2K7O7 dKADikinkNi3Bq5yx4SOT0dP8HwKQGIgciXjOSIDLPf0tSuQv4JlWRL5tUyGid98JTQa h+Q9OxXogP0Oct4++P7u6oNvsDDeAPYM3OUbQA+nlGzqntHrSFGHyTQEdjLf1IQTZuw/ K1xmxtnnqNadbMTHEQTGW0JwfgAS4yIgFtHB7zuYKuiTvrvv12jxdm/JQi5cSz3QZoBk 809Q== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=mD1ADEh8sx4q3ET0R/HJXMIivGNzFyhNomPJnoSUOE0=; b=StrLYLan7TdyKUA7ehVYyHP811N8a0NKLF7btLi1uqru+AfKFLk6cc/oExmRbpdIaq 9zM8cdQIjPdI2Akd5Z+IuY2Q/E4cGBubac+NlS3mXkDiREPOsqrViL3/Gt+qd0VhaWJ4 fJmNKrAaldqpKkb+rgnRmp35eeypaJ485oFCnoZPhsCwNHHFxKx7BptL8RWR16Y8K7VH 46BVasJ12pNDdp0guIAS0thBUqRHYQsmWfpB1YM2S/972zjtJq+o9YPAc+e7Qmb0aO4t av8X7SGV5niEh0e/r3rIxzNF5uenUIUbb7HDHwA0dJ5izgLu3G2Ja1gAOy4pHn14RXMa qgTQ== X-Gm-Message-State: AOAM533u3y36HGafD4+bF/vyoJruhyL2CXfSId+EOcamgaal1NjazJKB dQicsbsRQtcZN720YSkdGan/51kn1tQxVA== X-Google-Smtp-Source: ABdhPJzzZiH0eNjBQJ6o+esZHi0/hSPulhhs+8AGRDndl58MXNgR+cVqvBtu3hHpUlDzrZElTR4WJw== X-Received: by 2002:adf:bb4a:: with SMTP id x10mr330339wrg.269.1639700792077; Thu, 16 Dec 2021 16:26:32 -0800 (PST) Received: from vm.nix.is (vm.nix.is. [2a01:4f8:120:2468::2]) by smtp.gmail.com with ESMTPSA id j17sm8127349wmq.41.2021.12.16.16.26.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Dec 2021 16:26:31 -0800 (PST) From: =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= To: git@vger.kernel.org Cc: Junio C Hamano , Phillip Wood , Jeff King , Dan Jacques , Eric Wong , Jonathan Nieder , Mike Hommey , =?utf-8?b?xJBvw6BuIFRy4bqnbiBDw7RuZyBEYW5o?= , Victoria Dye , =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFz?= =?utf-8?b?b24=?= Subject: [PATCH 01/11] Makefile: clean perl/build/ even with NO_PERL=Y Date: Fri, 17 Dec 2021 01:26:17 +0100 Message-Id: X-Mailer: git-send-email 2.34.1.1119.g7a3fc8778ee In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Fix a regression in 499c29394ce (Makefile: allow building without perl, 2009-04-03) where we'd stop cleaning the perl/* directory because NO_PERL was defined, thus leaving behind litter if the flag at "clean" time didn't match that of build time. In 499c29394ce this was done to avoid relying on the perl/Makefile.PL, but since my 20d2a30f8ff (Makefile: replace perl/Makefile.PL with simple make rules, 2017-12-10) we can clean things in that directory unconditionally. Signed-off-by: Ævar Arnfjörð Bjarmason --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 9c00a793e47..b21ffe25c2a 100644 --- a/Makefile +++ b/Makefile @@ -3280,6 +3280,7 @@ clean: profile-clean coverage-clean cocciclean $(RM) $(HCC) $(RM) -r bin-wrappers $(dep_dirs) $(compdb_dir) compile_commands.json $(RM) -r po/build/ + $(RM) -r perl/build/ $(RM) *.pyc *.pyo */*.pyc */*.pyo $(GENERATED_H) $(ETAGS_TARGET) tags cscope* $(RM) -r .dist-tmp-dir .doc-tmp-dir $(RM) $(GIT_TARNAME).tar.gz @@ -3288,7 +3289,6 @@ clean: profile-clean coverage-clean cocciclean $(RM) Documentation/GIT-EXCLUDED-PROGRAMS ifndef NO_PERL $(MAKE) -C gitweb clean - $(RM) -r perl/build/ endif $(MAKE) -C templates/ clean $(MAKE) -C t/ clean From patchwork Fri Dec 17 00:26:18 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= X-Patchwork-Id: 12683153 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4E84AC4332F for ; Fri, 17 Dec 2021 00:26:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230304AbhLQA0f (ORCPT ); Thu, 16 Dec 2021 19:26:35 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42290 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230300AbhLQA0f (ORCPT ); Thu, 16 Dec 2021 19:26:35 -0500 Received: from mail-wr1-x42a.google.com (mail-wr1-x42a.google.com [IPv6:2a00:1450:4864:20::42a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A4E90C061574 for ; Thu, 16 Dec 2021 16:26:34 -0800 (PST) Received: by mail-wr1-x42a.google.com with SMTP id e5so968435wrc.5 for ; Thu, 16 Dec 2021 16:26:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=jmAsePczrBgJMRHXNMKFfzSAis9Rcea40juGAJMAli0=; b=jd3H+qvt+JgjizTuhc5iVx5BDFlDzHoO+d2xMfGddCEuh63Dlv6kgG+xxx6PzXZAL7 hRlM9qhJOwV5NmYAym+ASyocOcMvEsfZXaIoI/cLv6ibQwgilCvqrAv/t+PMjaehpSIX ncgmDDLkXmbncj2ejYs/Ewea9r9xz2mAb0mL7g6/Sh+gSWzBX2EJOoB+Uj94b/cCkU+l XbDvRVnt+xljfiPvKwgaVPBFC1vJdWFclucr+WmdOnh597qP1r09cPi7r2chUzg7nI0n 4odYCS19jJbreRSc9HIMjfimBqvVCevSKkUv/W5DfZBw/tWaJ5N3seIc8NCQM4FyFAIW 0Qlg== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=jmAsePczrBgJMRHXNMKFfzSAis9Rcea40juGAJMAli0=; b=TqvJ2vzjGv9RoTuG2ZPf8yW9sQ/oQBhEieP0jlw+AAzo7LKoh7OVYiMUxVdu0mK3N0 bqs2sTf2ZeTX99+BDylCd99OhGMJyM3kYbC33Gf8EF4+PipKu8h+FxTSKfSAlLQEm8GD 9ykgy32U/3e1Yy2sDP9NfV4jCKRrU2yebBSpBloXx3xTb3PtnD416Ocnhnd29m+hZ7re DIlR666jkPaX0gFlG4NmVnDADKRtU4Le5hXYy4yWZpAWcq5e2zUYjKLAj6l2FvBLAReE RrrhPGzfr9c1JKZKuPRCJGePUARK0MrlBFvTob2Fsq9ICez53IrTjeiTGgyvkDMhw60k qMgg== X-Gm-Message-State: AOAM532DSYpKWyMuYTvEAHDCuiVflG/W96hCWok54iLLcnxlx/nwgwmB NwiW60LdUvQvkD136Ndt9pJi+/SHfat6Rg== X-Google-Smtp-Source: ABdhPJxFkPLCxwfdYR95WNsLsxUN1OABlM2v1aQNd5abZYulT0/HAZcM6rfYRBTqq5ZiQLo/Dlaqgg== X-Received: by 2002:adf:9d4b:: with SMTP id o11mr363978wre.11.1639700792987; Thu, 16 Dec 2021 16:26:32 -0800 (PST) Received: from vm.nix.is (vm.nix.is. [2a01:4f8:120:2468::2]) by smtp.gmail.com with ESMTPSA id j17sm8127349wmq.41.2021.12.16.16.26.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Dec 2021 16:26:32 -0800 (PST) From: =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= To: git@vger.kernel.org Cc: Junio C Hamano , Phillip Wood , Jeff King , Dan Jacques , Eric Wong , Jonathan Nieder , Mike Hommey , =?utf-8?b?xJBvw6BuIFRy4bqnbiBDw7RuZyBEYW5o?= , Victoria Dye , =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFz?= =?utf-8?b?b24=?= Subject: [PATCH 02/11] Makefile: don't set up "perl/build" rules under NO_PERL=Y Date: Fri, 17 Dec 2021 01:26:18 +0100 Message-Id: X-Mailer: git-send-email 2.34.1.1119.g7a3fc8778ee In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Do not define LIB_{PERL,CPAN}{,_GEN} if NO_PERL is defined. This changes no functionality, but makes it clear which of these rules are needed under NO_PERL=Y. See 20d2a30f8ff (Makefile: replace perl/Makefile.PL with simple make rules, 2017-12-10) for the initial implementation. We do for better or worse rely on "install-doc" calling "install-man-perl" regardless of whether NO_PERL=Y is defined or not, i.e. we'll always end up with that manual page, even if we don't have any of the Perl code installed. Let's add a comment about that adjacent to the rules that build perl/build. Signed-off-by: Ævar Arnfjörð Bjarmason --- Makefile | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index b21ffe25c2a..d4c31a2718f 100644 --- a/Makefile +++ b/Makefile @@ -2731,19 +2731,12 @@ endif po/build/locale/%/LC_MESSAGES/git.mo: po/%.po $(QUIET_MSGFMT)mkdir -p $(dir $@) && $(MSGFMT) -o $@ $< +ifndef NO_PERL LIB_PERL := $(wildcard perl/Git.pm perl/Git/*.pm perl/Git/*/*.pm perl/Git/*/*/*.pm) LIB_PERL_GEN := $(patsubst perl/%.pm,perl/build/lib/%.pm,$(LIB_PERL)) LIB_CPAN := $(wildcard perl/FromCPAN/*.pm perl/FromCPAN/*/*.pm) LIB_CPAN_GEN := $(patsubst perl/%.pm,perl/build/lib/%.pm,$(LIB_CPAN)) -ifndef NO_PERL -all:: $(LIB_PERL_GEN) -ifndef NO_PERL_CPAN_FALLBACKS -all:: $(LIB_CPAN_GEN) -endif -NO_PERL_CPAN_FALLBACKS_SQ = $(subst ','\'',$(NO_PERL_CPAN_FALLBACKS)) -endif - perl/build/lib/%.pm: perl/%.pm GIT-PERL-DEFINES $(QUIET_GEN)mkdir -p $(dir $@) && \ sed -e 's|@@LOCALEDIR@@|$(perl_localedir_SQ)|g' \ @@ -2751,6 +2744,14 @@ perl/build/lib/%.pm: perl/%.pm GIT-PERL-DEFINES -e 's|@@NO_PERL_CPAN_FALLBACKS@@|$(NO_PERL_CPAN_FALLBACKS_SQ)|g' \ < $< > $@ +all:: $(LIB_PERL_GEN) +ifndef NO_PERL_CPAN_FALLBACKS +all:: $(LIB_CPAN_GEN) +endif +NO_PERL_CPAN_FALLBACKS_SQ = $(subst ','\'',$(NO_PERL_CPAN_FALLBACKS)) +endif + +# install-man depends on Git.3pm even with NO_PERL=Y perl/build/man/man3/Git.3pm: perl/Git.pm $(QUIET_GEN)mkdir -p $(dir $@) && \ pod2man $< $@ From patchwork Fri Dec 17 00:26:19 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= X-Patchwork-Id: 12683155 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id A4C04C433F5 for ; Fri, 17 Dec 2021 00:26:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230319AbhLQA0i (ORCPT ); Thu, 16 Dec 2021 19:26:38 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42294 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230300AbhLQA0f (ORCPT ); Thu, 16 Dec 2021 19:26:35 -0500 Received: from mail-wr1-x436.google.com (mail-wr1-x436.google.com [IPv6:2a00:1450:4864:20::436]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 82E4BC061574 for ; Thu, 16 Dec 2021 16:26:35 -0800 (PST) Received: by mail-wr1-x436.google.com with SMTP id c4so933588wrd.9 for ; Thu, 16 Dec 2021 16:26:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Ql3TtL5TZqGq4T4/ynaf1dyBXi4n/xbD4efcilH4oUQ=; b=bXqHWJPq+OgB82K6kBnAOgB1Y6IWLGxCubn7fZlasDyMbRcswsMk1juaO4ixS3zXTv XA91LrF0dboPJ1GxUsl0Zl14M3kuxTEL4c5vkgnp8/4odFWlOcxFY5/Lo+TwNoeOTMpj 5R6379HhmXg2d85QXrtJSIp2kcgOORWsQ5PDocj9k1EPQ6ucNaspE5J9U6wmBKtkWVsB /aVb68toj7RL3UFMz6WuC2BWpSQDWluDiQ4QEofsYtjhGk0fXHv9BCcmCf6qpp/cvCiF J/Vi0kjYs6bq23RDS9uJqRpvxrqmlXr5fI+aO1BNqWKJO3XHoMGiOOJQDVWOB5oO0XtJ 2+dw== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=Ql3TtL5TZqGq4T4/ynaf1dyBXi4n/xbD4efcilH4oUQ=; b=p6P+Y5Vx2DPuPJkH6qhj+E/BygxZQOd8yMReB+Be/ME3oVbwdGEbrLGFT+EjHc+mym P1Os+NVKGKEEBWOdwvd6HJT/jWz3IF051VSDoHLcRzJ5AEXh8i3J/6wioDwVn5Uv6cMO 9M5ednYOkYtQK56YUf7QPovKsPlRtSrc76o5pAANGEElKe+cKhA+W74p2pBdq8fCH70o 6zSdRZMocwgzeWhQm2nfmNIQI9qITPOIieCgWFm8RcSPHGK0ExCjws4aj4F2BW3byAyM CqjMJepXEyNFHm1SMK85lKiSdiqZZ8RMgM7DhXWaQ14PZIfB+wtP8MgnMRB2/wCdgvLA 2QJQ== X-Gm-Message-State: AOAM532NLKxfanN3JqFP0KEYJWtu3tVXQj37dr7+DYYZSXfX/ZBp+QRt NXceNUV/jqchGccYSDxZYNs0L1odXwETFA== X-Google-Smtp-Source: ABdhPJwDc/2WtXJOXH6XPNrQ6rq2n7zyHoYE43LrsseGqndrUKaA9Gkc6jj1wx7NObghz7jWhI6uWA== X-Received: by 2002:a5d:69ca:: with SMTP id s10mr364745wrw.218.1639700793860; Thu, 16 Dec 2021 16:26:33 -0800 (PST) Received: from vm.nix.is (vm.nix.is. [2a01:4f8:120:2468::2]) by smtp.gmail.com with ESMTPSA id j17sm8127349wmq.41.2021.12.16.16.26.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Dec 2021 16:26:33 -0800 (PST) From: =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= To: git@vger.kernel.org Cc: Junio C Hamano , Phillip Wood , Jeff King , Dan Jacques , Eric Wong , Jonathan Nieder , Mike Hommey , =?utf-8?b?xJBvw6BuIFRy4bqnbiBDw7RuZyBEYW5o?= , Victoria Dye , =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFz?= =?utf-8?b?b24=?= Subject: [PATCH 03/11] Makefile: use "=" not ":=" for po/* and perl/* Date: Fri, 17 Dec 2021 01:26:19 +0100 Message-Id: X-Mailer: git-send-email 2.34.1.1119.g7a3fc8778ee In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Change these variable definitions from being simply-expanded to be recursively expanded instead. I.e. they'll be lazily expanded when used. I added these in 5e9637c6297 (i18n: add infrastructure for translating Git with gettext, 2011-11-18) and 20d2a30f8ff (Makefile: replace perl/Makefile.PL with simple make rules, 2017-12-10), the reason for using ":=" over "=" was that I didn't know the difference in 2011 (I think I copied some POC code), and in 2017 I used the 2011 commit for reference. This doesn't make much if any of a practical difference, doing this is cheap either way, but as simply-expanded variables in our Makefile generally indicate special behavior (e.g. making a copy now, and modifying the RHS later) let's change these to show that nothing odd is going on here). Signed-off-by: Ævar Arnfjörð Bjarmason --- Makefile | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index d4c31a2718f..cad9795ec0a 100644 --- a/Makefile +++ b/Makefile @@ -2719,11 +2719,11 @@ po/git.pot: $(GENERATED_H) FORCE pot: po/git.pot ifdef NO_GETTEXT -POFILES := -MOFILES := +POFILES = +MOFILES = else -POFILES := $(wildcard po/*.po) -MOFILES := $(patsubst po/%.po,po/build/locale/%/LC_MESSAGES/git.mo,$(POFILES)) +POFILES = $(wildcard po/*.po) +MOFILES = $(patsubst po/%.po,po/build/locale/%/LC_MESSAGES/git.mo,$(POFILES)) all:: $(MOFILES) endif @@ -2732,10 +2732,10 @@ po/build/locale/%/LC_MESSAGES/git.mo: po/%.po $(QUIET_MSGFMT)mkdir -p $(dir $@) && $(MSGFMT) -o $@ $< ifndef NO_PERL -LIB_PERL := $(wildcard perl/Git.pm perl/Git/*.pm perl/Git/*/*.pm perl/Git/*/*/*.pm) -LIB_PERL_GEN := $(patsubst perl/%.pm,perl/build/lib/%.pm,$(LIB_PERL)) -LIB_CPAN := $(wildcard perl/FromCPAN/*.pm perl/FromCPAN/*/*.pm) -LIB_CPAN_GEN := $(patsubst perl/%.pm,perl/build/lib/%.pm,$(LIB_CPAN)) +LIB_PERL = $(wildcard perl/Git.pm perl/Git/*.pm perl/Git/*/*.pm perl/Git/*/*/*.pm) +LIB_PERL_GEN = $(patsubst perl/%.pm,perl/build/lib/%.pm,$(LIB_PERL)) +LIB_CPAN = $(wildcard perl/FromCPAN/*.pm perl/FromCPAN/*/*.pm) +LIB_CPAN_GEN = $(patsubst perl/%.pm,perl/build/lib/%.pm,$(LIB_CPAN)) perl/build/lib/%.pm: perl/%.pm GIT-PERL-DEFINES $(QUIET_GEN)mkdir -p $(dir $@) && \ From patchwork Fri Dec 17 00:26:20 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= X-Patchwork-Id: 12683157 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id E21DFC433FE for ; Fri, 17 Dec 2021 00:26:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230333AbhLQA0j (ORCPT ); Thu, 16 Dec 2021 19:26:39 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42302 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230308AbhLQA0h (ORCPT ); Thu, 16 Dec 2021 19:26:37 -0500 Received: from mail-wr1-x430.google.com (mail-wr1-x430.google.com [IPv6:2a00:1450:4864:20::430]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BD5E1C061574 for ; Thu, 16 Dec 2021 16:26:36 -0800 (PST) Received: by mail-wr1-x430.google.com with SMTP id j9so1059021wrc.0 for ; Thu, 16 Dec 2021 16:26:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=RP7Bd3gweCXiNlsCOAZqw/XcH4BcUlQKC7EwcuM8BpU=; b=Nb1tr1hebAkwZY2wvk1+5/LOSahwSMYEqUbSC8aptWIYgr3os6sfCKAUKLPl5M2ntH ntUIDfmPYotHF9j6CyJKW1nhbv0N+498kdNuv1o/u0ZE9ZzhYmZdgpxvS6SK7vNK1tgz e4E/li0JfQjBYiNMXS9sg7oyqyHtmiwpzdh6pEOYoEAvKhZicM3A0n7lJR8oemZGWa62 6lRULFH8+ASa6PHbcml8gn8zzSRwmGnWiSe56y3WJciLDp4q6CZzn0S7Kj4e2laDA3fa l8B2Wv8K10FE1e1EEztOkEn+HUQoxJd3fR7uYjPU+3EdW+FcIIpffdbU6w1nEopXrhOS VrBQ== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=RP7Bd3gweCXiNlsCOAZqw/XcH4BcUlQKC7EwcuM8BpU=; b=CnS79j3uGA9lGFca8MuwRrD34E/GiypX0+gQHTYulZtxvbr051MC0y7/gr7l56zykc 7SHlzaWv8dP+ubBbn06RRkiKAaiArcMVB8DsuNRmRWDN22ASCFgUHCVbKPXn9ep9hhws UKdKeiFu0en5EmF0BNBDmQJPbkLPbjwONhx1VqiKHhiRRj4jxuD6GLoCzrNlYMR9Kb6A PvHArrQCxfGOcEVEi5Jwno6y/Ijo0gJ9DUi129/buEREBbwJowI2ydEYaFVMVnuDokpa +ni2GIbkbcEzfdXeqvXWHk44Ld145z4eAUAvm9BTxosCXyhLLdGjcIBQF5b5Kyn7P24s qH8Q== X-Gm-Message-State: AOAM533oXvtB+/SYcyxe64oQnsv7IWz/m12xuXcqJKLNWlxKxRdy+BZp JmasU7tFSeqBOkDxIb79zV/nhyKs4wDEpg== X-Google-Smtp-Source: ABdhPJwUr+XaIEs7UBjMNvoiKrODvGnVlVew/stLTicPLSzXy2kNUSR18yXdfZLlCsWAUj+PKI9X/Q== X-Received: by 2002:a5d:5984:: with SMTP id n4mr334000wri.458.1639700794853; Thu, 16 Dec 2021 16:26:34 -0800 (PST) Received: from vm.nix.is (vm.nix.is. [2a01:4f8:120:2468::2]) by smtp.gmail.com with ESMTPSA id j17sm8127349wmq.41.2021.12.16.16.26.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Dec 2021 16:26:34 -0800 (PST) From: =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= To: git@vger.kernel.org Cc: Junio C Hamano , Phillip Wood , Jeff King , Dan Jacques , Eric Wong , Jonathan Nieder , Mike Hommey , =?utf-8?b?xJBvw6BuIFRy4bqnbiBDw7RuZyBEYW5o?= , Victoria Dye , =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFz?= =?utf-8?b?b24=?= Subject: [PATCH 04/11] Makefile: remove "mv $@ $@+" dance redundant to .DELETE_ON_ERROR Date: Fri, 17 Dec 2021 01:26:20 +0100 Message-Id: X-Mailer: git-send-email 2.34.1.1119.g7a3fc8778ee In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Since 7b76d6bf221 (Makefile: add and use the ".DELETE_ON_ERROR" flag, 2021-06-29) we don't need to guard the clobbering of $@ with this sort of "mv $@+ $@" pattern in these cases where we're merely generating a file that'll be used as a dependency for other files, as in this case for GIT-PERL-HEADER. We have had a hard dependency on .DELETE_ON_ERROR since 7b76d6bf221 (Makefile: add and use the ".DELETE_ON_ERROR" flag, 2021-06-29), so this is a pure cleanup as a follow-up to that commit. Support for the ".DELETE_ON_ERROR" target itself is much older than any GNU make version we support, it was added to GNU make in 1994. Signed-off-by: Ævar Arnfjörð Bjarmason --- Makefile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Makefile b/Makefile index cad9795ec0a..bd8cb7c463d 100644 --- a/Makefile +++ b/Makefile @@ -2359,8 +2359,7 @@ GIT-PERL-HEADER: $(PERL_HEADER_TEMPLATE) GIT-PERL-DEFINES Makefile -e 's=@@PERLLIBDIR_REL@@=$(perllibdir_relative_SQ)=g' \ -e 's=@@GITEXECDIR_REL@@=$(gitexecdir_relative_SQ)=g' \ -e 's=@@LOCALEDIR_REL@@=$(localedir_relative_SQ)=g' \ - $< >$@+ && \ - mv $@+ $@ + $< >$@ .PHONY: perllibdir perllibdir: From patchwork Fri Dec 17 00:26:21 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= X-Patchwork-Id: 12683159 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id AD505C433F5 for ; Fri, 17 Dec 2021 00:26:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230338AbhLQA0k (ORCPT ); Thu, 16 Dec 2021 19:26:40 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42314 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230314AbhLQA0i (ORCPT ); Thu, 16 Dec 2021 19:26:38 -0500 Received: from mail-wr1-x429.google.com (mail-wr1-x429.google.com [IPv6:2a00:1450:4864:20::429]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7661DC06173E for ; Thu, 16 Dec 2021 16:26:37 -0800 (PST) Received: by mail-wr1-x429.google.com with SMTP id v11so916451wrw.10 for ; Thu, 16 Dec 2021 16:26:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=avqXGg2kUTd2CJj613icMPUhtOEL60OJ1xRjeOIj7PI=; b=Pf3mIYw+lrs/b95TOzriY8XU3FPEZyHA2DLfZ5qm5XAWBC96jhk+m4kt7YdlNEdKJD XwBS92HvsoLzvR3d5vqEj4bfslCNq96cFOLnNWl7URiyXED58KHX1zX5ulCpbNvCrlxq ldivZDgak6iYjHoxU7fVnHmvmwKHdqUyUvzz4yZudWqhx8i2B9iIpROYx643HHEoITsC 3sIyx6G8qjlSjmusZLhhH3VF5AF3W32tmZSfOD4L0nrXaCnZu87uLalPrVEON+seeqoM Ig9qexCzpg0p4m728ZAAo3ZpWXpFyaH1pNKj8FBMygtRxKxaO0M6Zc7daBzRpz1g+FtI I/og== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=avqXGg2kUTd2CJj613icMPUhtOEL60OJ1xRjeOIj7PI=; b=0Ai0xP2izVbYMIdy0Y9M360ez1fZQkZvdhQgHsedLqR8Iw5HMJyJaheeHrCZ+tF59K e45wOYeHAHOXSVUq0AF1to+zVd3Yj2BNtlrKzIBWSHTlg5+JSQC2eRcvaDqxH6F3oGWe MGsfDI42nui/iFIeqMY4xhBw2D954Bi+QmRA560O/EYExkUCRz6389cVXz3WjGLSosaB 3/AlEjlF2K63rcsQd0UEE+wxp/H5TEjHkWJLlVGRDizpg+1DkxgtRYfzzETUG+3UgdJo HYJbZcFPlhbXFrm9bwHECzj3BHzQC7PVemp9N+ZBbmA8GuQTWskBw33lH5o7K2Nh1YRB ZfNA== X-Gm-Message-State: AOAM531S7HISbPqR3He7OrKlp6yzqOrx+k6tm/4dqLBRVuuMVCdUQTLN ecReLFb003zBGAaCpY9wpasAgoGhj8S9Wg== X-Google-Smtp-Source: ABdhPJxA4H+TXoJ9o/tO3St1QykikQJWLLA4gAT6G8whSAWPD2YMbbjnfJ8yNVPs5Aot3RbhqbwdbQ== X-Received: by 2002:a05:6000:144d:: with SMTP id v13mr302062wrx.393.1639700795816; Thu, 16 Dec 2021 16:26:35 -0800 (PST) Received: from vm.nix.is (vm.nix.is. [2a01:4f8:120:2468::2]) by smtp.gmail.com with ESMTPSA id j17sm8127349wmq.41.2021.12.16.16.26.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Dec 2021 16:26:35 -0800 (PST) From: =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= To: git@vger.kernel.org Cc: Junio C Hamano , Phillip Wood , Jeff King , Dan Jacques , Eric Wong , Jonathan Nieder , Mike Hommey , =?utf-8?b?xJBvw6BuIFRy4bqnbiBDw7RuZyBEYW5o?= , Victoria Dye , =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFz?= =?utf-8?b?b24=?= Subject: [PATCH 05/11] Makefile: guard Perl-only variable assignments Date: Fri, 17 Dec 2021 01:26:21 +0100 Message-Id: X-Mailer: git-send-email 2.34.1.1119.g7a3fc8778ee In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Move the "ifndef NO_PERL" a few lines earlier to encompass the "perl_localedir_SQ" variable. We'll only use it under !NO_PERL. Signed-off-by: Ævar Arnfjörð Bjarmason --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index bd8cb7c463d..780f222face 100644 --- a/Makefile +++ b/Makefile @@ -2301,11 +2301,11 @@ git.res: git.rc GIT-VERSION-FILE GIT-PREFIX # This makes sure we depend on the NO_PERL setting itself. $(SCRIPT_PERL_GEN): GIT-BUILD-OPTIONS +ifndef NO_PERL # Used for substitution in Perl modules. Disabled when using RUNTIME_PREFIX # since the locale directory is injected. perl_localedir_SQ = $(localedir_SQ) -ifndef NO_PERL PERL_HEADER_TEMPLATE = perl/header_templates/fixed_prefix.template.pl PERL_DEFINES = PERL_DEFINES += $(PERL_PATH_SQ) From patchwork Fri Dec 17 00:26:22 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= X-Patchwork-Id: 12683161 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4F041C433EF for ; Fri, 17 Dec 2021 00:26:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230340AbhLQA0k (ORCPT ); Thu, 16 Dec 2021 19:26:40 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42316 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230300AbhLQA0j (ORCPT ); Thu, 16 Dec 2021 19:26:39 -0500 Received: from mail-wr1-x436.google.com (mail-wr1-x436.google.com [IPv6:2a00:1450:4864:20::436]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4E2C4C06173F for ; Thu, 16 Dec 2021 16:26:38 -0800 (PST) Received: by mail-wr1-x436.google.com with SMTP id j18so993492wrd.2 for ; Thu, 16 Dec 2021 16:26:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=g4W5R5JEYJvYjWALoaXmaOm0pyfxrhI+5IquyE5fH5w=; b=jXgYbY5DWJOHtVhspBjTU2+AQhUtUIyLtqap8Np9WCm6fhDD9w6UiMstnjXjLM/i3B v/pVkU+Uc6InKViGlo5xxO4b0DSESpEjSgPDp4CjKD1hjNpQuOngYXx1qC5EYdIzmCiA ovy1KpNIX+8MPTvNbWM5iXdKqZh8f6MrOE+8mzcuuj+QiGvoHmRxekJ+iZuDtlYgchCA 2i/djBp4V3OJEJva4A3G16Gh5YsXtt3CVJJBVgYYALxOxXCmKFAIPpiyqKPXzExVynrV jQ3gXJ5euWc+Zx306Lo3g0/rui6AtfhuFqJsvOb+2rh6UN3k2CjVRI6ogVfS0YU8lTx9 EfVA== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=g4W5R5JEYJvYjWALoaXmaOm0pyfxrhI+5IquyE5fH5w=; b=mghCxxaAp+9tfOx+KM0FsWuNRG7tTkDx7zXRPHfaF+ZaV37pIAxg4kpoq+vyHL/l+3 vmwgGaSfkxXRO4IkzJ0qotVg+OQhur2vgw0Sd0h7yi6I+kIo/N3OeU1H6LeiDOyqgL+J Qm6s1A/S6Om+6nL4lIzla+wHIyX0XcN7TPDpCPR+pq0Cmq5E0j8/Knsa+3VnGDVbFnbJ NiPDPspavNCxg9R6vidfC/KavUJZpkKe+Sr5hbKIBCUN3hXq8bCiwZ0qv86VhkMmhm8C DhjfeJRTSG3YI6E2uRFJGQBMoaa7T/cBRHCVuyxOqQJkX6Vz8ZgTrLig2Q3hmxmEbuIi dVnQ== X-Gm-Message-State: AOAM532fFznABO8DEX9pCDEzVeP5zVMQNs8M04lL9SuLvjwsiL4wR5pG +sgl4001qJFIUq4Sl5pkP0EgqXfO8TOqlA== X-Google-Smtp-Source: ABdhPJy/DedXbunwTrxeMrR7/6tr8D58kv0V8i6qzAw3ZjeTHnBi4vY4emOlBQm23hhHhmmnWcY8Cw== X-Received: by 2002:a05:6000:2a4:: with SMTP id l4mr371155wry.238.1639700796712; Thu, 16 Dec 2021 16:26:36 -0800 (PST) Received: from vm.nix.is (vm.nix.is. [2a01:4f8:120:2468::2]) by smtp.gmail.com with ESMTPSA id j17sm8127349wmq.41.2021.12.16.16.26.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Dec 2021 16:26:36 -0800 (PST) From: =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= To: git@vger.kernel.org Cc: Junio C Hamano , Phillip Wood , Jeff King , Dan Jacques , Eric Wong , Jonathan Nieder , Mike Hommey , =?utf-8?b?xJBvw6BuIFRy4bqnbiBDw7RuZyBEYW5o?= , Victoria Dye , =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFz?= =?utf-8?b?b24=?= Subject: [PATCH 06/11] Makefile: change "ifndef NO_PERL" to "ifdef NO_PERL" Date: Fri, 17 Dec 2021 01:26:22 +0100 Message-Id: X-Mailer: git-send-email 2.34.1.1119.g7a3fc8778ee In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Change the NO_PERL variable assignments so that they declare the much smaller fallback condition first. Signed-off-by: Ævar Arnfjörð Bjarmason --- Makefile | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/Makefile b/Makefile index 780f222face..4bb2da36e4e 100644 --- a/Makefile +++ b/Makefile @@ -2301,7 +2301,15 @@ git.res: git.rc GIT-VERSION-FILE GIT-PREFIX # This makes sure we depend on the NO_PERL setting itself. $(SCRIPT_PERL_GEN): GIT-BUILD-OPTIONS -ifndef NO_PERL +ifdef NO_PERL +$(SCRIPT_PERL_GEN) git-instaweb: % : unimplemented.sh + $(QUIET_GEN) \ + sed -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' \ + -e 's|@@REASON@@|NO_PERL=$(NO_PERL)|g' \ + unimplemented.sh >$@+ && \ + chmod +x $@+ && \ + mv $@+ $@ +else # NO_PERL # Used for substitution in Perl modules. Disabled when using RUNTIME_PREFIX # since the locale directory is injected. perl_localedir_SQ = $(localedir_SQ) @@ -2373,14 +2381,6 @@ git-instaweb: git-instaweb.sh GIT-SCRIPT-DEFINES $(QUIET_GEN)$(cmd_munge_script) && \ chmod +x $@+ && \ mv $@+ $@ -else # NO_PERL -$(SCRIPT_PERL_GEN) git-instaweb: % : unimplemented.sh - $(QUIET_GEN) \ - sed -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' \ - -e 's|@@REASON@@|NO_PERL=$(NO_PERL)|g' \ - unimplemented.sh >$@+ && \ - chmod +x $@+ && \ - mv $@+ $@ endif # NO_PERL # This makes sure we depend on the NO_PYTHON setting itself. From patchwork Fri Dec 17 00:26:23 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= X-Patchwork-Id: 12683163 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6463AC433FE for ; Fri, 17 Dec 2021 00:26:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230347AbhLQA0l (ORCPT ); Thu, 16 Dec 2021 19:26:41 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42320 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230308AbhLQA0j (ORCPT ); Thu, 16 Dec 2021 19:26:39 -0500 Received: from mail-wr1-x433.google.com (mail-wr1-x433.google.com [IPv6:2a00:1450:4864:20::433]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 440DAC061574 for ; Thu, 16 Dec 2021 16:26:39 -0800 (PST) Received: by mail-wr1-x433.google.com with SMTP id q16so952613wrg.7 for ; Thu, 16 Dec 2021 16:26:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=14TeSsPSwK6WnWQ0jefPEVSxtywt7qvtv19j4Dyuw5c=; b=K49XfGCYdHiveBtRSmwNSeVN1fqmnagapLxd6bb+JgZMfgeBX6P7gTAibAl2P4QiGe p22YRf23hTsoQbiv6PqJcIc+DtZcYiB1wLlM5CjRrISrfYqzd0auWsU3/ach53+ImDmZ eMlR0pfwfBTlr35T/mqnBH2q5NqyKMkHz5P0dgwRrMUP0WLlX5mLGjOL7pdo5xBqgLll hIENg0ktJ2rGA/3+tqiSpbE4jl9y0VRvUpuRTFCs1b2GfTEt8DImdx0FAqbJQh7pAP/4 St5TYoy78vGX0o/P0DHp6FBiU1GtKE0yP+4aSEQJ2vrnF5bUzOAa8eqa54Y975PCYilj Op/A== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=14TeSsPSwK6WnWQ0jefPEVSxtywt7qvtv19j4Dyuw5c=; b=dyHlqPoOgZmV68z5EHaVJodptc717h8nO5doJ/eAvL+C38qj0Ovu6bdJbT9q+bLHig FigH2JB0TsGGqZITKqoeme5Yz1bQTk4IUCBASEw1dVzy7/DRyhlezpVLrErOsAGyFgNm hAZj1/8Rm4YPfY1nv3lfpoHBf0iA+z4Yu19KyDxa5peBc1CTY48n7NSJ9w97z3hWhI6q F53QQhZ00w20Wsy3B+746j0sgFLN7WhqSPJUIwHfa8rPdV7CN7QbiMRjqOJWobODVinQ TWrfFlI2pacbX204fTdxtxMh932Q/jKrydxtjGhqeZVfgwjYIB+UXAbDugQXUzJLKeWD im4g== X-Gm-Message-State: AOAM533cFXdfeSZjtXqCCrczaELiZJOnScTPKcQYQhxCRnDl7EpLWe14 BAtpewJTb1efBVw/pyd/TYDUEeqxYLUPfw== X-Google-Smtp-Source: ABdhPJxdgF/NRkuZnb2NLDA+WkeGsSUS7i3uaFMO7Xj0GCfQFIZ6Z3dMeUlc96qfBZIYxyYxQAigVw== X-Received: by 2002:a5d:4bcf:: with SMTP id l15mr359739wrt.618.1639700797549; Thu, 16 Dec 2021 16:26:37 -0800 (PST) Received: from vm.nix.is (vm.nix.is. [2a01:4f8:120:2468::2]) by smtp.gmail.com with ESMTPSA id j17sm8127349wmq.41.2021.12.16.16.26.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Dec 2021 16:26:37 -0800 (PST) From: =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= To: git@vger.kernel.org Cc: Junio C Hamano , Phillip Wood , Jeff King , Dan Jacques , Eric Wong , Jonathan Nieder , Mike Hommey , =?utf-8?b?xJBvw6BuIFRy4bqnbiBDw7RuZyBEYW5o?= , Victoria Dye , =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFz?= =?utf-8?b?b24=?= Subject: [PATCH 07/11] Makefile: adjust Perl-related comments & whitespace Date: Fri, 17 Dec 2021 01:26:23 +0100 Message-Id: X-Mailer: git-send-email 2.34.1.1119.g7a3fc8778ee In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Folllow-up my 4070c9e09fc (Makefile: don't re-define PERL_DEFINES, 2021-05-05) and move the rest of the assignments to PERL_DEFINES to one place. Signed-off-by: Ævar Arnfjörð Bjarmason --- Makefile | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/Makefile b/Makefile index 4bb2da36e4e..d488a723b79 100644 --- a/Makefile +++ b/Makefile @@ -2322,21 +2322,19 @@ PERL_DEFINES += $(perllibdir_SQ) PERL_DEFINES += $(RUNTIME_PREFIX) PERL_DEFINES += $(NO_PERL_CPAN_FALLBACKS) PERL_DEFINES += $(NO_GETTEXT) +PERL_DEFINES += $(gitexecdir) +PERL_DEFINES += $(perllibdir) +PERL_DEFINES += $(localedir) +PERL_DEFINES := $(subst $(space),:,$(PERL_DEFINES)) -# Support Perl runtime prefix. In this mode, a different header is installed -# into Perl scripts. ifdef RUNTIME_PREFIX - PERL_HEADER_TEMPLATE = perl/header_templates/runtime_prefix.template.pl -# Don't export a fixed $(localedir) path; it will be resolved by the Perl header -# at runtime. +# The RUNTIME_PREFIX header defines $Git::I18N::TEXTDOMAINDIR, so +# $(perl_localedir_SQ) won't be needed perl_localedir_SQ = - endif -PERL_DEFINES += $(gitexecdir) $(perllibdir) $(localedir) - $(SCRIPT_PERL_GEN): % : %.perl GIT-PERL-DEFINES GIT-PERL-HEADER GIT-VERSION-FILE $(QUIET_GEN) \ sed -e '1{' \ @@ -2349,7 +2347,6 @@ $(SCRIPT_PERL_GEN): % : %.perl GIT-PERL-DEFINES GIT-PERL-HEADER GIT-VERSION-FILE chmod +x $@+ && \ mv $@+ $@ -PERL_DEFINES := $(subst $(space),:,$(PERL_DEFINES)) GIT-PERL-DEFINES: FORCE @FLAGS='$(PERL_DEFINES)'; \ if test x"$$FLAGS" != x"`cat $@ 2>/dev/null`" ; then \ From patchwork Fri Dec 17 00:26:24 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= X-Patchwork-Id: 12683167 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0504CC433F5 for ; Fri, 17 Dec 2021 00:26:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230389AbhLQA0w (ORCPT ); Thu, 16 Dec 2021 19:26:52 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42326 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230331AbhLQA0k (ORCPT ); Thu, 16 Dec 2021 19:26:40 -0500 Received: from mail-wr1-x42e.google.com (mail-wr1-x42e.google.com [IPv6:2a00:1450:4864:20::42e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 320ABC061574 for ; Thu, 16 Dec 2021 16:26:40 -0800 (PST) Received: by mail-wr1-x42e.google.com with SMTP id t18so911985wrg.11 for ; Thu, 16 Dec 2021 16:26:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=mkYabZUO08gmVllEEG8bS/4Tznfr1f0AQB2TY5mwQxc=; b=KDOCZwipxP3xYOet0SPq1pBrNEVgqequcixXsIwkWcbJndad49hX3wKB0pVjmLoDwl Waj0Z3j4ABnouU9+AHv+jaeVXB8hZFrNuAqVcaiyGoYAgjuJdh86V/qwU5hC2Hv+8+gp b81zZNnduOEgOD3uv06FT/YXxHRFRvHP9Ih6B7UllSXONmf/uRT+gYJFwwxfTVk7gdga 5Gt+B2gzOIZKKSFtikW9EhtUbGn5Z4t61I/t8cp/fz3yhPRfVymJmRkcKChzlFnqgPE0 GYuaVJWqlMbvHjjauINQspXDkGTK+hOF5rALoiNM55UhDawNesywNmpljF5EJBck4Vsh Jpmg== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=mkYabZUO08gmVllEEG8bS/4Tznfr1f0AQB2TY5mwQxc=; b=My2Zwy9rLZpquncShjIxgVVf8liVTbbDVlZtR5rp6ZztVyPk709wT1RPlpomJFir9i hlQtzWGFxywN9n5AwUTViLnTYwlPWt0dQyckaAT+OHT6k+DG+IeICd3tIc1/kZUM6DP+ YQHkza6WgPQ+gLycVNfq6y6sQ8Bgcp2p+kToK83aJqPStaiQR1X7MYDhtD+uCwh7n9J8 udRvRdK1D80OsoFK8AnzcjlAjZNVRwC8Lb5GjBZCPC54WOSQS1k08TxB0S25hUuayBep gp46Y/LiDAITdpDF1HtNXrG/LW0Xl/qngiEYb1O27zp0MEZRDrj6E96Rz7xI2yGKDOnG b4lw== X-Gm-Message-State: AOAM531hQZkMa/XX/kFMzLLUpi3yaE8JAza4+yYlReywhNziAO4ZMVhG BUraJ5Wu2O/bEJUUlT8hwTn9hYIr9/+l7g== X-Google-Smtp-Source: ABdhPJw5usOn3iFOXpGn6tEoWqLKfyuSGDICo30gC2qH+SMRxUSPwkGBPs3ruxl4aOUg8U5ViZx2oA== X-Received: by 2002:a05:6000:2ac:: with SMTP id l12mr324316wry.441.1639700798523; Thu, 16 Dec 2021 16:26:38 -0800 (PST) Received: from vm.nix.is (vm.nix.is. [2a01:4f8:120:2468::2]) by smtp.gmail.com with ESMTPSA id j17sm8127349wmq.41.2021.12.16.16.26.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Dec 2021 16:26:37 -0800 (PST) From: =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= To: git@vger.kernel.org Cc: Junio C Hamano , Phillip Wood , Jeff King , Dan Jacques , Eric Wong , Jonathan Nieder , Mike Hommey , =?utf-8?b?xJBvw6BuIFRy4bqnbiBDw7RuZyBEYW5o?= , Victoria Dye , =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFz?= =?utf-8?b?b24=?= Subject: [PATCH 08/11] Makefile: correct "GIT-PERL-{DEFINES,HEADER}" dependency graph Date: Fri, 17 Dec 2021 01:26:24 +0100 Message-Id: X-Mailer: git-send-email 2.34.1.1119.g7a3fc8778ee In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Fix several small issues with the dependency graph of the generated "GIT-PERL-DEFINES" and "GIT-PERL-HEADER" files: 1. Don't have "GIT-PERL-HEADER" depend on the "Makefile". That was a lazy way to over-declare the dependencies added in f6a0ad4be71 (Makefile: generate Perl header from template file, 2018-04-10). Let's correct our dependency graph instead. 2. Don't have $(SCRIPT_PERL_GEN) (such as "git-send-email") depend on GIT-BUILD-OPTIONS. Let's instead use GIT-PERL-DEFINES. The reason for depending on "GIT-BUILD-OPTIONS" was to trigger a re-build if NO_PERL=Y was defined. We can instead add that variable to "PERL_DEFINES", and have "GIT-PERL-DEFINES" created and updated if "NO_PERL=Y" is defined. 3. Due to #2 we'll need to have GIT-PERL-DEFINES be generated even under NO_PERL, since that variable will be used by the "unimplemented.sh" script. 4. Don't depend on $(gitexecdir), $(perllibdir) and $(localedir), instead depend on the $(*_relative_SQ) versions of those. The latter is what we'll actually use, while it's unlikely to matter in practice (we'd just skip re-building these under RUNTIME_PREFIX if the relative path was the same) it makes the code easier to read. That's because this brings us to a 1=1 mapping of these variables and what's subsequently used in the "GIT-PERL-DEFINES", "GIT-PERL-HEADER" and "perl/build/lib/%.pm" rules below. 5. We don't need the substitution of " " for ":" added in 07d90eadb50 (Makefile: add Perl runtime prefix support, 2018-04-10), let's drop it. This doesn't matter for the correctness of these files, because unlike GIT-BUILD-OPTIONS nothing is consuming them except the Makefile itself. Signed-off-by: Ævar Arnfjörð Bjarmason --- Makefile | 42 +++++++++++++++++++++++++----------------- 1 file changed, 25 insertions(+), 17 deletions(-) diff --git a/Makefile b/Makefile index d488a723b79..356c98dff45 100644 --- a/Makefile +++ b/Makefile @@ -2298,10 +2298,14 @@ git.res: git.rc GIT-VERSION-FILE GIT-PREFIX $(shell echo $(GIT_VERSION) 0 0 0 0 | tr '.a-zA-Z-' ' '))) \ -DGIT_VERSION="\\\"$(GIT_VERSION)\\\"" -i $< -o $@ -# This makes sure we depend on the NO_PERL setting itself. -$(SCRIPT_PERL_GEN): GIT-BUILD-OPTIONS +# Under NO_PERL=Y we'll still make GIT-PERL-DEFINES. We need to depend +# on NO_PERL=Y itself for creating "unimplemented.sh" scripts. +PERL_DEFINES = +$(SCRIPT_PERL_GEN): GIT-PERL-DEFINES ifdef NO_PERL +PERL_DEFINES += $(NO_PERL) + $(SCRIPT_PERL_GEN) git-instaweb: % : unimplemented.sh $(QUIET_GEN) \ sed -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' \ @@ -2310,22 +2314,26 @@ $(SCRIPT_PERL_GEN) git-instaweb: % : unimplemented.sh chmod +x $@+ && \ mv $@+ $@ else # NO_PERL -# Used for substitution in Perl modules. Disabled when using RUNTIME_PREFIX -# since the locale directory is injected. +# The localedir is only used in Perl modules if !NO_GETTEXT +ifndef NO_GETTEXT perl_localedir_SQ = $(localedir_SQ) +endif PERL_HEADER_TEMPLATE = perl/header_templates/fixed_prefix.template.pl -PERL_DEFINES = + PERL_DEFINES += $(PERL_PATH_SQ) PERL_DEFINES += $(PERLLIB_EXTRA_SQ) PERL_DEFINES += $(perllibdir_SQ) PERL_DEFINES += $(RUNTIME_PREFIX) PERL_DEFINES += $(NO_PERL_CPAN_FALLBACKS) PERL_DEFINES += $(NO_GETTEXT) -PERL_DEFINES += $(gitexecdir) -PERL_DEFINES += $(perllibdir) -PERL_DEFINES += $(localedir) -PERL_DEFINES := $(subst $(space),:,$(PERL_DEFINES)) +ifdef RUNTIME_PREFIX +PERL_DEFINES += $(gitexecdir_relative_SQ) +PERL_DEFINES += $(perllibdir_relative_SQ) +PERL_DEFINES += $(localedir_relative_SQ) +else +PERL_DEFINES += $(perllocaledir_SQ) +endif ifdef RUNTIME_PREFIX PERL_HEADER_TEMPLATE = perl/header_templates/runtime_prefix.template.pl @@ -2347,14 +2355,7 @@ $(SCRIPT_PERL_GEN): % : %.perl GIT-PERL-DEFINES GIT-PERL-HEADER GIT-VERSION-FILE chmod +x $@+ && \ mv $@+ $@ -GIT-PERL-DEFINES: FORCE - @FLAGS='$(PERL_DEFINES)'; \ - if test x"$$FLAGS" != x"`cat $@ 2>/dev/null`" ; then \ - echo >&2 " * new perl-specific parameters"; \ - echo "$$FLAGS" >$@; \ - fi - -GIT-PERL-HEADER: $(PERL_HEADER_TEMPLATE) GIT-PERL-DEFINES Makefile +GIT-PERL-HEADER: $(PERL_HEADER_TEMPLATE) GIT-PERL-DEFINES $(QUIET_GEN) \ INSTLIBDIR='$(perllibdir_SQ)' && \ INSTLIBDIR_EXTRA='$(PERLLIB_EXTRA_SQ)' && \ @@ -2380,6 +2381,13 @@ git-instaweb: git-instaweb.sh GIT-SCRIPT-DEFINES mv $@+ $@ endif # NO_PERL +GIT-PERL-DEFINES: FORCE + @FLAGS='$(PERL_DEFINES)'; \ + if test x"$$FLAGS" != x"`cat $@ 2>/dev/null`" ; then \ + echo >&2 " * new perl-specific parameters"; \ + echo "$$FLAGS" >$@; \ + fi + # This makes sure we depend on the NO_PYTHON setting itself. $(SCRIPT_PYTHON_GEN): GIT-BUILD-OPTIONS From patchwork Fri Dec 17 00:26:25 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= X-Patchwork-Id: 12683165 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5B03AC4332F for ; Fri, 17 Dec 2021 00:26:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230300AbhLQA0x (ORCPT ); Thu, 16 Dec 2021 19:26:53 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42340 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230348AbhLQA0m (ORCPT ); Thu, 16 Dec 2021 19:26:42 -0500 Received: from mail-wr1-x42f.google.com (mail-wr1-x42f.google.com [IPv6:2a00:1450:4864:20::42f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CB832C061574 for ; Thu, 16 Dec 2021 16:26:41 -0800 (PST) Received: by mail-wr1-x42f.google.com with SMTP id t18so912051wrg.11 for ; Thu, 16 Dec 2021 16:26:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=EzrG+96l2LPWTg8/TsoXxU5IWjS8QhJcy8AFixPPgIw=; b=jZDQtUOcCwMcmey5QlhXnZQtMRWGl/kiedSK1Cp9LGXX7cWCSuiQ8pkczuDLCZqNur Q35uigD0pNZkq5OXHA9HZb/YTni7ot1NvNOJBSVxwnB3Ps6fEwjIQA2LqOa8UJ+qXXrK Fmm+Wz/Eu3NM1P4wwSUu2s8Lu0qENeEgmUnSbTZQ73orLGJxkKuSZVXJwhBfqV8hxDlf J3jW/Jg3QXgaqHY9zi4glPttoPuF/WfY8m5yd8ASChNSyMWbp7LqEzBUXB4q7Q1iOmIN I/9dVCinl928DeiJ0+yG33rvA7gfd23cxA8BfEKZFfy7FRKrLxK6ECS/0Z6tf7YynVtF VHmA== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=EzrG+96l2LPWTg8/TsoXxU5IWjS8QhJcy8AFixPPgIw=; b=5P0NF7lGQDhSFw3zJUrH7MjTZMHZmtb21Af/gTfCNAT7TVQ3MU67LQzYpG/CAA5hUI cVFQx2O/XKObX4EYAI/z/aRxKfWgjOHoV9jUcPVjviVLSMDl2hD+CzyUGH4dwzHpIbdi BHJXxL3u4aQUSaYcnFlB8CjjMnHQ1nMWOCC4guiE18rlUBrQtgDqoELw0g1dKvhAQeF8 +zr+t9ysWU4zsUOSK4eXy1NmKJBaq9VYsotk15wtuDnOFLEi1n4LRacGQ9yylXOdhhsm SuiamT1aqTHx7jpVa6KqxkZKP5nBx6NULTYRAgw0Eb30iOqU32JFVQlUxzfD+Q1WnPul JtjQ== X-Gm-Message-State: AOAM5326SiIQmN6LBhf5+d2KY03RkDHSlPtYs+B4OD3OPLES3OuqrA3O O8dXtQTH8Yg+b7fCkLyH1LrDEvJVlO+01w== X-Google-Smtp-Source: ABdhPJyHr54vlPc0poaMYB3ooGLDpGNk/7mB0kK6MLClJjhN7ZnHEI48/GqZyM8DOy7pbZnn27H5qg== X-Received: by 2002:a5d:6d06:: with SMTP id e6mr371614wrq.28.1639700800223; Thu, 16 Dec 2021 16:26:40 -0800 (PST) Received: from vm.nix.is (vm.nix.is. [2a01:4f8:120:2468::2]) by smtp.gmail.com with ESMTPSA id j17sm8127349wmq.41.2021.12.16.16.26.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Dec 2021 16:26:39 -0800 (PST) From: =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= To: git@vger.kernel.org Cc: Junio C Hamano , Phillip Wood , Jeff King , Dan Jacques , Eric Wong , Jonathan Nieder , Mike Hommey , =?utf-8?b?xJBvw6BuIFRy4bqnbiBDw7RuZyBEYW5o?= , Victoria Dye , =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFz?= =?utf-8?b?b24=?= Subject: [PATCH 09/11] Makefile: sort PERL_DEFINES list Date: Fri, 17 Dec 2021 01:26:25 +0100 Message-Id: X-Mailer: git-send-email 2.34.1.1119.g7a3fc8778ee In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Sort the PERL_DEFINES list, this will make it easier to maintain it in the future. Signed-off-by: Ævar Arnfjörð Bjarmason --- Makefile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 356c98dff45..3be3dc9621d 100644 --- a/Makefile +++ b/Makefile @@ -2321,16 +2321,16 @@ endif PERL_HEADER_TEMPLATE = perl/header_templates/fixed_prefix.template.pl -PERL_DEFINES += $(PERL_PATH_SQ) +PERL_DEFINES += $(NO_GETTEXT) +PERL_DEFINES += $(NO_PERL_CPAN_FALLBACKS) PERL_DEFINES += $(PERLLIB_EXTRA_SQ) -PERL_DEFINES += $(perllibdir_SQ) +PERL_DEFINES += $(PERL_PATH_SQ) PERL_DEFINES += $(RUNTIME_PREFIX) -PERL_DEFINES += $(NO_PERL_CPAN_FALLBACKS) -PERL_DEFINES += $(NO_GETTEXT) +PERL_DEFINES += $(perllibdir_SQ) ifdef RUNTIME_PREFIX PERL_DEFINES += $(gitexecdir_relative_SQ) -PERL_DEFINES += $(perllibdir_relative_SQ) PERL_DEFINES += $(localedir_relative_SQ) +PERL_DEFINES += $(perllibdir_relative_SQ) else PERL_DEFINES += $(perllocaledir_SQ) endif From patchwork Fri Dec 17 00:26:26 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= X-Patchwork-Id: 12683169 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7D42AC433EF for ; Fri, 17 Dec 2021 00:27:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230348AbhLQA04 (ORCPT ); Thu, 16 Dec 2021 19:26:56 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42346 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230351AbhLQA0n (ORCPT ); Thu, 16 Dec 2021 19:26:43 -0500 Received: from mail-wm1-x331.google.com (mail-wm1-x331.google.com [IPv6:2a00:1450:4864:20::331]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D0E2EC061574 for ; Thu, 16 Dec 2021 16:26:42 -0800 (PST) Received: by mail-wm1-x331.google.com with SMTP id b73so561925wmd.0 for ; Thu, 16 Dec 2021 16:26:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Hg4v54dxA7kun56V9Ck1S+zqBse/AcXdAYygUxZlavY=; b=IlK7M+ftXLlDzwJBtw+IhgH+yGLFgmKIgB/Q5pSB4GvvfZ7J8EGD6fx4HSquy1bWuU bxHyMoJYH0yoTyIA8zy3QteMaHzjqqrVZsJCb8ICg2DduYSfoYDKTfBa/Yzyle3lwwgY vkuWjrvl2TMryD75ekMhz7S+4hhDsnljlYhqHogdNud8qnxNRCA/VU4loe91bFIM64w2 baRoTeaKNEtndSuYdFbAKxzGFaeqU59Kua0/PhzqEl7fdvw4LgNk3ZYyiTC/rQNHU2xg i6Z0XlbPMuq8nGgczvWeN9zxiXPiC5q8dP6wgVk3pHEliJ2W5MxeV5FAedFN6cJkEGL+ tDSQ== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=Hg4v54dxA7kun56V9Ck1S+zqBse/AcXdAYygUxZlavY=; b=PWVrrfVIN2oxZdEwGE3GEmSgnaAkzbpmpRKM92mpQx33BjF+O1hJOWHhBwYz9Vdb8J s5RbPJOWJfSid329PEl/YSeDrZk9EIu9JwQQV2xKejNUKoyFWfj/9JcdEVkHW0OSAeQq SEY1Pggvye+5Oq+QJPVqXUeLVKjKCm69y/39AFmn+vAblIr2W4gEICP+eCeup2s3JmRE WghOFlsFigaVAC1Y7Vk11lo88G8V5Y3o746EK9E2WzraQr+5IpyW++zB+NgX5xsqQ6Eb Sn53rjz22PIY9p/8GYgKtOmYAvPvBSXVYZU9S+mJXDQpPvrC6airrqc3sJpoAYf+1Rh6 rcqQ== X-Gm-Message-State: AOAM5332Vvc+gdivNKdqkEa6IX3CJ3uc5pyo7Wlj1hknqOt/f4zuVvdI kIZ76gAyy7m59ZyEavxPasgJO+LqhrBuCA== X-Google-Smtp-Source: ABdhPJyO6QeKyCkYz7fgrUQvHxaeqBQ/26Ig3iSa/PU7aalsCI3PWGB95bZFBZrPuFu/uO5GTS+EMg== X-Received: by 2002:a05:600c:34d2:: with SMTP id d18mr286720wmq.146.1639700801169; Thu, 16 Dec 2021 16:26:41 -0800 (PST) Received: from vm.nix.is (vm.nix.is. [2a01:4f8:120:2468::2]) by smtp.gmail.com with ESMTPSA id j17sm8127349wmq.41.2021.12.16.16.26.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Dec 2021 16:26:40 -0800 (PST) From: =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= To: git@vger.kernel.org Cc: Junio C Hamano , Phillip Wood , Jeff King , Dan Jacques , Eric Wong , Jonathan Nieder , Mike Hommey , =?utf-8?b?xJBvw6BuIFRy4bqnbiBDw7RuZyBEYW5o?= , Victoria Dye , =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFz?= =?utf-8?b?b24=?= Subject: [PATCH 10/11] Makefile: create a GIT-PYTHON-DEFINES, like "PERL" Date: Fri, 17 Dec 2021 01:26:26 +0100 Message-Id: X-Mailer: git-send-email 2.34.1.1119.g7a3fc8778ee In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Create a new "GIT-PYTHON-DEFINES" file, and untangle the dependency issues of the Python by copying over the patterns established for building the adjacent Perl code in preceding commits. As with Perl, there's no real reason to depend on GIT-BUILD-OPTIONS or GIT-CFLAGS when building the Python code, nor did we need GIT-PREFIX. Let's instead add those variables we care about to a "GIT-PYTHON-DEFINES" and depend on that. This changes code originally added in ca3bcabf118 (auto-detect changed prefix and/or changed build flags, 2006-06-15), and adjusted in 96a4647fca5 (Makefile: detect when PYTHON_PATH changes, 2012-12-18). The relevant code for the "Perl" targets was then added in 07981dce81e (Makefile: rebuild perl scripts when perl paths change, 2013-11-18), and has been adjusted in preceding commits. Signed-off-by: Ævar Arnfjörð Bjarmason --- .gitignore | 2 +- Makefile | 49 +++++++++++++++++++++++++------------------------ 2 files changed, 26 insertions(+), 25 deletions(-) diff --git a/.gitignore b/.gitignore index 054249b20a8..845e5d0c355 100644 --- a/.gitignore +++ b/.gitignore @@ -8,7 +8,7 @@ /GIT-PREFIX /GIT-PERL-DEFINES /GIT-PERL-HEADER -/GIT-PYTHON-VARS +/GIT-PYTHON-DEFINES /GIT-SCRIPT-DEFINES /GIT-USER-AGENT /GIT-VERSION-FILE diff --git a/Makefile b/Makefile index 3be3dc9621d..f2cee13ea5d 100644 --- a/Makefile +++ b/Makefile @@ -2388,18 +2388,15 @@ GIT-PERL-DEFINES: FORCE echo "$$FLAGS" >$@; \ fi -# This makes sure we depend on the NO_PYTHON setting itself. -$(SCRIPT_PYTHON_GEN): GIT-BUILD-OPTIONS +# As with NO_PERL=Y we'll still make GIT-PYTHON-DEFINES if "NO_PYTHON" +# is defined, for creating the "unimplemented.sh" scripts. +PYTHON_DEFINES = +$(SCRIPT_PYTHON_GEN): GIT-PYTHON-DEFINES + +ifdef NO_PYTHON +PYTHON_DEFINES += $(SHELL_PATH_SQ) +PYTHON_DEFINES += $(NO_PYTHON) -ifndef NO_PYTHON -$(SCRIPT_PYTHON_GEN): GIT-CFLAGS GIT-PREFIX GIT-PYTHON-VARS -$(SCRIPT_PYTHON_GEN): % : %.py - $(QUIET_GEN) \ - sed -e '1s|#!.*python|#!$(PYTHON_PATH_SQ)|' \ - $< >$@+ && \ - chmod +x $@+ && \ - mv $@+ $@ -else # NO_PYTHON $(SCRIPT_PYTHON_GEN): % : unimplemented.sh $(QUIET_GEN) \ sed -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' \ @@ -2407,8 +2404,24 @@ $(SCRIPT_PYTHON_GEN): % : unimplemented.sh unimplemented.sh >$@+ && \ chmod +x $@+ && \ mv $@+ $@ +else # NO_PYTHON +PYTHON_DEFINES += $(PYTHON_PATH_SQ) + +$(SCRIPT_PYTHON_GEN): % : %.py GIT-PYTHON-DEFINES + $(QUIET_GEN) \ + sed -e '1s|#!.*python|#!$(PYTHON_PATH_SQ)|' \ + $< >$@+ && \ + chmod +x $@+ && \ + mv $@+ $@ endif # NO_PYTHON +GIT-PYTHON-DEFINES: FORCE + @FLAGS='$(PYTHON_DEFINES)'; \ + if test x"$$FLAGS" != x"`cat $@ 2>/dev/null`" ; then \ + echo >&2 " * new python-specific parameters"; \ + echo "$$FLAGS" >$@; \ + fi + CONFIGURE_RECIPE = sed -e 's/@@GIT_VERSION@@/$(GIT_VERSION)/g' \ configure.ac >configure.ac+ && \ autoconf -o configure configure.ac+ && \ @@ -2895,18 +2908,6 @@ else endif @if cmp $@+ $@ >/dev/null 2>&1; then $(RM) $@+; else mv $@+ $@; fi -### Detect Python interpreter path changes -ifndef NO_PYTHON -TRACK_PYTHON = $(subst ','\'',-DPYTHON_PATH='$(PYTHON_PATH_SQ)') - -GIT-PYTHON-VARS: FORCE - @VARS='$(TRACK_PYTHON)'; \ - if test x"$$VARS" != x"`cat $@ 2>/dev/null`" ; then \ - echo >&2 " * new Python interpreter location"; \ - echo "$$VARS" >$@; \ - fi -endif - test_bindir_programs := $(patsubst %,bin-wrappers/%,$(BINDIR_PROGRAMS_NEED_X) $(BINDIR_PROGRAMS_NO_X) $(TEST_PROGRAMS_NEED_X)) all:: $(TEST_PROGRAMS) $(test_bindir_programs) @@ -3303,7 +3304,7 @@ ifndef NO_TCLTK endif $(RM) GIT-VERSION-FILE GIT-CFLAGS GIT-LDFLAGS GIT-BUILD-OPTIONS $(RM) GIT-USER-AGENT GIT-PREFIX - $(RM) GIT-SCRIPT-DEFINES GIT-PERL-DEFINES GIT-PERL-HEADER GIT-PYTHON-VARS + $(RM) GIT-SCRIPT-DEFINES GIT-PERL-DEFINES GIT-PERL-HEADER GIT-PYTHON-DEFINES ifdef MSVC $(RM) $(patsubst %.o,%.o.pdb,$(OBJECTS)) $(RM) $(patsubst %.exe,%.pdb,$(OTHER_PROGRAMS)) From patchwork Fri Dec 17 00:26:27 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= X-Patchwork-Id: 12683171 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 91EA6C433FE for ; Fri, 17 Dec 2021 00:27:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230350AbhLQA1B (ORCPT ); Thu, 16 Dec 2021 19:27:01 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42352 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230357AbhLQA0o (ORCPT ); Thu, 16 Dec 2021 19:26:44 -0500 Received: from mail-wm1-x335.google.com (mail-wm1-x335.google.com [IPv6:2a00:1450:4864:20::335]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E0103C061574 for ; Thu, 16 Dec 2021 16:26:43 -0800 (PST) Received: by mail-wm1-x335.google.com with SMTP id b73so561953wmd.0 for ; Thu, 16 Dec 2021 16:26:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=vJYs2SDrQRyIpTzu7QVknpbO0e0Qwn+2Z4z2dPvaVeQ=; b=BwJ3yZ8GdGUjeiH0GJF6phui6Xwk8KEZvhH5+2DJbPejoFXFk+vl90NhgxvbJ3y9Mi BSt9JDKaSUQxF4ItWxRHmG02EmiTT/uYVeOHtKw6NWHzFqhhjFYTGHalCQ/3KnoKL4Rs lQPsQBUH18h4+ZKsWo7C0CXr1X/NrGK30I6zZKKlmuf3cYdip8iG37pCUsdZXGipLX9/ T1JVqQPWSfwUarih6mMvBNECt2PPTixloZP24cAOedI8X+wR8Dzz0DYKaGT/gl3yc9ux 7qF1mXhl9sggs+sjYJMH5j+A2shagWYhMbni0qfj3jn4k/+ASxc2yB2cjx/W+ez5P6Rw LnEQ== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=vJYs2SDrQRyIpTzu7QVknpbO0e0Qwn+2Z4z2dPvaVeQ=; b=Sw5+0bNFGHNH6+BQM+0SSgXareFjtmuVxbzb5vDoiJPpjp5Pm2owskj3EXOJHsLZqr BztdovfLgjVD/KAJd4EoR7O0NX+MPN3lsb/5dkMyRLPbpamWuwWZ644oT4BsyiPdps8y Q+Oksa5RACx+7CCYa5g+3azcHTY2qS8+nqDnGBzlqraCETmdXswaJHJI0vPBaDqDoLjE fk6xoL4qp6O3v71wKSMRTMXbgwhCs7qjsth2LFbt+tsfUss1KkXJMhqaahOx8OIWja+2 m60BN1cY0z3DFPRhlNZxOAcZ9uVReh4OYeZMNHCG4BseJKQV8TvxO86WvL3pfZiqkE+7 w3MQ== X-Gm-Message-State: AOAM5325m/ekCF/WfqWs/zLp7UKAHZDKnBMYlYJFkwsw0JUAtKRonPxX yl+uDuT4z1OWx9Ijd2LRfEOwlbpEga1Ltw== X-Google-Smtp-Source: ABdhPJy6oImUrWR1JqWBtz0JiFoIS81m2bjvTZEIPVeQLcG26D0XrIUHigESHJ1aKeOkqhNQJ3TOOQ== X-Received: by 2002:a1c:4e17:: with SMTP id g23mr7502281wmh.158.1639700802208; Thu, 16 Dec 2021 16:26:42 -0800 (PST) Received: from vm.nix.is (vm.nix.is. [2a01:4f8:120:2468::2]) by smtp.gmail.com with ESMTPSA id j17sm8127349wmq.41.2021.12.16.16.26.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Dec 2021 16:26:41 -0800 (PST) From: =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= To: git@vger.kernel.org Cc: Junio C Hamano , Phillip Wood , Jeff King , Dan Jacques , Eric Wong , Jonathan Nieder , Mike Hommey , =?utf-8?b?xJBvw6BuIFRy4bqnbiBDw7RuZyBEYW5o?= , Victoria Dye , =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFz?= =?utf-8?b?b24=?= Subject: [PATCH 11/11] Makefile: stop needing @@GIT_VERSION@@ in *.perl scripts Date: Fri, 17 Dec 2021 01:26:27 +0100 Message-Id: X-Mailer: git-send-email 2.34.1.1119.g7a3fc8778ee In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Change the hardcoding of @@GIT_VERSION@@ in generated *.perl scripts to instead shell out to "git version". This means that we can stop re-building during development every time the HEAD changes. These codepaths are not "hot", so shelling out to get the version shouldn't matter to users, in the one case where it potentially would in send-email (the loop for each E-Mail we send) we now cache the value, so we'll only retrieve it once. Signed-off-by: Ævar Arnfjörð Bjarmason --- Makefile | 2 +- git-cvsserver.perl | 6 +++--- git-send-email.perl | 7 ++----- git-svn.perl | 2 +- 4 files changed, 7 insertions(+), 10 deletions(-) diff --git a/Makefile b/Makefile index f2cee13ea5d..9ccfb1109f5 100644 --- a/Makefile +++ b/Makefile @@ -2343,7 +2343,7 @@ PERL_HEADER_TEMPLATE = perl/header_templates/runtime_prefix.template.pl perl_localedir_SQ = endif -$(SCRIPT_PERL_GEN): % : %.perl GIT-PERL-DEFINES GIT-PERL-HEADER GIT-VERSION-FILE +$(SCRIPT_PERL_GEN): % : %.perl GIT-PERL-DEFINES GIT-PERL-HEADER $(QUIET_GEN) \ sed -e '1{' \ -e ' s|#!.*perl|#!$(PERL_PATH_SQ)|' \ diff --git a/git-cvsserver.perl b/git-cvsserver.perl index 4c8118010a8..4ec0cc1cc3c 100755 --- a/git-cvsserver.perl +++ b/git-cvsserver.perl @@ -26,8 +26,6 @@ use File::Basename; use Getopt::Long qw(:config require_order no_ignore_case); -my $VERSION = '@@GIT_VERSION@@'; - my $log = GITCVS::log->new(); my $cfg; @@ -126,7 +124,9 @@ or die $usage; if ($state->{version}) { - print "git-cvsserver version $VERSION\n"; + my $version = qx[git version]; + $version =~ s/^(git)\b/$1-cvsserver/; + print $version; exit; } if ($state->{help}) { diff --git a/git-send-email.perl b/git-send-email.perl index 04087221aa7..390e8512627 100755 --- a/git-send-email.perl +++ b/git-send-email.perl @@ -1504,6 +1504,7 @@ sub file_name_is_absolute { # # If an error occurs sending the email, this just dies. +my $gitversion; sub send_message { my @recipients = unique_email_list(@to); @cc = (grep { my $cc = extract_valid_address_or_die($_); @@ -1514,11 +1515,6 @@ sub send_message { @recipients = unique_email_list(@recipients,@cc,@initial_bcc); @recipients = (map { extract_valid_address_or_die($_) } @recipients); my $date = format_2822_time($time++); - my $gitversion = '@@GIT_VERSION@@'; - if ($gitversion =~ m/..GIT_VERSION../) { - $gitversion = Git::version(); - } - my $cc = join(",\n\t", unique_email_list(@cc)); my $ccline = ""; if ($cc ne '') { @@ -1533,6 +1529,7 @@ sub send_message { Message-Id: $message_id "; if ($use_xmailer) { + $gitversion ||= Git::version(); $header .= "X-Mailer: git-send-email $gitversion\n"; } if ($in_reply_to) { diff --git a/git-svn.perl b/git-svn.perl index be987e316f9..727431412be 100755 --- a/git-svn.perl +++ b/git-svn.perl @@ -9,7 +9,6 @@ $_revision $_repository $_q $_authors $_authors_prog %users/; $AUTHOR = 'Eric Wong '; -$VERSION = '@@GIT_VERSION@@'; use Carp qw/croak/; use File::Basename qw/dirname basename/; @@ -47,6 +46,7 @@ command_close_bidi_pipe get_record ); +$VERSION = Git::version(); BEGIN { Memoize::memoize 'Git::config';