diff options
author | Nirbheek Chauhan <nirbheek@centricular.com> | 2022-12-11 01:57:22 +0530 |
---|---|---|
committer | GStreamer Marge Bot <gitlab-merge-bot@gstreamer-foundation.org> | 2022-12-11 00:42:32 +0000 |
commit | 49f38fc9cbaf82197bcf956dd652af5e92b8da10 (patch) | |
tree | 4bac838410af21aacc5683cbb0e74be5e7db0e2d | |
parent | dedb8e580f865e2541b8cb19dace8830030c43d3 (diff) |
osx: Fix iOS/macOS packaging by using normalized pkgconfig paths
While creating a framework for iOS and macOS, the code was performing
the following steps:
1. Fetch a list of all files in all recipes
2. Make a list of all include_dirs from pkg-config for all recipes
3. Copy files from the list of all files that are inside the
include_dirs
(3) was literally doing a `foo in bar` substring check that was
failing because the include_dirs paths now contain relative path
components. Fix it by always returning absolute normalized paths
from the Pkgconfig module.
Part-of: <https://gitlab.freedesktop.org/gstreamer/cerbero/-/merge_requests/1049>
-rw-r--r-- | cerbero/ide/pkgconfig.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cerbero/ide/pkgconfig.py b/cerbero/ide/pkgconfig.py index a4972709..c12716f2 100644 --- a/cerbero/ide/pkgconfig.py +++ b/cerbero/ide/pkgconfig.py @@ -91,8 +91,8 @@ class PkgConfig(object): for p in d: if not os.path.isabs(p): raise FatalError("pkg-config file %s contains relative include dir %s" % (pc, p)) - - include_dirs.extend(pkgconfig.include_dirs()) + # Normalize before appending + include_dirs.append(os.path.abspath(p)) return list(set(include_dirs)) @staticmethod |