Tue Apr 8 11:50:46 2008 UTC ()
Force depend target to explicitly run for libfetch. Disallow parallel
builds in that part of the build. This works around issues with
bootstrap-mk-files not handling DPSRCS correctly.


(joerg)
diff -r1.150 -r1.151 pkgsrc/pkgtools/pkg_install/Makefile
cvs diff -r1.150 -r1.151 pkgsrc/pkgtools/pkg_install/Makefile (expand / switch to unified diff)

--- pkgsrc/pkgtools/pkg_install/Makefile 2008/04/04 15:21:32 1.150
+++ pkgsrc/pkgtools/pkg_install/Makefile 2008/04/08 11:50:46 1.151
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.150 2008/04/04 15:21:32 joerg Exp $ 1# $NetBSD: Makefile,v 1.151 2008/04/08 11:50:46 joerg Exp $
2 2
3# Notes to package maintainers: 3# Notes to package maintainers:
4# 4#
5# Updating this package does not automatically necessitate bumping 5# Updating this package does not automatically necessitate bumping
6# PKGTOOLS_REQD in bsd.pkg.mk. Do so if and only if there is a critical 6# PKGTOOLS_REQD in bsd.pkg.mk. Do so if and only if there is a critical
7# change in the pkg_* tools that pkgsrc relies on for proper operation. 7# change in the pkg_* tools that pkgsrc relies on for proper operation.
8 8
9DISTNAME= pkg_install-${VERSION} 9DISTNAME= pkg_install-${VERSION}
10CATEGORIES= pkgtools 10CATEGORIES= pkgtools
11MASTER_SITES= # empty 11MASTER_SITES= # empty
12DISTFILES= # empty 12DISTFILES= # empty
13 13
14MAINTAINER= joerg@NetBSD.org 14MAINTAINER= joerg@NetBSD.org
@@ -140,25 +140,28 @@ pre-configure: @@ -140,25 +140,28 @@ pre-configure:
140 cd ${WRKDIR}/bzip2 && ${BUILD_MAKE_CMD} libbz2.a 140 cd ${WRKDIR}/bzip2 && ${BUILD_MAKE_CMD} libbz2.a
141.endif 141.endif
142.if empty(USE_BUILTIN.zlib:M[yY][eE][sS]) 142.if empty(USE_BUILTIN.zlib:M[yY][eE][sS])
143 cd ${WRKDIR}/zlib && ${BUILD_MAKE_CMD} libz.a 143 cd ${WRKDIR}/zlib && ${BUILD_MAKE_CMD} libz.a
144.endif 144.endif
145.if empty(USE_BUILTIN.libarchive:M[yY][eE][sS]) 145.if empty(USE_BUILTIN.libarchive:M[yY][eE][sS])
146 cd ${WRKDIR}/libarchive && \ 146 cd ${WRKDIR}/libarchive && \
147 ${SETENV} ${_CONFIGURE_SCRIPT_ENV} \ 147 ${SETENV} ${_CONFIGURE_SCRIPT_ENV} \
148 ${CONFIG_SHELL} ${CONFIG_SHELL_FLAGS} \ 148 ${CONFIG_SHELL} ${CONFIG_SHELL_FLAGS} \
149 ./configure --disable-shared --disable-bsdtar \ 149 ./configure --disable-shared --disable-bsdtar \
150 --disable-dependency-tracking 150 --disable-dependency-tracking
151 cd ${WRKDIR}/libarchive && ${BUILD_MAKE_CMD} 151 cd ${WRKDIR}/libarchive && ${BUILD_MAKE_CMD}
152.endif 152.endif
153 cd ${WRKDIR}/libfetch && ${BUILD_MAKE_CMD} 153 cd ${WRKDIR}/libfetch && ${SETENV} ${MAKE_ENV} \
 154 ${MAKE_PROGRAM} ${MAKE_FLAGS} ${BUILD_MAKE_FLAGS} \
 155 -f ${MAKE_FILE} depend all
 156
154 157
155# XXX Reverse the order that update does things since 158# XXX Reverse the order that update does things since
156# XXX we need pkg_delete built before we can deinstall. 159# XXX we need pkg_delete built before we can deinstall.
157# XXX This should probably be the default order for all packages. 160# XXX This should probably be the default order for all packages.
158update: 161update:
159 ${MAKE} 162 ${MAKE}
160 ${MAKE} deinstall _UPDATE_RUNNING=YES 163 ${MAKE} deinstall _UPDATE_RUNNING=YES
161 ${MAKE} ${UPDATE_TARGET} 164 ${MAKE} ${UPDATE_TARGET}
162 ${MAKE} clean 165 ${MAKE} clean
163 166
164.include "../../mk/bsd.pkg.mk" 167.include "../../mk/bsd.pkg.mk"