diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2021-12-24 00:01:42 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2022-02-10 13:28:20 +0100 |
| commit | 694fdfb78db45ffb88e48f18c703020a10bdd9fa (patch) | |
| tree | c44766ad0dd477c42098ed30b86b5f41b8a73b6b /mk | |
| parent | d99ad35f684fd52f716e903a9111a25d512bc82d (diff) | |
fix meson builds searching for *.pc files
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/pkg-bottom.mk | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mk/pkg-bottom.mk b/mk/pkg-bottom.mk index b46e381de..424a42ca9 100644 --- a/mk/pkg-bottom.mk +++ b/mk/pkg-bottom.mk @@ -55,6 +55,7 @@ else ifneq ($(filter meson,${CONFIG_STYLE}),) (cd ${WRKSRC} && $(MESON_ENV) \ meson --prefix /usr --libdir lib \ --cross-file $(STAGING_HOST_DIR)/etc/meson/cross-compilation.conf \ + --build.pkg-config-path $(STAGING_HOST_DIR)/usr/lib/pkgconfig \ --buildtype release $(MESON_FLAGS) \ $(WRKSRC) $(WRKBUILD)) else ifneq ($(filter cmake,${CONFIG_STYLE}),) @@ -212,7 +213,7 @@ endif ifeq (,$(filter nostaging,${PKG_OPTS})) @-cd ${WRKINST}; \ find usr ! -type d 2>/dev/null | \ - grep -E -v -e '^usr/share' -e '^usr/src' -e '^usr/doc' -e '^usr/local' -e '^usr/man' -e '^usr/info' \ + grep -E -v -e '^usr/src' -e '^usr/doc' -e '^usr/local' -e '^usr/man' -e '^usr/info' \ -e '^usr/lib/libc.so' -e '^usr/bin/[a-z0-9-]+-config*' -e '^usr/lib/.*\.la$$' \ -e '^/usr/lib/libpthread_nonshared.a' | \ tee '${STAGING_PKG_DIR}/${PKG_NAME}' | \ |