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/host.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/host.mk')
| -rw-r--r-- | mk/host.mk | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/mk/host.mk b/mk/host.mk index 448848181..694334589 100644 --- a/mk/host.mk +++ b/mk/host.mk @@ -6,11 +6,12 @@ ifneq (,$(findstring host,$(MAKECMDGOALS))) WRKDIR?= ${HOST_BUILD_DIR}/w-${PKG_NAME}-${PKG_VERSION}-${PKG_RELEASE}-host endif -HOST_CONFIGURE_ENV+= AUTOM4TE=${STAGING_HOST_DIR}/usr/bin/autom4te \ +HOST_CONFIGURE_ENV+= PATH='${HOST_PATH}' \ + AUTOM4TE=${STAGING_HOST_DIR}/usr/bin/autom4te \ CONFIG_SHELL='$(strip ${SHELL})' \ - PKG_CONFIG_LIBDIR='${STAGING_HOST_DIR}/usr/lib/pkgconfig' \ + PKG_CONFIG_LIBDIR='${STAGING_HOST_DIR}/usr/lib/pkgconfig:${STAGING_HOST_DIR}/usr/share/pkgconfig' \ + PKG_CONFIG_SYSROOT_DIR='${STAGING_HOST_DIR}' \ PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1 \ - PATH='${HOST_PATH}' \ CC='$(strip ${CC_FOR_BUILD})' \ CFLAGS='$(strip ${CFLAGS_FOR_BUILD})' \ CXXFLAGS='$(strip ${CXXFLAGS_FOR_BUILD})' \ @@ -29,7 +30,8 @@ HOST_ALL_TARGET?= all HOST_INSTALL_TARGET?= install HOST_MAKE_ENV+= PATH='${HOST_PATH}' \ - PKG_CONFIG_LIBDIR='${STAGING_HOST_DIR}/usr/lib/pkgconfig' \ + PKG_CONFIG_LIBDIR='${STAGING_HOST_DIR}/usr/lib/pkgconfig:${STAGING_HOST_DIR}/usr/share/pkgconfig' \ + PKG_CONFIG_SYSROOT_DIR='${STAGING_HOST_DIR}' \ PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1 \ CC='$(strip ${CC_FOR_BUILD})' \ CFLAGS='$(strip ${CFLAGS_FOR_BUILD})' \ |