diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-06-15 13:09:33 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-06-15 13:13:14 +0200 |
| commit | bf8903fa567e5c1b5d923c6f1c0aeb1d2fd1192a (patch) | |
| tree | 64691c16412c4788e2f242abeb418187231d0ec8 /mk/pkg-bottom.mk | |
| parent | bf3ec139fd4c0996463d221478eb8ce82694e6de (diff) | |
cleanup HOST_STYLE, use SYSROOT feature for pkgconf
there are three HOST_STYLE's, not set mean fully automatic installation.
auto means prefix is set to /usr and DESTDIR is set to STAGING_HOST_DIR.
When using manual, you need to provide your own targets.
Instead of using sed to modify *.pc files, use PKG_SYSROOT feature, which does
work better and avoids pathcing some pc files. Idea from sh4rm via #musl.
Diffstat (limited to 'mk/pkg-bottom.mk')
| -rw-r--r-- | mk/pkg-bottom.mk | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/mk/pkg-bottom.mk b/mk/pkg-bottom.mk index 4df541ca4..2972ffcfe 100644 --- a/mk/pkg-bottom.mk +++ b/mk/pkg-bottom.mk @@ -135,12 +135,6 @@ endif echo "scripts/$$(basename $$a)" \ >>'${STAGING_PKG_DIR}/${PKG_NAME}.scripts'; \ done - @for a in ${WRKINST}/usr/lib/pkgconfig/*.pc; do \ - [[ -e $$a ]] || continue; \ - sed -e "s,^prefix=.*,prefix=${STAGING_TARGET_DIR}/usr," \ - -e "s,^prefix = .*,prefix = ${STAGING_TARGET_DIR}/usr," $$a > \ - ${STAGING_TARGET_DIR}/usr/lib/pkgconfig/$$(basename $$a); \ - done ifeq (,$(filter noremove,${PKG_OPTS})) @if test -s '${STAGING_PKG_DIR}/${PKG_NAME}'; then \ cd '${STAGING_TARGET_DIR}'; \ @@ -169,7 +163,7 @@ endif ifeq (,$(filter nostaging,${PKG_OPTS})) @-cd ${WRKINST}; \ find usr ! -type d 2>/dev/null | \ - grep -E -v -e '^usr/lib/pkgconfig' -e '^usr/share' -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/libpthread_nonshared.a' | \ + grep -E -v -e '^usr/share' -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/libpthread_nonshared.a' | \ tee '${STAGING_PKG_DIR}/${PKG_NAME}' | \ $(STAGING_HOST_DIR)/usr/bin/cpio -padlmu '${STAGING_TARGET_DIR}' @cd '${STAGING_TARGET_DIR}'; grep 'usr/lib/.*\.la$$' \ |