From patchwork Mon May 10 10:50: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: 12247653 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E3813C43470 for ; Mon, 10 May 2021 11:20:20 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id C457261041 for ; Mon, 10 May 2021 11:20:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233159AbhEJLMv (ORCPT ); Mon, 10 May 2021 07:12:51 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44010 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232797AbhEJK6W (ORCPT ); Mon, 10 May 2021 06:58:22 -0400 Received: from mail-ed1-x533.google.com (mail-ed1-x533.google.com [IPv6:2a00:1450:4864:20::533]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3D16EC035433 for ; Mon, 10 May 2021 03:50:30 -0700 (PDT) Received: by mail-ed1-x533.google.com with SMTP id c22so18148473edn.7 for ; Mon, 10 May 2021 03:50:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=U1URNNKmMjwn47oZp8HI/A6GyRvPCwpjgQQ+F2Tud8I=; b=gzloYD6gXKjaaitJvkkyWPW1XAHpZE2E6fST43ZFSFtiFj2NnqilggEci4lkBuhuzv jojrpDaEXs5bAtKovRDmR+EWVulVKiHjqeuJaECBRSLIxoXQQ9QPt4cNTPG+xD+03mam Epva8ait4bM+wF09QwL7c3g44UkBrrlrPkDLsjF6hrqloChfygDl0tMPtRznnS+nFhWD hqdIEupIqQYY5VtCGHW+yqqHXU+Uo7vVLS5XESm/G6zUwr/h6Iyd3xy+gSIbzB8I3g6B pOtAFyrUvyp9uwwtLFuieAhRbR6JTDqY0U6Zj1XvALyvZLWdoPmF8NxCcPGBtHWrVZca 7A8A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=U1URNNKmMjwn47oZp8HI/A6GyRvPCwpjgQQ+F2Tud8I=; b=DaKbTvXZMCV3C/RTN6Ka7gwtkOxUpPUnH+P77RN9ZhXKfXOwT8MV5g8hOoG4vjt26D habB1pVORnjRRWQPdVTGUk1iluImKvjZD/re0Rg86SsGEpnL9C1pG/g6E6Y+VYQZYXTX ISQfI3x4oo3iVEztvOFRv4ys+7zG4wRH9vOYIR8reuPYSfdz/3MIZkUgDRm1lrCetiji PtxYM3QMRLPWptOk5iBhwW//6pz/mGqkq0St0bn1FtSVjvOYcZ4u1qWu79e+euSS+VZj SucLgpYK/VLs+Pi1xKabRbeW25ISsjBkiRXWYquNGdj9arQH4eMgBRPZiOD5J5iSQitx l0Kw== X-Gm-Message-State: AOAM5316qjGKo1zdJT8CNyIQlNSn9pfDTtFhWzl0jXJ5DbalMc1buqlm uFg9BtSYH4JVNpJRahi8yoVPqbvZLizKOQ== X-Google-Smtp-Source: ABdhPJykgxYQIEJTsolWe5HS1SpWtWM7ScwJLAZPBxryMLq6iQXI23/u3RWLUWbx5Nk6+sVt+lLUqQ== X-Received: by 2002:a50:bec7:: with SMTP id e7mr29319409edk.295.1620643828761; Mon, 10 May 2021 03:50:28 -0700 (PDT) Received: from vm.nix.is (vm.nix.is. [2a01:4f8:120:2468::2]) by smtp.gmail.com with ESMTPSA id o13sm9050741ejx.86.2021.05.10.03.50.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 May 2021 03:50:28 -0700 (PDT) From: =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= To: git@vger.kernel.org Cc: Junio C Hamano , Jeff King , =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= Subject: [PATCH v2 1/6] Makefile: regenerate perl/build/* if GIT-PERL-DEFINES changes Date: Mon, 10 May 2021 12:50:17 +0200 Message-Id: X-Mailer: git-send-email 2.31.1.838.g924d365b763 In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Change the logic to generate perl/build/* to regenerate those files if GIT-PERL-DEFINES changes. This ensures that e.g. changing localedir will result in correctly re-generated files. I don't think that ever worked. The brokenness pre-dates my 20d2a30f8ff (Makefile: replace perl/Makefile.PL with simple make rules, 2017-12-10). Signed-off-by: Ævar Arnfjörð Bjarmason --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 93664d67146..ad618cea33f 100644 --- a/Makefile +++ b/Makefile @@ -2675,7 +2675,7 @@ endif NO_PERL_CPAN_FALLBACKS_SQ = $(subst ','\'',$(NO_PERL_CPAN_FALLBACKS)) endif -perl/build/lib/%.pm: perl/%.pm +perl/build/lib/%.pm: perl/%.pm GIT-PERL-DEFINES $(QUIET_GEN)mkdir -p $(dir $@) && \ sed -e 's|@@LOCALEDIR@@|$(perl_localedir_SQ)|g' \ -e 's|@@NO_PERL_CPAN_FALLBACKS@@|$(NO_PERL_CPAN_FALLBACKS_SQ)|g' \ From patchwork Mon May 10 10:50: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: 12247655 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6DEE9C43617 for ; Mon, 10 May 2021 11:20:21 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 451FD61042 for ; Mon, 10 May 2021 11:20:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234441AbhEJLM5 (ORCPT ); Mon, 10 May 2021 07:12:57 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44024 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232995AbhEJK6c (ORCPT ); Mon, 10 May 2021 06:58:32 -0400 Received: from mail-ed1-x534.google.com (mail-ed1-x534.google.com [IPv6:2a00:1450:4864:20::534]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id ECEF6C03543B for ; Mon, 10 May 2021 03:50:30 -0700 (PDT) Received: by mail-ed1-x534.google.com with SMTP id l7so18176792edb.1 for ; Mon, 10 May 2021 03:50:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=xS2d+NE5AU1cto3G/J1HpkIFcCjfHklhZ6SZowtmOD0=; b=Z1ih33d1kFOkmU9ZkLttiXEFCYxyUv+LOxMSmzaa2gdNq3aSKaV/xtXyWS/jouOGGW 1adrqef7v+LQHyt1LoAd1xvXf8h6FDpbiiy62JreFZZvsJQOxQOznS0DY9ro3tCQEMSw gtxNVpo00XONTbX/Mlesgx7qav/5GAzlKQVaNLmyhuMckiaJqHSPFtvqkQ+bmgM+ycIb 4BXjGumCFWJEr+h8Bh/FzS3ldPtZsQPyhh4Kc+k+7NuTpL4odhRtaUZMV+AS3ffKYdxO ejVp0SPMLK/RP3s3ZghleJiQQnGqlEj6Vn/RvAmPURKe7VWwBY6F7mhpZNWwlAjunGdb FAPQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=xS2d+NE5AU1cto3G/J1HpkIFcCjfHklhZ6SZowtmOD0=; b=jx0yy1qBEPRh0HHwsS2IyzDPMpKmpaCs/RFfghfmx8lE25SYXJMHncyfFHWOdboL/y RzlCTwFsDK4Hvtj/fNvr7TCFRC+o5TG+YGmwKxZf9Yy2FqYAIiUnBqAizz97dUTCpmtQ 1ad9iX+FgHnKBc+XQ67HQuPoYO8TyX4GmcqnRhkZVB3ApRtUJQBXmui9Pk2d6FiaDV/T AbsqLJOA5zgQHWZngpmHQwi7/3yQuynJklmCoeXqHyAkDjvUM4rpzBfXSFfV0v/U8LTP ZzgE4lFbkCxT/5/nLTC9QpHdEdUSHcBVcOMdRQbQPHnDOAMwQJ2y5CBVB0w2MYQ5JTem VSwg== X-Gm-Message-State: AOAM530lA5q+HLtYlxFXKVEpdQ1aWAULD/BvUfQGoldxYkXWf6PItR6v Mpca4ZXCFHbtrgykj9Kptgd0Pz0crc1RVg== X-Google-Smtp-Source: ABdhPJzm+DSUWfANCL6DYWjtZZJSBKPIYIw0YME9QlTG975a9lcrb3GEvhZsdLMI2xH5qLXhbyMrtw== X-Received: by 2002:a50:fe03:: with SMTP id f3mr28597479edt.92.1620643829478; Mon, 10 May 2021 03:50:29 -0700 (PDT) Received: from vm.nix.is (vm.nix.is. [2a01:4f8:120:2468::2]) by smtp.gmail.com with ESMTPSA id o13sm9050741ejx.86.2021.05.10.03.50.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 May 2021 03:50:28 -0700 (PDT) From: =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= To: git@vger.kernel.org Cc: Junio C Hamano , Jeff King , =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= Subject: [PATCH v2 2/6] Makefile: don't re-define PERL_DEFINES Date: Mon, 10 May 2021 12:50:18 +0200 Message-Id: X-Mailer: git-send-email 2.31.1.838.g924d365b763 In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Since 07d90eadb50 (Makefile: add Perl runtime prefix support, 2018-04-10) we have been declaring PERL_DEFINES right after assigning to it, with the effect that the first PERL_DEFINES was ignored. This didn't matter in practice since the first line had all the same variables as the second, so we'd correctly re-generate everything. It just made for confusing reading. Let's remove that first assignment. Signed-off-by: Ævar Arnfjörð Bjarmason --- Makefile | 2 -- 1 file changed, 2 deletions(-) diff --git a/Makefile b/Makefile index ad618cea33f..ea387b431e1 100644 --- a/Makefile +++ b/Makefile @@ -2270,8 +2270,6 @@ perl_localedir_SQ = $(localedir_SQ) ifndef NO_PERL PERL_HEADER_TEMPLATE = perl/header_templates/fixed_prefix.template.pl -PERL_DEFINES = $(PERL_PATH_SQ):$(PERLLIB_EXTRA_SQ):$(perllibdir_SQ) - PERL_DEFINES := $(PERL_PATH_SQ) $(PERLLIB_EXTRA_SQ) $(perllibdir_SQ) PERL_DEFINES += $(RUNTIME_PREFIX) From patchwork Mon May 10 10:50: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: 12247665 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id F2DD1C4363E for ; Mon, 10 May 2021 11:20:21 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id DB83E61041 for ; Mon, 10 May 2021 11:20:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234740AbhEJLNF (ORCPT ); Mon, 10 May 2021 07:13:05 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44114 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233079AbhEJK6j (ORCPT ); Mon, 10 May 2021 06:58:39 -0400 Received: from mail-ej1-x636.google.com (mail-ej1-x636.google.com [IPv6:2a00:1450:4864:20::636]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B9D40C03543D for ; Mon, 10 May 2021 03:50:31 -0700 (PDT) Received: by mail-ej1-x636.google.com with SMTP id w3so23820858ejc.4 for ; Mon, 10 May 2021 03:50:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=mZ/ClbzV9H8RKqOFFPH4iNkzX01/7hGGAxTOov1k7dc=; b=Ty/WBWr8KbCGu+P674ZDfNO2Cc6kXdlQl1SXn14Du/Qpn3dQ/M1LR4qDThbCvi5BAN G8yPp7UPNZp2JHIjkom34ZwEi7zU4A/2JHXHf4UhMQtm8ORmlUcc49faVNx6svqY/XSO ldljWLuE8rgm804j7rCXx244U6CTajm+bIcDTtQp6hkZdK2ppIhYoxXZotBow47mvk5d xWkgs4KzNNz5mHjBe+8GgeYV/pfORKPNXLAftjjxlOdpJb9cs+gU2I6l5J+ZXMd9NMKQ p5M93V8t68NTFqr04NkF2Jbdn9ibtU6dZwOwwR26HTWbE0mRtfeAvpeRKUaFNRnudfD+ Yxfg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=mZ/ClbzV9H8RKqOFFPH4iNkzX01/7hGGAxTOov1k7dc=; b=OzCFamur/Z5vzUCsSFVattn1h+e0ekdaiNluD83Gr/F2Q4WHgGoo9l/Sqse4bm/QLq 7QQhgW2Vj05EjpobP5r52CpJYcz2rKiAIxjDw6X666SclqJAjMriNGlhlJ4hA0Gq1m7X YB17G2W57bM7ZE3GphU7xUo40YDwbX6H7dioDgDBACu6QNi3DCqvISxRllDDJ3FCT8kE tmG26wvMYbqNM1e6ax5y5rb1Z64LgZdqlduYfZG52KU9LNsgIyyNfP3R66LJy9dp/sGm Bdw1goBAzMvXZAQAaTCUegMzq2UIv6p+s5iAzX6fprRU78EdpRND93qfxWhkDavoc7Mn oeVw== X-Gm-Message-State: AOAM5308Virr9Yi0vTiWL1LiKF10Junvs6qSj+Xloozh8v9MwJSN0j// gkBQti+E5fOXn1SSDiJlgeOqg3IytLwfrw== X-Google-Smtp-Source: ABdhPJx2rPLyuyS8Acst1sugww1g6K3n9krAEl9RbWgwT4zVsvtl3oV34ub57Lf51INiWJNObThZnw== X-Received: by 2002:a17:907:765b:: with SMTP id kj27mr24940225ejc.537.1620643830234; Mon, 10 May 2021 03:50:30 -0700 (PDT) Received: from vm.nix.is (vm.nix.is. [2a01:4f8:120:2468::2]) by smtp.gmail.com with ESMTPSA id o13sm9050741ejx.86.2021.05.10.03.50.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 May 2021 03:50:29 -0700 (PDT) From: =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= To: git@vger.kernel.org Cc: Junio C Hamano , Jeff King , =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= Subject: [PATCH v2 3/6] Makefile: make PERL_DEFINES recursively expanded Date: Mon, 10 May 2021 12:50:19 +0200 Message-Id: X-Mailer: git-send-email 2.31.1.838.g924d365b763 In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Since 07d90eadb50 (Makefile: add Perl runtime prefix support, 2018-04-10) PERL_DEFINES has been a simply-expanded variable, let's make it recursively expanded instead. This change doesn't matter for the correctness of the logic. Whether we used simply-expanded or recursively expanded didn't change what we wrote out in GIT-PERL-DEFINES, but being consistent with other rules makes this easier to understand. Signed-off-by: Ævar Arnfjörð Bjarmason --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index ea387b431e1..3ed6828de67 100644 --- a/Makefile +++ b/Makefile @@ -2270,7 +2270,7 @@ perl_localedir_SQ = $(localedir_SQ) ifndef NO_PERL PERL_HEADER_TEMPLATE = perl/header_templates/fixed_prefix.template.pl -PERL_DEFINES := $(PERL_PATH_SQ) $(PERLLIB_EXTRA_SQ) $(perllibdir_SQ) +PERL_DEFINES = $(PERL_PATH_SQ) $(PERLLIB_EXTRA_SQ) $(perllibdir_SQ) PERL_DEFINES += $(RUNTIME_PREFIX) # Support Perl runtime prefix. In this mode, a different header is installed From patchwork Mon May 10 10:50: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: 12247657 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id BF9BDC43619 for ; Mon, 10 May 2021 11:20:21 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 9C9B7610A0 for ; Mon, 10 May 2021 11:20:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234554AbhEJLM7 (ORCPT ); Mon, 10 May 2021 07:12:59 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44104 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233102AbhEJK6j (ORCPT ); Mon, 10 May 2021 06:58:39 -0400 Received: from mail-ed1-x530.google.com (mail-ed1-x530.google.com [IPv6:2a00:1450:4864:20::530]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 854FAC034601 for ; Mon, 10 May 2021 03:50:32 -0700 (PDT) Received: by mail-ed1-x530.google.com with SMTP id r11so3308903edt.13 for ; Mon, 10 May 2021 03:50:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=kdJ38rmc4h3OspcE3tqBRHJN4DMweqr2IhcLvwhr5sA=; b=MRD3TIbIdYlg1dCUby89+WCjqMH+z5JR4hMwsWklPmBWvkYZnccg1BuxWlEvtFkDYg PmgpMcq5RQHRE1DfeGNueRhufyD6B4bmLoV8nepkg3jBtOyb7PkIIehLT6tL9bPCBnmG vpWyb8eWGIbGCdyI1FNPSLVWhIswwN1PhJTOMRVw52GTS9k4qmt4pBXUMkzPdUqRmYlA lg8YWyIGHgqsUr6db5rgg3W0Fuyd0uRV7ZcmJ62VcM4P2aFAVr4GG9gZvQeBd+ztlkg9 RUtx6QA06Z6HIQXR13QkSAJPd0/bruvjK4NlrFcKotCbEJxBSlxzaSvYyMls8BU6sTc0 irQQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=kdJ38rmc4h3OspcE3tqBRHJN4DMweqr2IhcLvwhr5sA=; b=Le3c5Q8rHh4FVTIvvBBkkl1YvHsT04CFfMabIWx2HGf8quU5NFfwVnHGNqMWI7MB4a 34EO6LqMvRgMVJIFH7RVYlDYBDk+Vch/VOpya/NF1Bu7jqMdRghiMe2M9ly16KpkgxV1 zv4aKDIse80tGdtlE8UOKbCznDLtZMP/K3PHU2FhIWXF1ZHnerBcRZ6S8yVx6/uAYhF4 p7n5+20JIYsyI6ipud1/7VLwo9zHtFmnL4am3GihGUxVe7xb2w9U0cjIwk58SmtlHVIU Fu/QgWtQwEBulQkd0xaB2sOWejxwPndfOtpM55KZsnLXMKexJojeCk75hXN9YcY6zBEU kzQw== X-Gm-Message-State: AOAM5300+hpBN5v7VtxqNQckv2M5ktfp0DhhzNbtCN1RciTqmgxSzU9y C9eOJiuT5sfHmFmTVDWcXbzwsfAs1XQ/aw== X-Google-Smtp-Source: ABdhPJxbTQjq446JsQ84TTqNUEWjXmqbxRA8RG2psJo5EDUarm3VoDMhqLTWQ0QLodND768tc+bQWA== X-Received: by 2002:a50:8a99:: with SMTP id j25mr28188957edj.253.1620643831009; Mon, 10 May 2021 03:50:31 -0700 (PDT) Received: from vm.nix.is (vm.nix.is. [2a01:4f8:120:2468::2]) by smtp.gmail.com with ESMTPSA id o13sm9050741ejx.86.2021.05.10.03.50.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 May 2021 03:50:30 -0700 (PDT) From: =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= To: git@vger.kernel.org Cc: Junio C Hamano , Jeff King , =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= Subject: [PATCH v2 4/6] Makefile: split up the deceleration of PERL_DEFINES Date: Mon, 10 May 2021 12:50:20 +0200 Message-Id: X-Mailer: git-send-email 2.31.1.838.g924d365b763 In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Split the declaration of PERL_DEFINES across multiple line, making this easier to read. In 07d90eadb50 (Makefile: add Perl runtime prefix support, 2018-04-10) when PERL_DEFINES was added only the RUNTIME_PREFIX was put on its own line the rest weren't formatted like that for consistency. Let's do that to make this consistent with most of the rest of this Makefile. Signed-off-by: Ævar Arnfjörð Bjarmason --- Makefile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 3ed6828de67..4f68f5e1dba 100644 --- a/Makefile +++ b/Makefile @@ -2270,7 +2270,10 @@ perl_localedir_SQ = $(localedir_SQ) ifndef NO_PERL PERL_HEADER_TEMPLATE = perl/header_templates/fixed_prefix.template.pl -PERL_DEFINES = $(PERL_PATH_SQ) $(PERLLIB_EXTRA_SQ) $(perllibdir_SQ) +PERL_DEFINES = +PERL_DEFINES += $(PERL_PATH_SQ) +PERL_DEFINES += $(PERLLIB_EXTRA_SQ) +PERL_DEFINES += $(perllibdir_SQ) PERL_DEFINES += $(RUNTIME_PREFIX) # Support Perl runtime prefix. In this mode, a different header is installed From patchwork Mon May 10 10:50: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: 12247661 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0A634C19773 for ; Mon, 10 May 2021 11:20:23 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id E6E3761075 for ; Mon, 10 May 2021 11:20:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235436AbhEJLNX (ORCPT ); Mon, 10 May 2021 07:13:23 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44128 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233114AbhEJK6k (ORCPT ); Mon, 10 May 2021 06:58:40 -0400 Received: from mail-ej1-x634.google.com (mail-ej1-x634.google.com [IPv6:2a00:1450:4864:20::634]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3A1C3C034602 for ; Mon, 10 May 2021 03:50:33 -0700 (PDT) Received: by mail-ej1-x634.google.com with SMTP id m12so23825599eja.2 for ; Mon, 10 May 2021 03:50:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=es1nebJMPl+ZLX5xfTWOxRD8gkAC3gkOeNtJ/aNOA2E=; b=kja/V8jb1TSGx8GK0ov9NZFVfvYy+MmGGENIOvLVBUW5nR3aS08kqUfnm0w9ZHyT+w pfV7lxLURsnjTFy0Fk6j7p7vAFHbyN1M2grSSI7LQkWtu3M2MzpCqRlpSBM7t4O1g6U3 pPAgmqkBxIIyjnOioPjThd9DoYTkMTE0195VPjALB4b090l+CC1/4JVpIqD5nbV3Ncv9 otMdT0PJI7L/PFYhijEQbovDtaB+QEIWwFyTs2e2B9+xusx0HMlwtBF4S8mHAEm5OOjx SLDBUl7gHkdXhbywhIwUqV8SVFFjrGZ0BZY8uvNalxE2pmyLCGQhAMOkJzOVmm+uEVGa ctSg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=es1nebJMPl+ZLX5xfTWOxRD8gkAC3gkOeNtJ/aNOA2E=; b=EXDLglWa+Y95a6RFNzeHDxis4rtLq1LaoyiDtakW6NwWLY1JgbweGGiG43+FpSZEfW 7omHTxJdx9Fy0nVPC3yPLK3lLUDSdzIyVUer1PS+TEz9Xs+9+0Sc0F7UoT1sG17rnkfM TaIP9/cqkRStORYDPFThjoUmdbD7Mjz9bxlASsv6BQp81/+akVa5TiXLo6AFFheAL7/T RUU01B+Eh6fYj0HUhCieoOG+BmecWwh1bH3bn8XE0WRqyCZ0YfF/OwCQ6G6D2CH+CLGx K5ebwaCUXIcY9vavPbCeTnWb0dOgZOsTkw91iTVv7NpiRP/dsA2XV1m3/VOAZvm8OikT dfCg== X-Gm-Message-State: AOAM533i1/c5YuPhA5iKtaxIPpwXGBgp79lOKbpg2EqLb9R0OIZo0uXr auL88QQtEha5W7NlsBGezsWVKpxcZaHVoQ== X-Google-Smtp-Source: ABdhPJysnFEb1wYvsM3ImSK4BkB0TeG3UVWsoyHsOIZBftHbKF+OML8n7lj0UWCKD8U3f5es9lualA== X-Received: by 2002:a17:906:d145:: with SMTP id br5mr24477972ejb.452.1620643831779; Mon, 10 May 2021 03:50:31 -0700 (PDT) Received: from vm.nix.is (vm.nix.is. [2a01:4f8:120:2468::2]) by smtp.gmail.com with ESMTPSA id o13sm9050741ejx.86.2021.05.10.03.50.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 May 2021 03:50:31 -0700 (PDT) From: =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= To: git@vger.kernel.org Cc: Junio C Hamano , Jeff King , =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= Subject: [PATCH v2 5/6] Makefile: regenerate *.pm on NO_PERL_CPAN_FALLBACKS change Date: Mon, 10 May 2021 12:50:21 +0200 Message-Id: X-Mailer: git-send-email 2.31.1.838.g924d365b763 In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Regenerate the *.pm files in perl/build/* if the NO_PERL_CPAN_FALLBACKS flag added to the *.pm files in 1aca69c0195 (perl Git::LoadCPAN: emit better errors under NO_PERL_CPAN_FALLBACKS, 2018-03-03) is changed. Signed-off-by: Ævar Arnfjörð Bjarmason --- Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile b/Makefile index 4f68f5e1dba..aaa972c56aa 100644 --- a/Makefile +++ b/Makefile @@ -2275,6 +2275,7 @@ PERL_DEFINES += $(PERL_PATH_SQ) PERL_DEFINES += $(PERLLIB_EXTRA_SQ) PERL_DEFINES += $(perllibdir_SQ) PERL_DEFINES += $(RUNTIME_PREFIX) +PERL_DEFINES += $(NO_PERL_CPAN_FALLBACKS) # Support Perl runtime prefix. In this mode, a different header is installed # into Perl scripts. From patchwork Mon May 10 10:50: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: 12247663 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D82DBC433ED for ; Mon, 10 May 2021 11:20:22 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id A588E611F0 for ; Mon, 10 May 2021 11:20:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235097AbhEJLNQ (ORCPT ); Mon, 10 May 2021 07:13:16 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44120 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233126AbhEJK6k (ORCPT ); Mon, 10 May 2021 06:58:40 -0400 Received: from mail-ej1-x633.google.com (mail-ej1-x633.google.com [IPv6:2a00:1450:4864:20::633]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D62BCC034603 for ; Mon, 10 May 2021 03:50:34 -0700 (PDT) Received: by mail-ej1-x633.google.com with SMTP id f24so23793342ejc.6 for ; Mon, 10 May 2021 03:50:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=zgoikah04bhcAWVfHm5KgAowajJiW395o240CmNPoE0=; b=smfPUureXqaz4rALlaLWrViYnoX88+f9uRRV4q84a5R7J1YE2lK8lDmuWPRhniOIdD ajYAp2Qlhai9wfUXiQUssAu1Wwck665pKPnNecgPT6ARM9qBpao2tq9IUMgTfrCiiCaO RdQ8tgWlAAYZT4RMEGUfu62/w+CGnEiQGHSQ6lcnYD67n6ek/tmPyvg/fjEHtZAa0lNe BOx/GNWl8HnWyQKJmJnx9nqm/qbdWg+S5wVL5hrhUmpKg9xfFjp3K7NIQHOKBamG9ymc Fwa6Zw03oWOX4yhW2IncoOn8oAOvj2MYZt2DKouC94vUHlaN3OzcH5aGieAi+mOLIoii ym+A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=zgoikah04bhcAWVfHm5KgAowajJiW395o240CmNPoE0=; b=dgg9d3dkgZ15WdHDi/m3sM8kf3Rf7fLijbL6jnth9MXxhhMCCBsfdw8VGpNhToV66h w2l7w9A4WZfWWIZI4bBioOJy8qKRHb4w5zlIO7DtjMNJW/DkaHd1q6IaTl+kwrVILt2n AoyqRD3A1iUWldAFiDaSS0WTReOOovvFM/FPPNHxbZiOXE/HxctSM+kcMYMgWiT0mD4T o0LjbyIgk1c4yuQaY5/Rr4nJwpzD1g7iH8es6xFT75Q2bCqrBZfcTWvFWtiExBZ8LuA4 w9Aj/qWXN0hawTlXYEjZRtbCuGm3/iKgrxoPmUSrITHd5jRY7fmvCnd7SZvnuxd6KuEq 7dBg== X-Gm-Message-State: AOAM5330XLn3Ejk6Yjhh5q0mJZaVu8NWbdwexdVCVlA5er3BEXDJoBbt FJeQanvrgtpFmK02yQ6+gD0vUzQEYn1mzw== X-Google-Smtp-Source: ABdhPJw3tc/PUINFHSH9vJY2G57Ok48QQ20DUNpcEWAFK7e9rwRK1YMrK/PB/qgs3CBO4aRpkXAb3g== X-Received: by 2002:a17:906:79a:: with SMTP id l26mr24892099ejc.268.1620643832486; Mon, 10 May 2021 03:50:32 -0700 (PDT) Received: from vm.nix.is (vm.nix.is. [2a01:4f8:120:2468::2]) by smtp.gmail.com with ESMTPSA id o13sm9050741ejx.86.2021.05.10.03.50.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 May 2021 03:50:31 -0700 (PDT) From: =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= To: git@vger.kernel.org Cc: Junio C Hamano , Jeff King , =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= Subject: [PATCH v2 6/6] perl: use mock i18n functions under NO_GETTEXT=Y Date: Mon, 10 May 2021 12:50:22 +0200 Message-Id: X-Mailer: git-send-email 2.31.1.838.g924d365b763 In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Change the logic of the i18n functions I added in 5e9637c6297 (i18n: add infrastructure for translating Git with gettext, 2011-11-18) to use pass-through functions when NO_GETTEXT is defined. This speeds up the compilation time of commands that use this library when NO_GETTEXT=Y is in effect. Loading it and POSIX.pm is around 20ms on my machine, whereas it takes 2ms to just instantiate perl itself. Signed-off-by: Ævar Arnfjörð Bjarmason --- Makefile | 3 +++ perl/Git/I18N.pm | 10 ++++++++++ 2 files changed, 13 insertions(+) diff --git a/Makefile b/Makefile index aaa972c56aa..0705fc2d3fb 100644 --- a/Makefile +++ b/Makefile @@ -1986,6 +1986,7 @@ ETC_GITCONFIG_SQ = $(subst ','\'',$(ETC_GITCONFIG)) ETC_GITATTRIBUTES_SQ = $(subst ','\'',$(ETC_GITATTRIBUTES)) DESTDIR_SQ = $(subst ','\'',$(DESTDIR)) +NO_GETTEXT_SQ = $(subst ','\'',$(NO_GETTEXT)) bindir_SQ = $(subst ','\'',$(bindir)) bindir_relative_SQ = $(subst ','\'',$(bindir_relative)) mandir_SQ = $(subst ','\'',$(mandir)) @@ -2276,6 +2277,7 @@ PERL_DEFINES += $(PERLLIB_EXTRA_SQ) PERL_DEFINES += $(perllibdir_SQ) PERL_DEFINES += $(RUNTIME_PREFIX) PERL_DEFINES += $(NO_PERL_CPAN_FALLBACKS) +PERL_DEFINES += $(NO_GETTEXT) # Support Perl runtime prefix. In this mode, a different header is installed # into Perl scripts. @@ -2680,6 +2682,7 @@ endif perl/build/lib/%.pm: perl/%.pm GIT-PERL-DEFINES $(QUIET_GEN)mkdir -p $(dir $@) && \ sed -e 's|@@LOCALEDIR@@|$(perl_localedir_SQ)|g' \ + -e 's|@@NO_GETTEXT@@|$(NO_GETTEXT_SQ)|g' \ -e 's|@@NO_PERL_CPAN_FALLBACKS@@|$(NO_PERL_CPAN_FALLBACKS_SQ)|g' \ < $< > $@ diff --git a/perl/Git/I18N.pm b/perl/Git/I18N.pm index 2037f387c89..895e759c57a 100644 --- a/perl/Git/I18N.pm +++ b/perl/Git/I18N.pm @@ -16,9 +16,19 @@ BEGIN our @EXPORT = qw(__ __n N__); our @EXPORT_OK = @EXPORT; +# See Git::LoadCPAN's NO_PERL_CPAN_FALLBACKS_STR for a description of +# this "'@@' [...] '@@'" pattern. +use constant NO_GETTEXT_STR => '@@' . 'NO_GETTEXT' . '@@'; +use constant NO_GETTEXT => ( + q[@@NO_GETTEXT@@] ne '' + and + q[@@NO_GETTEXT@@] ne NO_GETTEXT_STR +); + sub __bootstrap_locale_messages { our $TEXTDOMAIN = 'git'; our $TEXTDOMAINDIR ||= $ENV{GIT_TEXTDOMAINDIR} || '@@LOCALEDIR@@'; + die "NO_GETTEXT=" . NO_GETTEXT_STR if NO_GETTEXT; require POSIX; POSIX->import(qw(setlocale));