diff options
| author | gdt <gdt> | 2010-06-16 15:15:05 +0000 |
|---|---|---|
| committer | gdt <gdt> | 2010-06-16 15:15:05 +0000 |
| commit | 65fd300bc143a5fe1913fb92a066dc764315594d (patch) | |
| tree | f6ab174b72dd2b46fe2f7e33d52dfbab96a1e01a /mk/flavor | |
| parent | b48ed2aa84cbdc6c266ca7d90778c3d725650b02 (diff) | |
| download | pkgsrc-65fd300bc143a5fe1913fb92a066dc764315594d.tar.gz | |
Adjust workaround for make replace in destdir case. Use of -f is of
course a too-large hammer, but in addition to overriding checks it
appears to change behavior in some cases when no overrides are
necessary. Therefore, use pkg_add -U as before first, and only try -f
if that fails. (This is temporary and should be replaced by -D to
omit only the exact depends check as soon as that's in tree.)
Diffstat (limited to 'mk/flavor')
| -rw-r--r-- | mk/flavor/pkg/replace.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mk/flavor/pkg/replace.mk b/mk/flavor/pkg/replace.mk index 7045d4162be..a077a38867c 100644 --- a/mk/flavor/pkg/replace.mk +++ b/mk/flavor/pkg/replace.mk @@ -1,4 +1,4 @@ -# $NetBSD: replace.mk,v 1.29 2010/06/12 00:53:43 gdt Exp $ +# $NetBSD: replace.mk,v 1.30 2010/06/16 15:15:05 gdt Exp $ # # _flavor-replace: @@ -194,12 +194,12 @@ replace-destdir: .PHONY @${PHASE_MSG} "Updating using binary package of "${PKGNAME:Q} .if !empty(USE_CROSS_COMPILE:M[yY][eE][sS]) @${MKDIR} ${_CROSS_DESTDIR}${PREFIX} - ${PKG_ADD} -U -f -m ${MACHINE_ARCH} -I -p ${_CROSS_DESTDIR}${PREFIX} ${PKGFILE} + ${PKG_ADD} -U -m ${MACHINE_ARCH} -I -p ${_CROSS_DESTDIR}${PREFIX} ${PKGFILE} || ${PKG_ADD} -U -f -m ${MACHINE_ARCH} -I -p ${_CROSS_DESTDIR}${PREFIX} ${PKGFILE} @${ECHO} "Fixing recorded cwd..." @${SED} -e 's|@cwd ${_CROSS_DESTDIR}|@cwd |' ${_PKG_DBDIR}/${PKGNAME:Q}/+CONTENTS > ${_PKG_DBDIR}/${PKGNAME:Q}/+CONTENTS.tmp @${MV} ${_PKG_DBDIR}/${PKGNAME:Q}/+CONTENTS.tmp ${_PKG_DBDIR}/${PKGNAME:Q}/+CONTENTS .else - ${PKG_ADD} -U -f ${PKGFILE} + ${PKG_ADD} -U ${PKGFILE} || ${PKG_ADD} -U -f ${PKGFILE} .endif ${RUN}${_REPLACE_OLDNAME_CMD}; \ ${PKG_INFO} -qR ${PKGNAME:Q} | while read pkg; do \ |