summaryrefslogtreecommitdiff
path: root/mk/package.mk
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2014-06-15 13:09:33 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2014-06-15 13:13:14 +0200
commitbf8903fa567e5c1b5d923c6f1c0aeb1d2fd1192a (patch)
tree64691c16412c4788e2f242abeb418187231d0ec8 /mk/package.mk
parentbf3ec139fd4c0996463d221478eb8ce82694e6de (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/package.mk')
-rw-r--r--mk/package.mk18
1 files changed, 10 insertions, 8 deletions
diff --git a/mk/package.mk b/mk/package.mk
index 24650acce..b8039fb5a 100644
--- a/mk/package.mk
+++ b/mk/package.mk
@@ -10,22 +10,23 @@ CONFIGURE_ARGS+= --enable-debug
endif
endif
-AUTOTOOL_ENV+= AUTOM4TE='${STAGING_HOST_DIR}/usr/bin/autom4te' \
+AUTOTOOL_ENV+= PATH='${AUTOTOOL_PATH}' \
+ AUTOM4TE='${STAGING_HOST_DIR}/usr/bin/autom4te' \
M4='${STAGING_HOST_DIR}/usr/bin/m4' \
- LIBTOOLIZE='${STAGING_HOST_DIR}/usr/bin/libtoolize -q' \
- PATH='${AUTOTOOL_PATH}'
+ LIBTOOLIZE='${STAGING_HOST_DIR}/usr/bin/libtoolize -q'
-CONFIGURE_ENV+= GCC_HONOUR_COPTS=s \
+CONFIGURE_ENV+= PATH='${TARGET_PATH}' \
+ GCC_HONOUR_COPTS=s \
AUTOM4TE=${STAGING_HOST_DIR}/usr/bin/autom4te \
M4='${STAGING_HOST_DIR}/usr/bin/m4' \
LIBTOOLIZE='${STAGING_HOST_DIR}/usr/bin/libtoolize -q' \
- PATH='${TARGET_PATH}' \
CONFIG_SHELL='$(strip ${SHELL})' \
CFLAGS='$(strip ${TARGET_CFLAGS})' \
CXXFLAGS='$(strip ${TARGET_CXXFLAGS})' \
CPPFLAGS='$(strip ${TARGET_CPPFLAGS})' \
LDFLAGS='$(strip ${TARGET_LDFLAGS})' \
- PKG_CONFIG_LIBDIR='${STAGING_TARGET_DIR}/usr/lib/pkgconfig' \
+ PKG_CONFIG_LIBDIR='${STAGING_TARGET_DIR}/usr/lib/pkgconfig:${STAGING_TARGET_DIR}/usr/share/pkgconfig' \
+ PKG_CONFIG_SYSROOT_DIR='${STAGING_TARGET_DIR}' \
ac_cv_func_realloc_0_nonnull=yes \
ac_cv_func_malloc_0_nonnull=yes \
cross_compiling=yes \
@@ -55,8 +56,9 @@ MAKE_ENV+= $(GCC_CHECK) \
CXXFLAGS='$(strip ${TARGET_CXXFLAGS})' \
CPPFLAGS='$(strip ${TARGET_CPPFLAGS})' \
LDFLAGS='$(strip ${TARGET_LDFLAGS})' \
+ PKG_CONFIG_LIBDIR='${STAGING_TARGET_DIR}/usr/lib/pkgconfig:${STAGING_TARGET_DIR}/usr/share/pkgconfig' \
+ PKG_CONFIG_SYSROOT_DIR='${STAGING_TARGET_DIR}' \
${HOST_CONFIGURE_OPTS} \
- PKG_CONFIG_LIBDIR='${STAGING_TARGET_DIR}/usr/lib/pkgconfig' \
${TARGET_CONFIGURE_OPTS}
MAKE_FLAGS+= ${XAKE_FLAGS} V=1
@@ -247,7 +249,7 @@ ifeq (,$(filter noremove,$(7)))
endif
@rm -f '$${STAGING_PKG_DIR}/$(1)'
ifeq (,$(filter nostaging,$(7)))
- -@cd $${IDIR_$(1)}; \
+ @-cd $${IDIR_$(1)}; \
x=$$$$(find tmp var -mindepth 1 2>/dev/null); if [[ -n $$$$x ]]; then \
echo 'WARNING: $${IPKG_$(1)} installs files into a' \
'ramdisk location:' >&2; \