pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/mk/flavor/pkg Change the meaning of unsafe_depends to ...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/da024a26614e
branches:  trunk
changeset: 531863:da024a26614e
user:      gdt <gdt%pkgsrc.org@localhost>
date:      Wed Aug 08 02:07:27 2007 +0000

description:
Change the meaning of unsafe_depends to mean that a dependency has
been replaced which might have had an ABI change.  In practice, a
package is considered to maybe have had an ABI change if the version
changes.  Introduce a new tag unsafe_depends_strict, which is
unconditionally set on depending packages whenever make replace is
done.

This will cut down considerably on the amount of rebuilding required
with pkg_rolling-replace, while still guaranteing that packages are
rebuilt if there was an ABI change in a dependency.

diffstat:

 mk/flavor/pkg/replace.mk |  12 +++++++++---
 1 files changed, 9 insertions(+), 3 deletions(-)

diffs (33 lines):

diff -r 0c4b47c9fb9e -r da024a26614e mk/flavor/pkg/replace.mk
--- a/mk/flavor/pkg/replace.mk  Wed Aug 08 01:44:24 2007 +0000
+++ b/mk/flavor/pkg/replace.mk  Wed Aug 08 02:07:27 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: replace.mk,v 1.11 2007/08/08 01:44:24 gdt Exp $
+# $NetBSD: replace.mk,v 1.12 2007/08/08 02:07:27 gdt Exp $
 #
 
 # _flavor-replace:
@@ -138,7 +138,10 @@
 ### replace-fixup-required-by (PRIVATE)
 ######################################################################
 ### replace-fixup-required-by fixes the +CONTENTS files of dependent
-### packages to refer to the replacement package.
+### packages to refer to the replacement package.  It also sets the
+### unsafe_depends_strict tag on each dependent package, and sets the
+### unsafe_depends tag if the replaced package has a different version.
+### XXX Only set unsafe_depends if there is an ABI change.
 replace-fixup-required-by: .PHONY
        @${STEP_MSG} "Fixing @pkgdep entries in dependent packages."
        ${_PKG_SILENT}${_PKG_DEBUG}                                     \
@@ -162,7 +165,10 @@
                        { print }'                                      \
                        $$contents > $$newcontents;                     \
                ${MV} -f $$newcontents $$contents;                      \
-               ${PKG_ADMIN} set unsafe_depends=YES $$pkg;              \
+               ${PKG_ADMIN} set unsafe_depends_strict=YES $$pkg;       \
+               if ${TEST} "$$oldname" != "$$newname"; then             \
+                       ${PKG_ADMIN} set unsafe_depends=YES $$pkg;      \
+               fi;                                                     \
        done
 
 ######################################################################



Home | Main Index | Thread Index | Old Index