[pkg-config] Resolve variables in dependencies

Author: aciidgh

Sources/Build/PkgConfig.swift

@@ -118,7 +118,7 @@ struct PkgConfigParser {
 
     private mutating func parseKeyValue(line: String) throws {
         if line.hasPrefix("Requires: ") {
-            dependencies = try parseDependencies(value(line: line))
+            dependencies = try parseDependencies(resolveVariables(value(line: line)))
         } else if line.hasPrefix("Libs: ") {
             libs = try resolveVariables(value(line: line)).chomp()
         } else if line.hasPrefix("Cflags: ") {

Tests/Build/PkgConfigParserTests.swift

@@ -32,6 +32,15 @@ final class PkgConfigParserTests: XCTestCase {
         }
     }
 
+    func testVariableinDependency() {
+        loadPCFile("deps_variable.pc") { parser in
+            XCTAssertEqual(parser.variables, ["prefix": "/usr/local/bin", "exec_prefix": "/usr/local/bin", "my_dep": "atk"])
+            XCTAssertEqual(parser.dependencies, ["gdk-3.0", "atk"])
+            XCTAssertEqual(parser.cFlags, "-I")
+            XCTAssertEqual(parser.libs, "-L/usr/local/bin -lgtk-3 ")
+        }
+    }
+    
     private func loadPCFile(_ inputName: String, line: UInt = #line, body: (PkgConfigParser) -> Void) {
         do {
             let input = Path.join(#file, "../pkgconfigInputs", inputName).normpath

Tests/Build/pkgconfigInputs/deps_variable.pc

@@ -0,0 +1,8 @@
+prefix=/usr/local/bin
+exec_prefix=${prefix}
+my_dep=atk
+#some comment
+
+Requires: gdk-3.0 >= 1.0.0 ${my_dep}
+Libs: -L${prefix} -lgtk-3 
+Cflags: -I