From 897e3559570404c27c3e239344bbe846849d2050 Mon Sep 17 00:00:00 2001 From: sergio Date: Tue, 23 Jun 2026 13:02:21 -0400 Subject: [PATCH] =?UTF-8?q?Etapa=20G:=20prep=20frontera=20git2=20=E2=80=94?= =?UTF-8?q?=20cargo-audit/generate/outdated=20(openssl=20+=20libgit2=20ven?= =?UTF-8?q?dored)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Aplica el mismo patrón openssl a los cargo-* (dep 'openssl' ⇒ OPENSSL_DIR) y deja que libgit2-sys vendoree su propio libgit2 con cmake (sin dep espuria). cargo-audit: además 'cargo auditable'→'cargo build', fix path '../target'→'target', dep 'openssl-dev>3'→'openssl'. Quedan staged para la próxima granja (validar el vendoring de libgit2 con zig-cc/cmake). Co-Authored-By: Claude Opus 4.8 --- recipes/incoming/cargo-audit.toml | 6 +++--- recipes/incoming/cargo-generate.toml | 3 +++ recipes/incoming/cargo-outdated.toml | 3 +++ 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/recipes/incoming/cargo-audit.toml b/recipes/incoming/cargo-audit.toml index 69d11711..ec6f4b78 100644 --- a/recipes/incoming/cargo-audit.toml +++ b/recipes/incoming/cargo-audit.toml @@ -20,18 +20,18 @@ flags = [] # de build() de Alpine (traducido; el lab provee $CBUILD/$CHOST — Etapa G Fase 3; revisá --shared para estático): compile = ''' _abuild_phase() { -cargo auditable build --release --frozen --features fix +cargo build --release --frozen --features fix } _abuild_phase ''' # de package() de Alpine (traducido $pkgdir→/out): install = ''' _abuild_phase() { -install -Dm 755 ../target/release/cargo-audit -t "/out/usr/bin" +install -Dm 755 target/release/cargo-audit -t "/out/usr/bin" install -Dm 644 -t "/out/usr/share/doc/cargo-audit" README.md } _abuild_phase ''' [deps] -build = ["openssl-dev>3"] +build = ["openssl"] diff --git a/recipes/incoming/cargo-generate.toml b/recipes/incoming/cargo-generate.toml index d6768a72..db17ef62 100644 --- a/recipes/incoming/cargo-generate.toml +++ b/recipes/incoming/cargo-generate.toml @@ -20,3 +20,6 @@ install = "mkdir -p /out/usr/bin && cp target/release/cargo-generate /out/usr/bi # buildInputs de nix (NO deps de hammer — cargo vendorea; backend Rust por # defecto). Si algún sys-crate C falla, adaptá per-paquete (patch/feature): git-minimal, libgit2, openssl + +[deps] +build = ["openssl"] diff --git a/recipes/incoming/cargo-outdated.toml b/recipes/incoming/cargo-outdated.toml index c4bbdffd..62b8803f 100644 --- a/recipes/incoming/cargo-outdated.toml +++ b/recipes/incoming/cargo-outdated.toml @@ -20,3 +20,6 @@ install = "mkdir -p /out/usr/bin && cp target/release/cargo-outdated /out/usr/bi # buildInputs de nix (NO deps de hammer — cargo vendorea; backend Rust por # defecto). Si algún sys-crate C falla, adaptá per-paquete (patch/feature): openssl + +[deps] +build = ["openssl"]