[pkg-config] Handle whitespaces while parsing pc files.

Author: aciidgh

Sources/Build/PkgConfig.swift

@@ -95,10 +95,10 @@ struct PkgConfigParser {
 
         let file = File(path: self.pcFile)
         for line in try file.enumerate() {
-            // Ignore any commented line.
-            if line.hasPrefix("#") || line.isEmpty { continue }
-            // Remove any trailing comment from the line.
-            let line = removeComment(line: line)
+            // Remove commented or any trailing comment from the line.
+            let uncommentedLine = removeComment(line: line)
+            // Ignore any empty or whitespace line.
+            guard let line = uncommentedLine.chuzzle() else { continue }
 
             if let colonIndex = line.characters.index(of: ":") where
                 line.endIndex == colonIndex.successor() || line[colonIndex.successor()] == " " {
@@ -120,9 +120,9 @@ struct PkgConfigParser {
         if line.hasPrefix("Requires: ") {
             dependencies = try parseDependencies(resolveVariables(value(line: line)))
         } else if line.hasPrefix("Libs: ") {
-            libs = try resolveVariables(value(line: line)).chomp()
+            libs = try resolveVariables(value(line: line))
         } else if line.hasPrefix("Cflags: ") {
-            cFlags = try resolveVariables(value(line: line)).chomp()
+            cFlags = try resolveVariables(value(line: line))
         }
     }
 

Tests/Build/PkgConfigParserTests.swift

@@ -19,8 +19,8 @@ final class PkgConfigParserTests: XCTestCase {
             guard let parser = parser else { XCTFail("Unexpected parsing error"); return}
             XCTAssertEqual(parser.variables, ["libdir": "/usr/local/Cellar/gtk+3/3.18.9/lib", "gtk_host": "x86_64-apple-darwin15.3.0", "includedir": "/usr/local/Cellar/gtk+3/3.18.9/include", "prefix": "/usr/local/Cellar/gtk+3/3.18.9", "gtk_binary_version": "3.0.0", "exec_prefix": "/usr/local/Cellar/gtk+3/3.18.9", "targets": "quartz"])
             XCTAssertEqual(parser.dependencies, ["gdk-3.0", "atk", "cairo", "cairo-gobject", "gdk-pixbuf-2.0", "gio-2.0"])
-            XCTAssertEqual(parser.cFlags, "-I/usr/local/Cellar/gtk+3/3.18.9/include/gtk-3.0 ")
-            XCTAssertEqual(parser.libs, "-L/usr/local/Cellar/gtk+3/3.18.9/lib -lgtk-3 ")
+            XCTAssertEqual(parser.cFlags, "-I/usr/local/Cellar/gtk+3/3.18.9/include/gtk-3.0")
+            XCTAssertEqual(parser.libs, "-L/usr/local/Cellar/gtk+3/3.18.9/lib -lgtk-3")
         }
     }
 
@@ -30,7 +30,7 @@ final class PkgConfigParserTests: XCTestCase {
             XCTAssertEqual(parser.variables, ["prefix": "/usr/local/bin", "exec_prefix": "/usr/local/bin"])
             XCTAssertEqual(parser.dependencies, ["gdk-3.0", "atk"])
             XCTAssertEqual(parser.cFlags, "")
-            XCTAssertEqual(parser.libs, "-L/usr/local/bin -lgtk-3 ")
+            XCTAssertEqual(parser.libs, "-L/usr/local/bin -lgtk-3")
         }
     }
 
@@ -40,7 +40,7 @@ final class PkgConfigParserTests: XCTestCase {
             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 ")
+            XCTAssertEqual(parser.libs, "-L/usr/local/bin -lgtk-3")
         }
     }