Skip to content

Commit 49f5640

Browse files
committed
Problem: still failing to build complex packages
Solution: ensure all transitive requirements are included
1 parent d2fcbe5 commit 49f5640

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

exe/pgpm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ module Pgpm
112112
arch.with_scope do
113113
selected_pgdist.with_scope do
114114
pkgs = pkgs.flat_map do |pkg|
115-
[pkg, *pkg.requires]
115+
[pkg, *pkg.all_requirements]
116116
end.reject(&:contrib?)
117117

118118
b = pkgs.reduce(nil) do |c, p|

lib/pgpm/package/dependencies.rb

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,10 @@ def requires
1717
[]
1818
end
1919

20+
def all_requirements
21+
requires.flat_map { |r| [r, *r.all_requirements] }.uniq
22+
end
23+
2024
def c_files_present?
2125
Dir.glob("*.c", base: source).any?
2226
end

0 commit comments

Comments
 (0)