fix: Honor the ${pcfiledir} entries in pkgconfig

craft_parts/packages/normalize.py

@@ -185,10 +185,14 @@ def fix_pkg_config(
         f"^prefix=(?P<trim>{'|'.join(prefixes_to_trim)})(?P<prefix>.*)"
     )
     pattern = re.compile("^prefix=(?P<prefix>.*)")
+    pattern_pcfiledir = re.compile("^prefix *= *[$]{pcfiledir}.*")
 
     # process .pc file
     with fileinput.input(pkg_config_file, inplace=True) as input_file:
         for line in input_file:
+            if pattern_pcfiledir.search(line) is not None:
+                print(line, end="")
+                continue
             match = pattern.search(line)
             match_trim = pattern_trim.search(line)
 

docs/reference/changelog.rst

@@ -9,6 +9,7 @@ Bug fixes:
 
 - Make sure the :ref:`uv plugin<craft_parts_uv_plugin>` is re-entrant on
   source changes.
+- Preserve the ``pcfiledir`` tag in ``pkgconfig`` files.
 
 Documentation:
 

tests/unit/packages/test_normalize.py

@@ -365,6 +365,18 @@ def test_normalize_fix_pkg_config(
             f"{tmpdir}/usr"
         )
 
+    def test_normalize_fix_pkg_config_with_pcfiledir(
+        self, tmpdir, pkg_config_file, expected_pkg_config_content
+    ):
+        """Verify normalization fixes pkg-config files."""
+        pc_file = tmpdir / "my-file.pc"
+        pkg_config_file(pc_file, "${pcfiledir}/../../..")
+        normalize(tmpdir, repository=DummyRepository)
+
+        assert pc_file.read_text(encoding="utf-8") == expected_pkg_config_content(
+            "${pcfiledir}/../../.."
+        )
+
     def test_fix_pkg_config_is_dir(self, tmpdir):
         """Verify directories ending in .pc do not raise an error."""
         pc_file = tmpdir / "granite.pc"