diff options
Diffstat (limited to 'mk/pkg-bottom.mk')
| -rw-r--r-- | mk/pkg-bottom.mk | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/mk/pkg-bottom.mk b/mk/pkg-bottom.mk index 0dd93468d..d6ac45cc2 100644 --- a/mk/pkg-bottom.mk +++ b/mk/pkg-bottom.mk @@ -17,7 +17,7 @@ PKG_LIBNAME?= $(PKG_NAME) pre-configure: do-configure: post-configure: -${_CONFIGURE_COOKIE}: ${_PATCH_COOKIE} +${_CONFIGURE_COOKIE}: ${_HOST_COOKIE} ${_PATCH_COOKIE} @sed -e '/^#/d' ${REORDER_DEPENDENCIES} | \ tsort | while read f; do \ cd ${WRKSRC}; \ @@ -143,6 +143,7 @@ else @echo "Invalid INSTALL_STYLE '${INSTALL_STYLE}'" >&2 @exit 1 endif + env ${MAKE_ENV} ${MAKE} spkg-install $(MAKE_TRACE) @rm -f '${STAGING_PKG_DIR}/${PKG_NAME}.scripts' @for a in ${WRKINST}/usr/bin/*-config*; do \ [[ -e $$a ]] || continue; \ @@ -158,7 +159,6 @@ endif sed -e "s,^prefix=.*,prefix=${STAGING_TARGET_DIR}/usr," $$a > \ ${STAGING_DIR}/usr/lib/pkgconfig/$$(basename $$a); \ done - env ${MAKE_ENV} ${MAKE} spkg-install $(MAKE_TRACE) ifeq (,$(filter noremove,${PKG_OPTS})) @if test -s '${STAGING_PKG_DIR}/${PKG_NAME}'; then \ cd '${STAGING_DIR}'; \ @@ -169,21 +169,20 @@ ifeq (,$(filter noremove,${PKG_OPTS})) endif @rm -f '${STAGING_PKG_DIR}/${PKG_NAME}' ifneq (,$(filter dev,${PKG_OPTS})) - mkdir -p $(WRKDIR)/fake-${CPU_ARCH}/pkg-$(PKG_LIBNAME)-dev/usr/include - test -d ${WRKINST}/usr/include && cd ${WRKINST}/usr/include; \ + @mkdir -p $(WRKDIR)/fake-${CPU_ARCH}/pkg-$(PKG_LIBNAME)-dev/usr/include + @test -d ${WRKINST}/usr/include && cd ${WRKINST}/usr/include; \ find . -name \*.h | \ $(TOOLS_DIR)/cpio -padlmu $(WRKDIR)/fake-${CPU_ARCH}/pkg-$(PKG_LIBNAME)-dev/usr/include - mkdir -p $(WRKDIR)/fake-${CPU_ARCH}/pkg-$(PKG_LIBNAME)-dev/usr/lib/pkgconfig - test -d ${WRKINST}/usr/lib/pkgconfig && cd ${WRKINST}/usr/lib/pkgconfig; \ + @mkdir -p $(WRKDIR)/fake-${CPU_ARCH}/pkg-$(PKG_LIBNAME)-dev/usr/lib/pkgconfig + @test -d ${WRKINST}/usr/lib/pkgconfig && cd ${WRKINST}/usr/lib/pkgconfig; \ find . -name \*.pc | \ $(TOOLS_DIR)/cpio -padlmu $(WRKDIR)/fake-${CPU_ARCH}/pkg-$(PKG_LIBNAME)-dev/usr/lib/pkgconfig - for a in ${WRKINST}/usr/bin/*-config*; do \ + @for a in ${WRKINST}/usr/bin/*-config*; do \ [[ -e $$a ]] || continue; \ mkdir -p $(WRKDIR)/fake-${CPU_ARCH}/pkg-$(PKG_LIBNAME)-dev/usr/bin; \ cp $$a $(WRKDIR)/fake-${CPU_ARCH}/pkg-$(PKG_LIBNAME)-dev/usr/bin; \ chmod 755 $(WRKDIR)/fake-${CPU_ARCH}/pkg-$(PKG_LIBNAME)-dev/usr/bin/$$(basename $$a); \ done - #env ${MAKE_ENV} ${MAKE} ${PKG_LIBNAME}-dev-install $(MAKE_TRACE) endif @-cd ${WRKINST}; \ if [ "${PKG_NAME}" != "uClibc" -a "${PKG_NAME}" != "eglibc" -a "${PKG_NAME}" != "glibc" -a "${PKG_NAME}" != "libpthread" -a "${PKG_NAME}" != "libstdcxx" -a "${PKG_NAME}" != "libgcc" -a "${PKG_NAME}" != "libthread-db" -a "${PKG_NAME}" != "musl" ];then \ |