From patchwork Tue Mar 18 23:24:19 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Josh Steadmon X-Patchwork-Id: 14021729 Received: from mail-pj1-f74.google.com (mail-pj1-f74.google.com [209.85.216.74]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5B94C1FA261 for ; Tue, 18 Mar 2025 23:24:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.74 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742340270; cv=none; b=TJ9Z/N89lvZItB60To5/R3UXV4jrooshvGkmftG/XCDFsqboJKwOv9dW1dZBudKpa+iSyLn6hcfMgz+lNgEeQTK/oGyVpA40c4VpGOTF7AlXmqJ3Z9c9gv148dIt/WM9FQ11rQGkQbIvm144qu1ihTZuys5lqenPa7T6sBzsFUs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742340270; c=relaxed/simple; bh=EQw3deP8HZMFRySHpcTELECiAM4UtnK2aoKiDcsnOPY=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=X/11JK1gipHuOw78xPPfMikki1z6RkSnlf/HpOWsePaDwZaEEom53Rn10q7hZPCsc0dHnM9xwKcL3v7fA9McGAfCiBod2Hpr5UF4PtxOvDRxZtBgJgpVpXWyOrow49ltRbOJICGuzuLt8cD4KPl8Vij0+NBevkzBa0y3JCSiLqg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--steadmon.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=1PyEDE9p; arc=none smtp.client-ip=209.85.216.74 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--steadmon.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="1PyEDE9p" Received: by mail-pj1-f74.google.com with SMTP id 98e67ed59e1d1-2ff798e8c90so5903952a91.1 for ; Tue, 18 Mar 2025 16:24:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1742340266; x=1742945066; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=Smav4aO7m/YKT3dg9mORFdn+kiS9F6m1uRKkJci/u6g=; b=1PyEDE9pzcJyJNb+Hj+iGaq6a8hMlhHoVb5GjWlwdnSu8Z8GNcIEQchzsSnBjgCVSF dZ4WNRDQThTQQycHG6JrEDPHO2+sUXCAQ000Gz9gpI/ijN2u3WH5k6701IErOeF4AuXa JZbDbYfTMR6oQsPDRhyp7jEgYeAD0TeBComY2hHbsJOYIxj3Gq6v8sGi+fMKC7cCR5qR 0zTDrAnXT64jeDEo+fnzNmZmLk8z+yEE2TOnX7YOPeIc127/WVkwri2qjuzVaaHDVgMs AfF36Ghc577CmMWpORNJIdLYhBpX68k3TinrLbCkRTHN7+ERJwKz9xI+scsHuKlZ7Vae /Rug== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742340266; x=1742945066; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=Smav4aO7m/YKT3dg9mORFdn+kiS9F6m1uRKkJci/u6g=; b=d0rVHfeXgMSqzZH1rZx8hRnfKnBoStgLPp7i4bv1yMkj9ThfVgeuq8TPPy0FkYj7OP JOrMhXqcclu/mDZIzXn4PeNWKXZs4yWWyoEUkqa1PDNo8KU3mXSzjSIKZyVxPafyEnsV c0HBFqUeO+9f6/EtxTAh7B54XlF3/0pk1aC4RmNrLmWxarLAk1kXsevTJesivtkqCgqz 7wbghFOT9rl82umfAgRaMu4sUCEPwgn6RhxnRqVLufgK9hCHoRPYwaaRfxIGzJdD+FEA HLfRIho5aqkaQefvxGxlucWpQ1LbLywLXkh8lknWQCfaPiqG2tuKjJhOBLneJXPJdW3V cllQ== X-Gm-Message-State: AOJu0YxUY4EhPWJBZFpQMyfQilQgzrz7JvdRU/cO/so+ctCAqKjas43A QH+i0ZRTMq+m0bwmGTUgzj6UtS57OwAL87KWFzuI/um4gqBKsZbhuNevkTgiCe+3yuJ/2r2wjtg aAYSy5bxKPi6kYEMMhTCayj07U+PYlGs5F+GHJefWgIKFfc8DcXYID56GKb5yOC/peC6a417ROE kI85eTu2izvyX3A2uR0XTShcqmtACbuRMpA8+ocfY= X-Google-Smtp-Source: AGHT+IHa/b2nv1X8mhdOKDq2Ryx3jLDl9Ktkr8CsA2jOA2SRuo5rRX0nrOEM1Q+/fTb9y6xPimApnPEzkmOZvw== X-Received: from pgbbz14.prod.google.com ([2002:a05:6a02:60e:b0:af5:da83:bdc0]) (user=steadmon job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a21:6e48:b0:1f5:839e:ece8 with SMTP id adf61e73a8af0-1fbeb1854bcmr778609637.2.1742340266536; Tue, 18 Mar 2025 16:24:26 -0700 (PDT) Date: Tue, 18 Mar 2025 16:24:19 -0700 In-Reply-To: Precedence: bulk X-Mailing-List: git@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: X-Mailer: git-send-email 2.49.0.rc1.451.g8f38331e32-goog Message-ID: Subject: [RFC PATCH v1 1/4] libgitpub: move to separate contrib/ directory From: Josh Steadmon To: git@vger.kernel.org Cc: "brian m. carlson" For Cargo packaging purposes, it is better for any dependencies built with Git's Makefile to live outside the libgit-{sys,rs} crates. This, plus some future changes to the crates, will allow `cargo package` to treat all of the non-Rust source as a separate tree apart from the Cargo-managed inputs. Signed-off-by: Josh Steadmon --- Makefile | 16 ++++++++-------- contrib/libgit-sys/build.rs | 4 ++-- .../public_symbol_export.c | 2 +- .../public_symbol_export.h | 0 4 files changed, 11 insertions(+), 11 deletions(-) rename contrib/{libgit-sys => libgitpub}/public_symbol_export.c (96%) rename contrib/{libgit-sys => libgitpub}/public_symbol_export.h (100%) diff --git a/Makefile b/Makefile index 7315507381..52eed88dde 100644 --- a/Makefile +++ b/Makefile @@ -2764,7 +2764,7 @@ OBJECTS += $(CLAR_TEST_OBJS) OBJECTS += $(patsubst %,$(UNIT_TEST_DIR)/%.o,$(UNIT_TEST_PROGRAMS)) ifdef INCLUDE_LIBGIT_RS - OBJECTS += contrib/libgit-sys/public_symbol_export.o + OBJECTS += contrib/libgitpub/public_symbol_export.o endif ifndef NO_CURL @@ -3762,9 +3762,9 @@ clean: profile-clean coverage-clean cocciclean $(MAKE) -C Documentation/ clean $(RM) Documentation/GIT-EXCLUDED-PROGRAMS $(RM) -r contrib/libgit-sys/target contrib/libgit-rs/target - $(RM) contrib/libgit-sys/partial_symbol_export.o - $(RM) contrib/libgit-sys/hidden_symbol_export.o - $(RM) contrib/libgit-sys/libgitpub.a + $(RM) contrib/libgitpub/partial_symbol_export.o + $(RM) contrib/libgitpub/hidden_symbol_export.o + $(RM) contrib/libgitpub/libgitpub.a ifndef NO_PERL $(RM) -r perl/build/ endif @@ -3937,14 +3937,14 @@ ifdef INCLUDE_LIBGIT_RS all:: libgit-sys libgit-rs endif -LIBGIT_PUB_OBJS += contrib/libgit-sys/public_symbol_export.o +LIBGIT_PUB_OBJS += contrib/libgitpub/public_symbol_export.o LIBGIT_PUB_OBJS += libgit.a LIBGIT_PUB_OBJS += reftable/libreftable.a LIBGIT_PUB_OBJS += xdiff/lib.a -LIBGIT_PARTIAL_EXPORT = contrib/libgit-sys/partial_symbol_export.o +LIBGIT_PARTIAL_EXPORT = contrib/libgitpub/partial_symbol_export.o -LIBGIT_HIDDEN_EXPORT = contrib/libgit-sys/hidden_symbol_export.o +LIBGIT_HIDDEN_EXPORT = contrib/libgitpub/hidden_symbol_export.o $(LIBGIT_PARTIAL_EXPORT): $(LIBGIT_PUB_OBJS) $(LD) -r $^ -o $@ @@ -3952,5 +3952,5 @@ $(LIBGIT_PARTIAL_EXPORT): $(LIBGIT_PUB_OBJS) $(LIBGIT_HIDDEN_EXPORT): $(LIBGIT_PARTIAL_EXPORT) $(OBJCOPY) --localize-hidden $^ $@ -contrib/libgit-sys/libgitpub.a: $(LIBGIT_HIDDEN_EXPORT) +contrib/libgitpub/libgitpub.a: $(LIBGIT_HIDDEN_EXPORT) $(AR) $(ARFLAGS) $@ $^ diff --git a/contrib/libgit-sys/build.rs b/contrib/libgit-sys/build.rs index 3ffd80ad91..e0d979c196 100644 --- a/contrib/libgit-sys/build.rs +++ b/contrib/libgit-sys/build.rs @@ -15,7 +15,7 @@ pub fn main() -> std::io::Result<()> { .current_dir(git_root.clone()) .args([ "INCLUDE_LIBGIT_RS=YesPlease", - "contrib/libgit-sys/libgitpub.a", + "contrib/libgitpub/libgitpub.a", ]) .output() .expect("Make failed to run"); @@ -26,7 +26,7 @@ pub fn main() -> std::io::Result<()> { String::from_utf8(make_output.stderr).unwrap() ); } - std::fs::copy(crate_root.join("libgitpub.a"), dst.join("libgitpub.a"))?; + std::fs::copy(git_root.join("contrib/libgitpub/libgitpub.a"), dst.join("libgitpub.a"))?; println!("cargo:rustc-link-search=native={}", dst.display()); println!("cargo:rustc-link-lib=gitpub"); println!("cargo:rerun-if-changed={}", git_root.display()); diff --git a/contrib/libgit-sys/public_symbol_export.c b/contrib/libgitpub/public_symbol_export.c similarity index 96% rename from contrib/libgit-sys/public_symbol_export.c rename to contrib/libgitpub/public_symbol_export.c index dfbb257115..de5f6943c2 100644 --- a/contrib/libgit-sys/public_symbol_export.c +++ b/contrib/libgitpub/public_symbol_export.c @@ -6,7 +6,7 @@ #include "git-compat-util.h" #include "config.h" -#include "contrib/libgit-sys/public_symbol_export.h" +#include "contrib/libgitpub/public_symbol_export.h" #include "version.h" #pragma GCC visibility push(default) diff --git a/contrib/libgit-sys/public_symbol_export.h b/contrib/libgitpub/public_symbol_export.h similarity index 100% rename from contrib/libgit-sys/public_symbol_export.h rename to contrib/libgitpub/public_symbol_export.h From patchwork Tue Mar 18 23:24:20 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Josh Steadmon X-Patchwork-Id: 14021730 Received: from mail-pl1-f201.google.com (mail-pl1-f201.google.com [209.85.214.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4F2B0207667 for ; Tue, 18 Mar 2025 23:24:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742340271; cv=none; b=fXtNKQA/0Z5VszNN5cuaomvO+mHyPePgxoMIfVefESaSEd7ZLMcLqd0lMmIKzs0onbm6JKlEZ2uFzIYe/wb2VAxzhChJAGQ66D9g7RlA8WEEaBj8yyTMieZaMV23SfgtwSIm1aBsRDHxUVVksbNIMxrblG3M3NjlUK6TlC2OzYU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742340271; c=relaxed/simple; bh=ZkTAo280NRur2dvgypHKKxKOf/t26e/67u0FYiU5pWc=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=VE6I4iuMMgr91CQf2rFkMfYemu7pUG/at4ab757Cjq53nlBtVLurSnCiGnjrPRRogKsvs2CrnJK9E/q7ANupHuDpNGTWTl3vxfs37Ocscv9zHrrzsO7FG66FO06IpCHzXpNTsmOisx6B8KOsp9HPjgDXYBcU4ZjyTb73mFtOUW0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--steadmon.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=aOjGcIuO; arc=none smtp.client-ip=209.85.214.201 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--steadmon.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="aOjGcIuO" Received: by mail-pl1-f201.google.com with SMTP id d9443c01a7336-2241ae15dcbso135930005ad.0 for ; Tue, 18 Mar 2025 16:24:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1742340268; x=1742945068; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=NAYTvgnQhoL1kiNyyBSrw8pWntmvGFx6Yi/YHaiJ6h4=; b=aOjGcIuOzffPR+vKEFEFtcfbvlr85G3/1jrEd3CYBX+MfKjkOJHUQZcCQGhH5e9l7g jMzSdpiBc8C4D+TXmLl4YTgd7xF8X+2dwDeUEp599g1cykTgWoMAnGtwKUM5YMPTuAe8 UV1dc/Js97OZwy7za9CV1qFytEqM/kOaEA6Q3gtTjySShaWpMUK4VbF22W9N2HSRUMDJ meAWgC9SeH3phwnZb8pthwZ8y+4is03lNz+YPPqLCMfaJoHmAKD5cKaH99vRQGLCTamO ltY4Ez2MEMIGDKZy7wv70ujUGhnuWulyNrAk/NuTW9DDwEMifmnBOVJe6m9294Itb704 6kCA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742340268; x=1742945068; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=NAYTvgnQhoL1kiNyyBSrw8pWntmvGFx6Yi/YHaiJ6h4=; b=eYt5lcIsrYIdZHB1YKqhiNpMi+4UiRcTn9po/ohtAn6zpq5umfMcojFKAvoZtmKhhx yERGe5LziHrVdnzFHNuF3SnGugdpn3TxD2DdJNJSwBKAADQgxAGcEh2E4693b+eQfSEF G4dJjMuzHSO0uSssIFKOHnRcPlQxFWxwDdWL/HkXepJhTQYI442XQXEhZNUqypo6YarQ uKbCJkwrzA35b0NMB4SemNAw7Lx/g7u+6EjAooG6WtatuydrTJ0jZStn23v/2pd+7Iza l7aqOb8GP1ARft4Al5kDDSwlEuQBR9j56Y1c8u4A4I2xXy+NbK/9zZ1szEWdXIg1dQFz vBCQ== X-Gm-Message-State: AOJu0YzLg+4Z0MrX6Zn2fbs+XWXlZzqjS3KqTe5ofWPhvrFmL8qvUltw zenICjEoVZ2KM8gEvjHl9KUBAqdHKnCICPUPRKnL4zOgIz8fdZkBdOeZJttP0C+c0mjczbKAIMg booWU9dQi5wMk+YPy7FV2qvxVbEnBvET+Un3e9/d7SOgJ3oBwQXpvGK6SCHGfk9H9D4pstc+65u Tej0gNrJ/3LFXIPDZH8kb/UzbXDEu7hnS6WW1yeNA= X-Google-Smtp-Source: AGHT+IEEBtdWIIPw4reKpXmqQFqJBzPQ/hM79RgJ5xXa1ZhWcfVxVqUNdmCSso/Apq5hN5VAAPZ4gRJf58D1Gg== X-Received: from plau2.prod.google.com ([2002:a17:903:3042:b0:223:225b:3d83]) (user=steadmon job=prod-delivery.src-stubby-dispatcher) by 2002:a17:902:d4c7:b0:21f:564:80a4 with SMTP id d9443c01a7336-22649a59bb5mr5247815ad.33.1742340268424; Tue, 18 Mar 2025 16:24:28 -0700 (PDT) Date: Tue, 18 Mar 2025 16:24:20 -0700 In-Reply-To: Precedence: bulk X-Mailing-List: git@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: X-Mailer: git-send-email 2.49.0.rc1.451.g8f38331e32-goog Message-ID: Subject: [RFC PATCH v1 2/4] libgit-sys: add symlink to git repo root and clean after build From: Josh Steadmon To: git@vger.kernel.org Cc: "brian m. carlson" Unlike `cargo build`, `cargo package` does not get access to the entire Git repo containing a Rust crate. Instead, it prepares a directory starting from the crate root (potentially excluding files, such as those not under version control, or explicity excluded in the Cargo.toml file). This means that the current method of building the libgit-sys crate does not work with `cargo package`, as it tries to execute the Makefile from "../.." relative to the crate root. Fix this by adding a `git-src` symlink in the crate that points to the Git repository root. `cargo package` will flatten this to a copy of the Git repo, excluding non-version-controlled files, any explicitly-excluded files, and trees that contain a Cargo.toml file (this prevents infinite recursion on the symlink). We can then execute the Makefile under the flattened git-src directory from our build.rs script. However, this exposes a second problem; Cargo will check that the build script does not add, delete, or modify any source files. This means that after we copy our libgitpub.a dependency to the output directory, we must run `make clean` to remove the object files we created during the build process. Unfortunately, there is not a way to determine from the build.rs script whether we're running `cargo build` vs. `cargo package`, so now any build of the libgit-sys crate will result in cleaning the Git worktree. A potential alternative is to make an additional temporary copy of the worktree and run the Makefile there. This would avoid removing build artifacts in the worktree at the cost of copying MBs worth of source files to a temporary directory. Perhaps hardlinking instead of making a full copy would help here, but that might be less portable. Signed-off-by: Josh Steadmon --- Makefile | 6 ++++++ contrib/libgit-sys/build.rs | 21 ++++++++++++++++++++- contrib/libgit-sys/git-src | 1 + 3 files changed, 27 insertions(+), 1 deletion(-) create mode 120000 contrib/libgit-sys/git-src diff --git a/Makefile b/Makefile index 52eed88dde..e7d8786e4e 100644 --- a/Makefile +++ b/Makefile @@ -420,6 +420,10 @@ include shared.mak # Define INCLUDE_LIBGIT_RS if you want `make all` and `make test` to build and # test the Rust crates in contrib/libgit-sys and contrib/libgit-rs. # +# Define PRESERVE_LIBGIT_TARGET to prevent `make clean` from removing the Cargo +# output directories for libgit-sys and libgit-rs. This is mainly for use in the +# Cargo build scripts. +# # === Optional library: libintl === # # Define NO_GETTEXT if you don't want Git output to be translated. @@ -3761,7 +3765,9 @@ clean: profile-clean coverage-clean cocciclean $(RM) $(htmldocs).tar.gz $(manpages).tar.gz $(MAKE) -C Documentation/ clean $(RM) Documentation/GIT-EXCLUDED-PROGRAMS +ifndef PRESERVE_LIBGIT_TARGET $(RM) -r contrib/libgit-sys/target contrib/libgit-rs/target +endif $(RM) contrib/libgitpub/partial_symbol_export.o $(RM) contrib/libgitpub/hidden_symbol_export.o $(RM) contrib/libgitpub/libgitpub.a diff --git a/contrib/libgit-sys/build.rs b/contrib/libgit-sys/build.rs index e0d979c196..9d586d272d 100644 --- a/contrib/libgit-sys/build.rs +++ b/contrib/libgit-sys/build.rs @@ -6,7 +6,7 @@ pub fn main() -> std::io::Result<()> { ac.emit_has_path("std::ffi::c_char"); let crate_root = PathBuf::from(env::var_os("CARGO_MANIFEST_DIR").unwrap()); - let git_root = crate_root.join("../.."); + let git_root = crate_root.join("git-src"); let dst = PathBuf::from(env::var_os("OUT_DIR").unwrap()); let make_output = make_cmd::gnu_make() @@ -31,5 +31,24 @@ pub fn main() -> std::io::Result<()> { println!("cargo:rustc-link-lib=gitpub"); println!("cargo:rerun-if-changed={}", git_root.display()); + let make_output = make_cmd::gnu_make() + .env("DEVELOPER", "1") + .env_remove("PROFILE") + .current_dir(git_root.clone()) + .args([ + "INCLUDE_LIBGIT_RS=YesPlease", + "PRESERVE_LIBGIT_TARGET=YesPlease", + "clean", + ]) + .output() + .expect("`make clean` failed to run"); + if !make_output.status.success() { + panic!( + "`make clean` failed:\n stdout = {}\n stderr = {}\n", + String::from_utf8(make_output.stdout).unwrap(), + String::from_utf8(make_output.stderr).unwrap() + ); + } + Ok(()) } diff --git a/contrib/libgit-sys/git-src b/contrib/libgit-sys/git-src new file mode 120000 index 0000000000..c25bddb6dd --- /dev/null +++ b/contrib/libgit-sys/git-src @@ -0,0 +1 @@ +../.. \ No newline at end of file From patchwork Tue Mar 18 23:24:21 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Josh Steadmon X-Patchwork-Id: 14021731 Received: from mail-pl1-f202.google.com (mail-pl1-f202.google.com [209.85.214.202]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5D0C7212FBD for ; Tue, 18 Mar 2025 23:24:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.202 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742340273; cv=none; b=HbHeBHsJc6gnHO/D+/QarlvhYH+1gvkGwzpQdFngEnWSKBF3OpsBwEPWaivjb4Rts3h6xXwFaE7tNfz33uY5Lw5EpR/w8MwcZ4ZlZGUtBlTn8t/5v/z8AD8U1xl7Vxn3Hk+pb6ur6uTPmXFTUAXXPx3F0sWHviWdtRVh9gYR0K0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742340273; c=relaxed/simple; bh=6cuUKzt5E1wLCA8+PoPjzzdS0jEkHMCyoeFul6vRTwA=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=MosWT4ND45upC1WQudix3GspOPI34CH7yNIUduc2VEwi3EwZ4FJ397R8Bm9OYchNRRlLWofTxwOFwZ7NcDS03U/AI9OD20rlTP9bxJBaRAS5tcht/6gQ2FCV1BbKETSpxKohXjzeWKcJ2QsYoMXxrm4HOysrtpjpYuDun071OAs= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--steadmon.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=SC1e5UG3; arc=none smtp.client-ip=209.85.214.202 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--steadmon.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="SC1e5UG3" Received: by mail-pl1-f202.google.com with SMTP id d9443c01a7336-223d86b4df0so178214155ad.3 for ; Tue, 18 Mar 2025 16:24:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1742340270; x=1742945070; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=BZhgdEObtWIrYnSvQF9t8XeqGW7wxFD80uyJ4Wx4sko=; b=SC1e5UG31RazBu94eeYqwU11uWDK+oNM/x9CDwaow7VBKp5KWo9uiOqIOJBRZbvUG5 7ROwhuoO3bhogPOlT93GSLlKnfe19s/CqZmWLTTZRxgT03b75SCOYHGKtQGR212UCXwJ A61od0GplPjORjgFj/7chWXTVb+2ney9R14YZdfC7Lm3aw8XZgSrIAFjQuIYjJKuGEjn LbMOfhOZmT9Z6FoOWWUrxBWya+r3l0h2ZqA4+L+WfUFPs3QGuQHU/GUsAMKPHs6nC7++ y2t9v+LS+EPcaL4G0qipQZ80HvoCMFDasXxcR53pc6sD+loeT8FrStmZXccLmqE8CnDg XRZg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742340270; x=1742945070; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=BZhgdEObtWIrYnSvQF9t8XeqGW7wxFD80uyJ4Wx4sko=; b=imfneMIBIIbCoL3UvtwFNLS8ldBxZ1pkTEPdcBc/q/AFenThquGPGtRSZRhTZ60Tgr iq/sjUH2zeE+TY0GpPotgvCUjW6EQlGQonNuXnaUxPXJIE/9E9qcmNsUzAn3YfemFx5f /r/lMeWuvM6WPX74gS/mnZjpGu0KGYGdxb1msTJ4CK0BNqxkXdtaSYnjVHDrZBPAZ33p 9YoeyC44JVYjxHKCrKHd+eVaCORGSDJZL9Di41FU8d06A/3l4IaZd30fBUSWe78HLAyX ml5oB/KmSx7H5GahtRME5eEYx/hyOd0YupV1jqurN1oHHVLx9IqSsKSvdwKI7gGfzgJM Xmqg== X-Gm-Message-State: AOJu0YywiXmAqN4PJLo9NNLZc489H15Cy9+ZweMTuiJ8TXXMT3wcd3k2 4n4gUnANx/tVT8QJmT4bRkVqORv2c9178TLOqN2Cry/pCIBJL72QkqZlAMVh1FbcXSEePg0FTnn qGrYmQUwjUB+wKQc8OCdWWnWbieknTjUa5F9mCVHG/ssyEOOkX37n52xCifL3RIWrtvLBgnaZXu sscNozEWy95fU6UJ16nrojyYyHYEQxnVu94glOIw0= X-Google-Smtp-Source: AGHT+IGTx9NzsPWFpAeuaL65MZw7wzjdj9jRGv7z+K4mraytDyfyJQfvy+TjDb33lv9fulD7bnEHhU4CHo3ldQ== X-Received: from pgbfq12.prod.google.com ([2002:a05:6a02:298c:b0:af2:68b7:9f68]) (user=steadmon job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a21:7103:b0:1f5:730b:e09a with SMTP id adf61e73a8af0-1fbebc85239mr864828637.20.1742340270522; Tue, 18 Mar 2025 16:24:30 -0700 (PDT) Date: Tue, 18 Mar 2025 16:24:21 -0700 In-Reply-To: Precedence: bulk X-Mailing-List: git@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: X-Mailer: git-send-email 2.49.0.rc1.451.g8f38331e32-goog Message-ID: <905e4e4d043a0ae78bf329c074552c7feba900d2.1742339107.git.josh@steadmon.net> Subject: [RFC PATCH v1 3/4] libgit-sys: parallelize build with Cargo's jobserver From: Josh Steadmon To: git@vger.kernel.org Cc: "brian m. carlson" Cargo provides GNU Make flags that can be used to connect to its jobserver for managing parallel builds. They are not automatically passed to any `make` invocations, so let's add that to our build.rs script. Signed-off-by: Josh Steadmon --- contrib/libgit-sys/build.rs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/contrib/libgit-sys/build.rs b/contrib/libgit-sys/build.rs index 9d586d272d..16e0d66afb 100644 --- a/contrib/libgit-sys/build.rs +++ b/contrib/libgit-sys/build.rs @@ -8,9 +8,11 @@ pub fn main() -> std::io::Result<()> { let crate_root = PathBuf::from(env::var_os("CARGO_MANIFEST_DIR").unwrap()); let git_root = crate_root.join("git-src"); let dst = PathBuf::from(env::var_os("OUT_DIR").unwrap()); + let makeflags = env::var_os("CARGO_MAKEFLAGS").unwrap(); let make_output = make_cmd::gnu_make() .env("DEVELOPER", "1") + .env("MAKEFLAGS", &makeflags) .env_remove("PROFILE") .current_dir(git_root.clone()) .args([ @@ -33,6 +35,7 @@ pub fn main() -> std::io::Result<()> { let make_output = make_cmd::gnu_make() .env("DEVELOPER", "1") + .env("MAKEFLAGS", &makeflags) .env_remove("PROFILE") .current_dir(git_root.clone()) .args([ From patchwork Tue Mar 18 23:24:22 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Josh Steadmon X-Patchwork-Id: 14021732 Received: from mail-pj1-f73.google.com (mail-pj1-f73.google.com [209.85.216.73]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4C4E8207667 for ; Tue, 18 Mar 2025 23:24:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.73 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742340275; cv=none; b=L0Te1qYpOJE9H9ibG5AhtlvmetQoeStbUfLZqwvzifFg7QocA3njJFb15E0oXUXAhP5tTdVtrdxmvqQBVPnPMVJVnpOT45wJ+LoEgJf652gfbOA3OwSHLDDffmIWW8KzSX4BFjRcaVFZ4Ji6fDnFnrTGN9Dmynv1YQZ00Qcgqyo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742340275; c=relaxed/simple; bh=pDDqEUY35UZCBK2KEGJB9dQvPCDROMhyzeMjes3P2I0=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=Td28DoWzAo3iAOTC/uve4fhgh2neKefmMj/Zq0MckWcYHjJnscDzyP4O+fsxFJuuxTH8u+/cTBep+amM3S4gQeg8R0iBOeyKbvHUaasgUBVCT5iNcgJfdJLRI4UJSrJgaFTHzkOVcENJVI7JDRXI9ail7mrdDXUEpiDPHWp4egs= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--steadmon.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=oWNR4qXY; arc=none smtp.client-ip=209.85.216.73 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--steadmon.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="oWNR4qXY" Received: by mail-pj1-f73.google.com with SMTP id 98e67ed59e1d1-2ff798e8c3bso6676606a91.2 for ; Tue, 18 Mar 2025 16:24:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1742340273; x=1742945073; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=zYuUOdSwt7gcTEjgg0vjyAebV+1EDCjlpvkJSkWhiM8=; b=oWNR4qXYJPa9+TDZh6Ei/+ydwh0IfYqfbp025MflL7c2f8tXhXIMtzGEW/u8PDqvHn 9C0U4kBAdKoJGhL5rABnoUkq+lkfN44/jSrtB79clWmVjN3wIPJWpy4gggdpJcAbmM7+ cWjctqDH9fvEKa7bqDPruQPds2GRb4YPrDZRKRlzyv43TWF65Mz3sBFnqEW68VFR1S41 JyFbPIdZbE0YsP43MoQrnZ5X2Q89vAJc8CKWNDBX8IZHn9HOVHCMYVa7kZHIbk5cByIO ReCF8RlMkAdj1hx0keox7sRJeyTbMqCkuOl43MayszjSAcyRxMav4A5oSBIyyQxnEPFj oRiA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742340273; x=1742945073; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=zYuUOdSwt7gcTEjgg0vjyAebV+1EDCjlpvkJSkWhiM8=; b=OsIfil7PV6K1gjJ1SimWLW68+VH22v7bpVDz8BO0fECpaige+qkzcGChoXAuhRvexW x/P6IGtGc5YRui7ZDAI/3dpXLXTQ7Ol7qngS6tkV/YlfaoOzIdbjMW4IuER0Vd6OjpRf sHYo9p8/JqhdWdpjL2BZUdE3jMuzu/sca6TMdUJwR2uKebSS8OIREfHRvnYSKFklAayy MAHid/GbVQZ5gmYgLPsqD9YS6uTerp300NaAkTjFetK7LaNu+eXo88UTqOU5anJRoK/x luR9V/+086jxv3ilZQl0VjPN4BW/9OnIHaQx0AFSPaLZD57UsCOxJgOM/Pg/WT5UHvCx k79A== X-Gm-Message-State: AOJu0YyvXmsQmGVQt8C9noMZvR2NomnmJHJ4j1m/6vk5eaYl2v6ZWoAS 8Zk5KFUQYwYgXBmhgfZAsqOsngMCcNBI/OlXUC9d0pM4zTnPGsNUU7XiE0mmGTzjIN575KP/weP cm3NB1FatZZyjwHBpmy4J6fs9PkHydsg4fnoCI6s+YWr3zN0z5f5pGn6Ap857SFyU1+grL3uixK uDkO1r+96H0WFjgn689f/gilV6Cd2h4yypWlOI8kU= X-Google-Smtp-Source: AGHT+IEibM7gnY3bUv7up703qGv4MtubFUyULRH1ANFX7JiawSHCRFQfv29tKIFI4RbgQ/jhyVjPNggAG9nH5w== X-Received: from pjbpw8.prod.google.com ([2002:a17:90b:2788:b0:2fa:15aa:4d2b]) (user=steadmon job=prod-delivery.src-stubby-dispatcher) by 2002:a17:90b:180f:b0:2ef:114d:7bf8 with SMTP id 98e67ed59e1d1-301bde359demr739527a91.6.1742340272576; Tue, 18 Mar 2025 16:24:32 -0700 (PDT) Date: Tue, 18 Mar 2025 16:24:22 -0700 In-Reply-To: Precedence: bulk X-Mailing-List: git@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: X-Mailer: git-send-email 2.49.0.rc1.451.g8f38331e32-goog Message-ID: <8bd61ee5dd33d0529240b677caaff361876ec271.1742339107.git.josh@steadmon.net> Subject: [RFC PATCH v1 4/4] libgit-sys: exclude unnecessary directories in git-src From: Josh Steadmon To: git@vger.kernel.org Cc: "brian m. carlson" We can avoid copying tens of megabytes of unnecessary source files by excluding a few directories which are not needed to compile libgitpub.a. This helps us stay below crates.io's 10 MB size limit. Signed-off-by: Josh Steadmon --- Makefile | 14 +++++++++++++- contrib/libgit-sys/Cargo.toml | 12 ++++++++++++ contrib/libgit-sys/build.rs | 8 +++++++- 3 files changed, 32 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index e7d8786e4e..c75f1d0208 100644 --- a/Makefile +++ b/Makefile @@ -651,6 +651,7 @@ export prefix bindir sharedir sysconfdir perllibdir localedir CC = cc AR = ar RM = rm -f +RMDIR = rmdir --ignore-fail-on-non-empty DIFF = diff TAR = tar FIND = find @@ -3477,13 +3478,13 @@ coccicheck-pending: $(COCCICHECK_PATCHES_PENDING_INTREE) # "Sub"-Makefiles, not really because they can't be run stand-alone, # only there to contain directory-specific rules and variables +ifndef NO_GITWEB ## gitweb/Makefile inclusion: MAK_DIR_GITWEB = gitweb/ include gitweb/Makefile .PHONY: gitweb gitweb: $(MAK_DIR_GITWEB_ALL) -ifndef NO_GITWEB all:: gitweb endif @@ -3763,7 +3764,9 @@ clean: profile-clean coverage-clean cocciclean $(RM) -r .dist-tmp-dir .doc-tmp-dir $(RM) $(GIT_TARNAME).tar.gz $(RM) $(htmldocs).tar.gz $(manpages).tar.gz +ifndef INCLUDE_LIBGIT_RS $(MAKE) -C Documentation/ clean +endif $(RM) Documentation/GIT-EXCLUDED-PROGRAMS ifndef PRESERVE_LIBGIT_TARGET $(RM) -r contrib/libgit-sys/target contrib/libgit-rs/target @@ -3775,7 +3778,9 @@ ifndef NO_PERL $(RM) -r perl/build/ endif $(MAKE) -C templates/ clean +ifndef INCLUDE_LIBGIT_RS $(MAKE) -C t/ clean +endif ifndef NO_TCLTK $(MAKE) -C gitk-git clean $(MAKE) -C git-gui clean @@ -3798,6 +3803,13 @@ ifdef MSVC $(RM) compat/vcbuild/MSVC-DEFS-GEN endif +# Handle additional cleanup needed for running `cargo package` for libgit-sys. +ifdef INCLUDE_LIBGIT_RS +libgit-pkg-clean: clean + $(RMDIR) t/helper t/unit-tests/clar t/unit-tests t + $(RMDIR) oss-fuzz +endif + .PHONY: all install profile-clean cocciclean clean strip .PHONY: shell_compatibility_test please_set_SHELL_PATH_to_a_more_modern_shell .PHONY: FORCE diff --git a/contrib/libgit-sys/Cargo.toml b/contrib/libgit-sys/Cargo.toml index e0623022c3..4b8facccfe 100644 --- a/contrib/libgit-sys/Cargo.toml +++ b/contrib/libgit-sys/Cargo.toml @@ -7,6 +7,18 @@ links = "gitpub" rust-version = "1.63" # TODO: Once we hit 1.84 or newer, we may want to remove Cargo.lock from # version control. See https://lore.kernel.org/git/Z47jgK-oMjFRSslr@tapette.crustytoothpaste.net/ description = "Native bindings to a portion of libgit" +exclude = [ + "git-src/.github", + "git-src/ci", + "git-src/Documentation", + "git-src/git-gui", + "git-src/gitk-git", + "git-src/gitweb", + "git-src/oss-fuzz", + "git-src/perl", + "git-src/po", + "git-src/t" +] [lib] path = "src/lib.rs" diff --git a/contrib/libgit-sys/build.rs b/contrib/libgit-sys/build.rs index 16e0d66afb..0a72040726 100644 --- a/contrib/libgit-sys/build.rs +++ b/contrib/libgit-sys/build.rs @@ -17,6 +17,9 @@ pub fn main() -> std::io::Result<()> { .current_dir(git_root.clone()) .args([ "INCLUDE_LIBGIT_RS=YesPlease", + "NO_GITWEB=YesPlease", + "NO_PERL=YesPlease", + "NO_TCLTK=YesPlease", "contrib/libgitpub/libgitpub.a", ]) .output() @@ -40,8 +43,11 @@ pub fn main() -> std::io::Result<()> { .current_dir(git_root.clone()) .args([ "INCLUDE_LIBGIT_RS=YesPlease", + "NO_GITWEB=YesPlease", + "NO_PERL=YesPlease", + "NO_TCLTK=YesPlease", "PRESERVE_LIBGIT_TARGET=YesPlease", - "clean", + "libgit-pkg-clean", ]) .output() .expect("`make clean` failed to run");