Module Name: pkgsrc
Committed By: rillig
Date: Sun Nov 24 07:21:58 UTC 2024
Modified Files:
pkgsrc/pkgtools/url2pkg/files: url2pkg.py
Log Message:
pkgtools/url2pkg: fix distinfo generation for Rust packages
A Rust package needs a second invocation of 'bmake distinfo', as the
contents of its Cargo.lock file ends up as direct distfiles, not as
dependencies.
To generate a diff of this commit:
cvs rdiff -u -r1.57 -r1.58 pkgsrc/pkgtools/url2pkg/files/url2pkg.py
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/pkgtools/url2pkg/files/url2pkg.py
diff -u pkgsrc/pkgtools/url2pkg/files/url2pkg.py:1.57 pkgsrc/pkgtools/url2pkg/files/url2pkg.py:1.58
--- pkgsrc/pkgtools/url2pkg/files/url2pkg.py:1.57 Sat Nov 23 22:30:30 2024
+++ pkgsrc/pkgtools/url2pkg/files/url2pkg.py Sun Nov 24 07:21:58 2024
@@ -1,5 +1,5 @@
#! @PYTHONBIN@
-# $NetBSD: url2pkg.py,v 1.57 2024/11/23 22:30:30 rillig Exp $
+# $NetBSD: url2pkg.py,v 1.58 2024/11/24 07:21:58 rillig Exp $
# Copyright (c) 2019 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -1283,7 +1283,7 @@ class Adjuster:
if self.cargo_crate_depends:
lines = Lines()
- lines.add('# $NetBSD: url2pkg.py,v 1.57 2024/11/23 22:30:30 rillig Exp $')
+ lines.add('# $NetBSD: url2pkg.py,v 1.58 2024/11/24 07:21:58 rillig Exp $')
lines.add('')
for dep in self.cargo_crate_depends:
lines.add(f'CARGO_CRATE_DEPENDS+=\t{dep}')
@@ -1327,8 +1327,11 @@ def main(argv: List[str], g: Globals):
f'(.../pkgsrc/category[/package])')
initial_lines = Generator(url).generate_package(g)
- Adjuster(g, url, initial_lines).adjust()
+ adjuster = Adjuster(g, url, initial_lines)
+ adjuster.adjust()
g.bmake('clean')
+ if adjuster.cargo_crate_depends:
+ g.bmake('distinfo')
g.bmake('extract')
g.out.write('\n')