Skip to content

Commit 9f34be1

Browse files
riastradhriastradh
authored andcommitted
build.sh: Make `build.sh pkg=...' bomb with -x/MKX11=yes for now.
1 parent b134a12 commit 9f34be1

File tree

1 file changed

+13
-2
lines changed

1 file changed

+13
-2
lines changed

build.sh

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#! /usr/bin/env sh
2-
# $NetBSD: build.sh,v 1.384 2024/12/20 14:31:49 martin Exp $
2+
# $NetBSD: build.sh,v 1.385 2024/12/20 15:56:45 riastradh Exp $
33
#
44
# Copyright (c) 2001-2023 The NetBSD Foundation, Inc.
55
# All rights reserved.
@@ -1614,6 +1614,15 @@ sanitycheck()
16141614
done
16151615
bomb "Asked to build package but no pkgsrc"
16161616
done
1617+
if $do_pkg && [ "${MKX11-no}" = yes ]; then
1618+
# See comment below about X11_TYPE in pkgsrc mk.conf.
1619+
# (Feel free to remove this, and set X11_TYPE to
1620+
# native/modular according to MKX11=yes/no, if you want
1621+
# to do the work to make X11_TYPE=native cross-builds
1622+
# work.)
1623+
bomb "Experimental \`build.sh pkg=...'" \
1624+
"does not support -x/MKX11=yes"
1625+
fi
16171626
}
16181627

16191628
# print_tooldir_program --
@@ -2083,7 +2092,7 @@ createmakewrapper()
20832092
eval cat <<EOF ${makewrapout}
20842093
#! ${HOST_SH}
20852094
# Set proper variables to allow easy "make" building of a NetBSD subtree.
2086-
# Generated from: \$NetBSD: build.sh,v 1.384 2024/12/20 14:31:49 martin Exp $
2095+
# Generated from: \$NetBSD: build.sh,v 1.385 2024/12/20 15:56:45 riastradh Exp $
20872096
# with these arguments: ${_args}
20882097
#
20892098
@@ -2372,6 +2381,8 @@ WRKOBJDIR= ${pkgroot}/work
23722381
# pkgsrc cross-builds are not set up to support native X, but also part
23732382
# of the point of pkgsrc cross-build infrastructure is to not need
23742383
# native X any more.
2384+
#
2385+
# (If you fix this, remove the bomb in build.sh pkg=... on MKX11=yes.)
23752386
X11_TYPE= modular
23762387
23772388
.-include "${MAKECONF}"

0 commit comments

Comments
 (0)