Merge pull request #694 from imjasonh/pc

log and continue when .pc file can't be loaded
chainguard-dev · Sep 19, 2023 · 4495533 · 4495533
2 parents 5ba8539 + a5722a6
commit 4495533
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/pkg/build/package.go b/pkg/build/package.go
@@ -595,7 +595,7 @@ func generatePkgConfigDeps(pc *PackageBuild, generated *config.Dependencies) err
 			return err
 		}
 
-		if !strings.Contains(path, ".pc") {
+		if !strings.HasSuffix(path, ".pc") {
 			return nil
 		}
 
@@ -614,7 +614,8 @@ func generatePkgConfigDeps(pc *PackageBuild, generated *config.Dependencies) err
 
 		pkg, err := pkgconfig.Load(filepath.Join(pc.WorkspaceSubdir(), path))
 		if err != nil {
-			return err
+			pc.Logger.Printf("WARNING: Unable to load .pc file (%s) using pkgconfig: %v", path, err)
+			return nil
 		}
 
 		pcName := filepath.Base(path)