summaryrefslogtreecommitdiff
path: root/bootstrap
diff options
context:
space:
mode:
authornia <nia@pkgsrc.org>2022-06-14 09:08:31 +0000
committernia <nia@pkgsrc.org>2022-06-14 09:08:31 +0000
commit5a9be4681fd4d74d1a4271c9f51753ff339b0b2f (patch)
tree40ade6debffb868f1f3d133029b66bd2db4297c2 /bootstrap
parent05704ba24cadb6f90c3cf138ae52f2d5c95c793c (diff)
downloadpkgsrc-5a9be4681fd4d74d1a4271c9f51753ff339b0b2f.tar.gz
bootstrap: Default to PREFER_PKGSRC=yes on OpenBSD
Diffstat (limited to 'bootstrap')
-rw-r--r--bootstrap/README.OpenBSD4
-rwxr-xr-xbootstrap/bootstrap7
2 files changed, 8 insertions, 3 deletions
diff --git a/bootstrap/README.OpenBSD b/bootstrap/README.OpenBSD
index 8d88b7978da..25c492082f3 100644
--- a/bootstrap/README.OpenBSD
+++ b/bootstrap/README.OpenBSD
@@ -1,4 +1,4 @@
-$NetBSD: README.OpenBSD,v 1.15 2022/06/14 05:04:23 charlotte Exp $
+$NetBSD: README.OpenBSD,v 1.16 2022/06/14 09:08:31 nia Exp $
Please read the general README file as well.
@@ -26,7 +26,7 @@ system-provided clang. Earlier version/platform/compiler combinations
have previously been reported to work.
If the bootstrap fails for you, try adding `--prefer-pkgsrc yes` to your
-bootstrap command line.
+bootstrap command line (this is now the default).
Once bootstrapped, as is typical with pkgsrc, many packages build as is.
For any particular package that doesn't, fixes are often in OpenBSD
diff --git a/bootstrap/bootstrap b/bootstrap/bootstrap
index 6c0a75aa9ba..dbc1690bdb9 100755
--- a/bootstrap/bootstrap
+++ b/bootstrap/bootstrap
@@ -1,6 +1,6 @@
#! /bin/sh
-# $NetBSD: bootstrap,v 1.310 2022/04/06 13:06:09 schmonz Exp $
+# $NetBSD: bootstrap,v 1.311 2022/06/14 09:08:31 nia Exp $
#
# Copyright (c) 2001-2011 Alistair Crooks <agc@NetBSD.org>
# All rights reserved.
@@ -1132,6 +1132,11 @@ echo "PKGMANDIR= $pkgmandir" >> ${TARGET_MKCONF}
echo "" >> ${TARGET_MKCONF}
case $opsys in
+OpenBSD)
+ if [ -z "$prefer_pkgsrc" ] && [ "$prefer_native" != "yes" ]; then
+ prefer_pkgsrc="yes"
+ fi
+ ;;
Linux)
# Default to PREFER_PKGSRC=yes unless user specifies --prefer-native=yes
# Linux systems likely have software from other packages managers