Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/pkg-config.rb
Original file line number Diff line number Diff line change
Expand Up @@ -690,7 +690,7 @@ def parse_pc

def parse_requires(requires)
return [] if requires.nil?
requires_without_version = requires.gsub(/(?:<|>|<=|>=|=)\s*[\d.a-zA-Z_-]+\s*/, "")
requires_without_version = requires.gsub(/(?:!=|<=|>=|<|>|=)\s*[^,\s]+\s*/, " ")
requires_without_version.split(/[,\s]+/)
end

Expand Down
5 changes: 5 additions & 0 deletions test/test-pkg-config.rb
Original file line number Diff line number Diff line change
Expand Up @@ -313,6 +313,11 @@ def test_equals_to
assert_equal(["fribidi"],
parse_requires("fribidi = 1.0"))
end

def test_multiple_requirements_with_compact_constraints
assert_equal(["foo", "bar", "baz"],
parse_requires("foo>=1.2 bar != 2.0, baz=3.0"))
end
end

sub_test_case("#merge_back_cflags") do
Expand Down