|
1 | 1 | #! /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 $ |
3 | 3 | # |
4 | 4 | # Copyright (c) 2001-2023 The NetBSD Foundation, Inc. |
5 | 5 | # All rights reserved. |
@@ -1614,6 +1614,15 @@ sanitycheck() |
1614 | 1614 | done |
1615 | 1615 | bomb "Asked to build package but no pkgsrc" |
1616 | 1616 | 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 |
1617 | 1626 | } |
1618 | 1627 |
|
1619 | 1628 | # print_tooldir_program -- |
@@ -2083,7 +2092,7 @@ createmakewrapper() |
2083 | 2092 | eval cat <<EOF ${makewrapout} |
2084 | 2093 | #! ${HOST_SH} |
2085 | 2094 | # 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 $ |
2087 | 2096 | # with these arguments: ${_args} |
2088 | 2097 | # |
2089 | 2098 |
|
@@ -2372,6 +2381,8 @@ WRKOBJDIR= ${pkgroot}/work |
2372 | 2381 | # pkgsrc cross-builds are not set up to support native X, but also part |
2373 | 2382 | # of the point of pkgsrc cross-build infrastructure is to not need |
2374 | 2383 | # native X any more. |
| 2384 | +# |
| 2385 | +# (If you fix this, remove the bomb in build.sh pkg=... on MKX11=yes.) |
2375 | 2386 | X11_TYPE= modular |
2376 | 2387 |
|
2377 | 2388 | .-include "${MAKECONF}" |
|
0 commit comments