tech-pkg archive
[
Date Prev][
Date Next][
Thread Prev][
Thread Next][
Date Index][
Thread Index][
Old Index]
Re: make replace broken?
On 2008年3月13日, Greg Troxel wrote:
> make replace fails when run as a regular user. I believe it works ok
> when run as root. This has been like this for most of a year and I
> haven't spent enough time to figure it out.
I have the appended local patch, which works for me, but it probably not
the correct fix.
--apb (Alan Barrett)
Index: pkgsrc/mk/flavor/pkg/replace.mk
--- mk/flavor/pkg/replace.mk 23 Jan 2008 14:48:50 -0000 1.24
+++ mk/flavor/pkg/replace.mk 17 Mar 2008 11:05:36 -0000
@@ -13,16 +13,17 @@
# can be confused when a +REQUIRED_BY files suddenly disappears.
#
_flavor-replace: \
- replace-names \
- replace-tarup \
- replace-preserve-installed-info \
- replace-preserve-required-by \
- deinstall \
- install-clean \
- install \
- replace-fixup-required-by \
- replace-fixup-installed-info \
.PHONY
+ ${MAKE} replace-names \
+ && { ${MAKE} replace-tarup || : ; } \
+ && ${MAKE} replace-preserve-installed-info \
+ && ${MAKE} replace-preserve-required-by \
+ && ${MAKE} deinstall \
+ && ${MAKE} install-clean \
+ && ${MAKE} install \
+ && ${MAKE} replace-fixup-required-by \
+ && ${MAKE} replace-fixup-installed-info \
+ ;
# _flavor-undo-replace:
# Undoes the actions from a previous _flavor-replace.
@@ -31,14 +32,15 @@
# undo-replace
#
_flavor-undo-replace: \
- undo-replace-check \
- replace-preserve-installed-info \
- replace-preserve-required-by \
- deinstall \
- undo-replace-install \
- replace-fixup-required-by \
- replace-clean \
.PHONY
+ ${MAKE} undo-replace-check \
+ && ${MAKE} replace-preserve-installed-info \
+ && ${MAKE} replace-preserve-required-by \
+ && ${MAKE} deinstall \
+ && ${MAKE} undo-replace-install \
+ && ${MAKE} replace-fixup-required-by \
+ && ${MAKE} replace-clean \
+ ;
_INSTALLED_INFO_FILE= ${WRKDIR}/.replace-+INSTALLED_INFO
_REQUIRED_BY_FILE= ${WRKDIR}/.replace-+REQUIRED_BY
Home |
Main Index |
Thread Index |
Old Index