CVS commit: pkgsrc/bootstrap

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Tue Nov  1 20:44:22 UTC 2016

Modified Files:
        pkgsrc/bootstrap: bootstrap

Log Message:
When building cwrappers via bootstrap, either directly via --cwrappers or
indirectly via it being pulled in using USE_CWRAPPERS=auto, we need to
ensure that it is not built with -DPKG_PRESERVE as otherwise it interacts
badly with pbulk's pkg_delete test.


To generate a diff of this commit:
cvs rdiff -u -r1.232 -r1.233 pkgsrc/bootstrap/bootstrap

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/bootstrap/bootstrap
diff -u pkgsrc/bootstrap/bootstrap:1.232 pkgsrc/bootstrap/bootstrap:1.233
--- pkgsrc/bootstrap/bootstrap:1.232    Wed Jun 22 11:40:16 2016
+++ pkgsrc/bootstrap/bootstrap  Tue Nov  1 20:44:22 2016
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# $NetBSD: bootstrap,v 1.232 2016/06/22 11:40:16 joerg Exp $
+# $NetBSD: bootstrap,v 1.233 2016/11/01 20:44:22 jperkin Exp $
 #
 # Copyright (c) 2001-2011 Alistair Crooks <agc%NetBSD.org@localhost>
 # All rights reserved.
@@ -1287,10 +1287,24 @@ echo ".endif                    # end pkgsrc settings" >>
 echo ".endif                   # end pkgsrc settings" >> ${BOOTSTRAP_MKCONF}
 
 # build and register packages
-# usage: build_package <packagedirectory> [additional arguments]
+# usage: build_package <packagedirectory>
 build_package() {
        run_cmd "(cd $pkgsrcdir/$1 && $bmake $make_quiet_flags MAKE_JOBS=${make_jobs} PKG_COMPRESSION=none -DPKG_PRESERVE MAKECONF=${BOOTSTRAP_MKCONF} install)"
 }
+build_package_nopreserve() {
+       run_cmd "(cd $pkgsrcdir/$1 && $bmake $make_quiet_flags MAKE_JOBS=${make_jobs} PKG_COMPRESSION=none MAKECONF=${BOOTSTRAP_MKCONF} install)"
+}
+
+#
+# cwrappers is special, we don't want to set it as a BOOTSTRAP_PKG but must
+# build it (if required) without -DPKG_PRESERVE set so that it can be deleted.
+#
+use_cwrappers=`(cd $pkgsrcdir/devel/bmake && $bmake show-var VARNAME=_USE_CWRAPPERS)`
+case "$use_cwrappers" in
+yes)
+       build_package_nopreserve "pkgtools/cwrappers"
+       ;;
+esac
 
 #
 # Please make sure that the following packages and