From patchwork Fri Jul 29 15:41:09 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johannes Schindelin X-Patchwork-Id: 12932576 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 90597C3F6B0 for ; Fri, 29 Jul 2022 15:41:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237502AbiG2Plc (ORCPT ); Fri, 29 Jul 2022 11:41:32 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44022 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237963AbiG2PlT (ORCPT ); Fri, 29 Jul 2022 11:41:19 -0400 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 01B23DEF1 for ; Fri, 29 Jul 2022 08:41:18 -0700 (PDT) Received: by mail-wr1-x430.google.com with SMTP id j7so6475049wrh.3 for ; Fri, 29 Jul 2022 08:41:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=message-id:in-reply-to:references:from:date:subject:fcc :content-transfer-encoding:mime-version:to:cc; bh=Gi7eQE4bphs3GvKkhd9KoO0LlbN4b6qLPf3k7p/Di7w=; b=evS6pT1SPp6dUeBqeZ6+hkbtqi7YdPg3FRuOcry/tLM1mbEpS4N1Q2OyvwftR214YX GtfzA6Z52Yye4SogFwZAG38TavOs+eEqsnz69quJTy4/EJlbIs8krmq4uNOkdNqudTq+ uMm6i0wE85Rjm6JMQfpI83mCxZr/QlVXycTuqjY65QouaMTYg6ZXYwexkM8t6CNBdpCi AvYe39mDn+g5MASQjaMt2iXpfvKdGLtiCs4J5hmq/R+dNI+rTApPxtMMwEWnO1La1Xat UDFBL72NZ2m0Ssprboujozu7PvQYRC2M1vG1+MOQ0J/JGXtjhVBeizGaccJs0akJ7Dif z9CA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:message-id:in-reply-to:references:from:date :subject:fcc:content-transfer-encoding:mime-version:to:cc; bh=Gi7eQE4bphs3GvKkhd9KoO0LlbN4b6qLPf3k7p/Di7w=; b=RusXXLR9slUpAjbZEQ5V3tAS8ClqW1hB04wyd2qYnqF1kTMkk1k4tnI7NgakiBe/iR UvsoQaCxlqm+/P7l5V7llAsjhp3fbjrq4lZcdgG7Bh5mywp3n9FPwX1YOgaBAz5o2OUL iXTie38JwebTipFvxXkDUZArYTUWDACaVjohEpQ2E4V7G50Zue3bM7/8peNF/77JeREG qWfDHSEM0qyKl/XrwRJvTY5a2KxGtw6eWGwQbIqdcVF9VeyXCvhe5R4xcrMOxjlpdWx9 /2w+X30yeiLW3l0CDaooP5UlJdk/1U/q+VE+DEyXExpOCFj29AIYmSU7hqnjjf/nZBJ5 +uKA== X-Gm-Message-State: ACgBeo19WHDItFSJtd/ed44/KbaFDuBJiKe3RXJeCYMD96x4k7PM/bm8 kxYRy8JwIREKztx6kehFJi/w139DXrk= X-Google-Smtp-Source: AA6agR6fShHq9ExSidelVM0ZNknoKRTZ7BY5NF0dKTC8t+l/cI6YOYn+CNQT2TtSE/yU1AToHVYzGQ== X-Received: by 2002:a05:6000:1d90:b0:21e:b665:d90c with SMTP id bk16-20020a0560001d9000b0021eb665d90cmr2841689wrb.273.1659109276042; Fri, 29 Jul 2022 08:41:16 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id f19-20020adfb613000000b0021e13efa17esm3847632wre.70.2022.07.29.08.41.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Jul 2022 08:41:15 -0700 (PDT) Message-Id: <5d9b087625a454ad3b505bb968bb72ce3d54140c.1659109272.git.gitgitgadget@gmail.com> In-Reply-To: References: Date: Fri, 29 Jul 2022 15:41:09 +0000 Subject: [PATCH v2 1/3] windows: include the Python bits when building Git for Windows Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Johannes Schindelin , Johannes Schindelin Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Johannes Schindelin From: Johannes Schindelin While Git for Windows does not _ship_ Python (in order to save on bandwidth), MSYS2 provides very fine Python interpreters that users can easily take advantage of, by using Git for Windows within its SDK. Previously, we excluded the Python bits, mostly due to historical reasons: In the Git for Windows v1.x days, we built Git using MSys/MinGW, without support for any Python scripts. Therefore, let's move out the `NO_PYTHON` definition from the generic part of the MINGW section (which includes special handling for MSYS2/Git for Windows, for the long-superseded msysGit environment, as well as for the setup of probably just one developer remaining with their MSys1) into the two sections that cover different environments than Git for Windows' SDK. Signed-off-by: Johannes Schindelin --- config.mak.uname | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/config.mak.uname b/config.mak.uname index ce83cad47a2..fd7b6a90429 100644 --- a/config.mak.uname +++ b/config.mak.uname @@ -656,7 +656,6 @@ ifeq ($(uname_S),MINGW) UNRELIABLE_FSTAT = UnfortunatelyYes OBJECT_CREATION_USES_RENAMES = UnfortunatelyNeedsTo NO_REGEX = YesPlease - NO_PYTHON = YesPlease ETAGS_TARGET = ETAGS NO_POSIX_GOODIES = UnfortunatelyYes DEFAULT_HELP_FORMAT = html @@ -686,6 +685,7 @@ ifneq (,$(wildcard ../THIS_IS_MSYSGIT)) INTERNAL_QSORT = YesPlease HAVE_LIBCHARSET_H = YesPlease NO_GETTEXT = YesPlease + NO_PYTHON = YesPlease COMPAT_CFLAGS += -D__USE_MINGW_ACCESS else ifneq ($(shell expr "$(uname_R)" : '1\.'),2) @@ -730,6 +730,7 @@ else else COMPAT_CFLAGS += -D__USE_MINGW_ANSI_STDIO NO_CURL = YesPlease + NO_PYTHON = YesPlease endif endif endif From patchwork Fri Jul 29 15:41:10 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johannes Schindelin X-Patchwork-Id: 12932577 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 A53D3C04A68 for ; Fri, 29 Jul 2022 15:41:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237530AbiG2Plf (ORCPT ); Fri, 29 Jul 2022 11:41:35 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43320 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236266AbiG2PlU (ORCPT ); Fri, 29 Jul 2022 11:41:20 -0400 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 96CA711C0C for ; Fri, 29 Jul 2022 08:41:19 -0700 (PDT) Received: by mail-wr1-x436.google.com with SMTP id l4so6450363wrm.13 for ; Fri, 29 Jul 2022 08:41:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=message-id:in-reply-to:references:from:date:subject:fcc :content-transfer-encoding:mime-version:to:cc; bh=6incKFQfBj9vNSGGve/0uWH0sf8XVQD3ti9aXy4ciRE=; b=meD0fgxjBNXZ8uBR6zM1qhc1K3EzgnSxI8fHtq4yT3KgbhZC46DRIPM7BGRk5XErls e2ZDypi/XPAAnSsUabtACtRbc25GpxzB7dotO1T4bwWTtR3ecBb+OPty0lF1S53+iU+M H36KaN+ZwA/9NZm4+pFhYk68PU/zNEqaJDiDCCmuA9/0BjJVkY5aQ4IyxaFn+VV+1Ucr COXtxSoqEpoVIqUjzhQHjHLui/y15YE+yRAtJ4HZeo6/2mysy/fDYlzBIw7LrAmeHIqK 95XuO46XtcoziiZgebmwkNk0vBMdEjzHCMq0eUGFPNjEnWGnX8TVyaA/PIztHXqYjtLE cWTA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:message-id:in-reply-to:references:from:date :subject:fcc:content-transfer-encoding:mime-version:to:cc; bh=6incKFQfBj9vNSGGve/0uWH0sf8XVQD3ti9aXy4ciRE=; b=iXBqhXa4XMH675kN05JQAXDNj1cqyiUoQz3jzvA17Jy6RcunKnkABshmTjeiCFewi4 d7WnjmIO/uWsAVfBQP6koNXUCRB82GDdjn9QqIrM73yE7uqZ83wAmlvANyWzoUNbaltp 1Or/eEw+EtDbd68xMou2O7rfeN/D/FMHmsiNuSxmTH3ccY+dKhnXt04BJoBumP16hqQK l97zPkwDL6ErY+ucKFqZvnP2qAkp+Ly2hX6deMB8HREZuxShAgRErXe4NhsL1BR6CGRV +sMlwnbrekLhc/9Ls3EQUxcdS5WsoP1smxa0jUE6bk6dTaHgsYAV5Qq5m18364DE4KR9 y6vA== X-Gm-Message-State: ACgBeo1eZh7YTT2nVO7zCaVD23e0Y73xDJYuZNkeV7EWoFt2XMZ4JH9O GNhqZNdyzf8A2glQkBx41Q1l7eZBzpM= X-Google-Smtp-Source: AA6agR7DuASLpxYddY1rcbRnqFHbsOeXDbnii595hHm3ZtijYJHXDBzOCZpY6BXTmV9fwLIYLNxrtQ== X-Received: by 2002:a5d:6252:0:b0:21e:4457:1bca with SMTP id m18-20020a5d6252000000b0021e44571bcamr2817428wrv.287.1659109277732; Fri, 29 Jul 2022 08:41:17 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id l13-20020a5d668d000000b0021d63fe0f03sm3948878wru.12.2022.07.29.08.41.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Jul 2022 08:41:16 -0700 (PDT) Message-Id: <019fb837d68fda459ff474f6763572461c7189a6.1659109272.git.gitgitgadget@gmail.com> In-Reply-To: References: Date: Fri, 29 Jul 2022 15:41:10 +0000 Subject: [PATCH v2 2/3] mingw: remove unneeded `NO_GETTEXT` directive Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Johannes Schindelin , Johannes Schindelin Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Johannes Schindelin From: Johannes Schindelin In f9206ce2681 (mingw: let's use gettext with MSYS2, 2016-01-26), we flipped the switch to build Git for Windows with support for gettext. However, the way we flipped the switch was by changing the value of the `NO_GETTEXT` variable from a non-empty string to the empty string, as if there was any `NO_GETTEXT` definition we needed to override. But that was a mistake: while there _is_ a definition, it is in the `THIS_IS_MSYSGIT` section, i.e. it does not affect the Git for Windows part at all. Let's just remove that unnecessary line. Signed-off-by: Johannes Schindelin --- config.mak.uname | 1 - 1 file changed, 1 deletion(-) diff --git a/config.mak.uname b/config.mak.uname index fd7b6a90429..e897b80b3a7 100644 --- a/config.mak.uname +++ b/config.mak.uname @@ -717,7 +717,6 @@ else INSTALL = /bin/install INTERNAL_QSORT = YesPlease HAVE_LIBCHARSET_H = YesPlease - NO_GETTEXT = USE_GETTEXT_SCHEME = fallthrough USE_LIBPCRE = YesPlease NO_CURL = From patchwork Fri Jul 29 15:41:11 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johannes Schindelin X-Patchwork-Id: 12932578 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 DF611C19F2A for ; Fri, 29 Jul 2022 15:41:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237660AbiG2Plg (ORCPT ); Fri, 29 Jul 2022 11:41:36 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42794 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236772AbiG2PlX (ORCPT ); Fri, 29 Jul 2022 11:41:23 -0400 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 0389A12081 for ; Fri, 29 Jul 2022 08:41:22 -0700 (PDT) Received: by mail-wr1-x429.google.com with SMTP id v3so5525398wrp.0 for ; Fri, 29 Jul 2022 08:41:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=message-id:in-reply-to:references:from:date:subject:fcc :content-transfer-encoding:mime-version:to:cc; bh=+6FtO0/+05uguURs6ak9Gq3aZzCBnSVJ8wOIFP3buLg=; b=p7zfWGjdgB8HqjDKZod7rh3tlfO/KyW7xlFv3nt7nLq++4mGmJIBUudtrTaFF4tiLp JroPPNBRFCAf+KKCJ3DKGthL2PjD1wfH87fPptgueBIr/bjjS7A1tkhPuwJ/nckZvmKT IE4LAVxBm6Mt0ZOxKGA6kGp6LTreMKoYNJDt6G+tSYeQcP692E+djpIX/IZrefRDtwg+ XOPzdE/HfllNq/fvyEJxReWjz4agdJ9YXv3TxAHzFpBRiFNiG68d8BlwmYs/rOmdLtnr tHbKr+amhZ5/uunjgqoWWJMWZIPGIGOUbtez1CF/dgahnj0gESTYHbZrNLbgAXtHokpl L92Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:message-id:in-reply-to:references:from:date :subject:fcc:content-transfer-encoding:mime-version:to:cc; bh=+6FtO0/+05uguURs6ak9Gq3aZzCBnSVJ8wOIFP3buLg=; b=pZGSWSlTXSe8DHj6GXKZqOcb6OY71N9A3l3F2n8zwDMYWPAiBsVdLNheMZAA8UOlss Msv8OOqe4/M/btBZ6XGPSmvvFxDABRccQ/iYQm6Hl8t1RE/ZB4vyK3nRLTr7iPUrjM71 9NA6/6msq5mO5QNZhiA1kDWT6b4HzNVu1ZYwUM5dSDNvjaSkfvhuQfBsjHnu3012pxdW qbcCf2fBwv44lIZdhoRHrArxtPGHIUMiFQRU4oPV8JS8AD3Ucqz8txzsPMf6nrzV29Ag bJsvvjFvzJGgt9VY17COHmN+zoGIqRhD4Zqwo0zZCKtJl7S3m67vSrFheRwWmsPVIC5f Lujg== X-Gm-Message-State: ACgBeo1/Q4+Bs+XMi3bK7OlbII7eXjj8yLeyqdm52z1UWVON5+rgegPl JVEakplKp1uRoeRM1JGZF42z+pGcG8k= X-Google-Smtp-Source: AA6agR4odNrlWs6ilIlcpVIck+uh+a+PodtJp9pabpN9htfrrBVSu4wDnXSCaxrla0s5u23sc1EUTQ== X-Received: by 2002:a05:6000:18a6:b0:21e:8737:45ec with SMTP id b6-20020a05600018a600b0021e873745ecmr2915123wri.335.1659109280041; Fri, 29 Jul 2022 08:41:20 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id v6-20020a5d6b06000000b0021e5adb92desm3922092wrw.60.2022.07.29.08.41.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Jul 2022 08:41:18 -0700 (PDT) Message-Id: <7dc0a1a9aa81fcd5c464c48995a61492fb97db1a.1659109272.git.gitgitgadget@gmail.com> In-Reply-To: References: Date: Fri, 29 Jul 2022 15:41:11 +0000 Subject: [PATCH v2 3/3] mingw: remove unneeded `NO_CURL` directive Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Johannes Schindelin , Johannes Schindelin Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Johannes Schindelin From: Johannes Schindelin In df5218b4c30 (config.mak.uname: support MSys2, 2016-01-13), we introduced support for building Git for Windows in the then-brand new Git for Windows v2.x build environment that was based off of MSYS2. To do that, we split the non-msysGit part (that targeted MSys1) in two, and instead of sharing the `NO_CURL = YesPlease` setting with MSys1, we overrode it for MSYS2 with the empty value because we very much want to build Git for Windows with libcurl. But that was unnecessary: we never set that variable beforehand, therefore there is no need to override it. Let's just remove that unnecessary line. Signed-off-by: Johannes Schindelin --- config.mak.uname | 1 - 1 file changed, 1 deletion(-) diff --git a/config.mak.uname b/config.mak.uname index e897b80b3a7..d63629fe807 100644 --- a/config.mak.uname +++ b/config.mak.uname @@ -719,7 +719,6 @@ else HAVE_LIBCHARSET_H = YesPlease USE_GETTEXT_SCHEME = fallthrough USE_LIBPCRE = YesPlease - NO_CURL = USE_NED_ALLOCATOR = YesPlease ifeq (/mingw64,$(subst 32,64,$(prefix))) # Move system config into top-level /etc/