Attachment 245445 Details for Bug 273280 – v1

[patch] v1

patch-Mk_Scripts_cargo-crates-git-configure.awk (text/plain), 1.52 KB, created by Mikael Urankar on 2023-10-05 10:39:45 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mikael Urankar

Created: 2023-10-05 10:39:45 UTC

Size: 1.52 KB

patch

obsolete

>diff --git a/Mk/Scripts/cargo-crates-git-configure.awk b/Mk/Scripts/cargo-crates-git-configure.awk
>index ade8718e44f6..bb2884479d22 100644
>--- a/Mk/Scripts/cargo-crates-git-configure.awk
>+++ b/Mk/Scripts/cargo-crates-git-configure.awk
>@@ -90,8 +90,8 @@ function find_replaced_crates(input, output,		in_patch_crates_io, line, cols) {
> 	close(output)
> }
> 
>-function add_crates_io_patches(		header_printed, cmd, cargotoml, source, crates) {
>-	header_printed = 0
>+function add_crates_io_patches(		print_header, local_crates, cmd, cargotoml, source, crates) {
>+	print_header = 0
> # --exclude-dir not supported on FreeBSD < 13
> #	cmd = GREP " --include='*/Cargo.toml' --exclude-dir='" CARGO_VENDOR_DIR "' -Flr 'patch.crates-io' " WRKSRC
> 	cmd = FIND " " WRKSRC " -name Cargo.toml -not -path '" CARGO_VENDOR_DIR "/*' -exec " GREP " -Flr 'patch.crates-io' {} \\\+"
>@@ -106,16 +106,20 @@ function add_crates_io_patches(		header_printed, cmd, cargotoml, source, crates)
> 				split(source_crates[source], crates)
> 				for (j in crates) {
> 					if (replaced_crates[crates[j]]) {
>-						if (!header_printed) {
>-							printf("[patch.crates-io]\n")
>-							header_printed = 1
>-						}
>-						printf("%s = { path = '%s' }\n", crates[j], get_source_dir(source, crates[j]))
>+						print_header = 1
>+						local_crates[crates[j]] = get_source_dir(source, crates[j])
> 					}
> 				}
> 			}
> 		}
> 	}
>+	if (print_header == 1) {
>+		printf("[patch.crates-io]\n")
>+
>+		for (i in local_crates) {
>+			printf("%s = { path = '%s' }\n", i, local_crates[i])
>+		}
>+	}
> 	close(cmd)
> }
>

Flags:

tobik: maintainer-approval+

Actions: View | Diff

Attachments on bug 273280: 244277 | 245254 | 245445