Module Name: src
Committed By: riastradh
Date: Thu Dec 19 22:00:13 UTC 2024
Modified Files:
src: build.sh
Log Message:
build.sh: Use X11_TYPE=modular for build.sh pkg=... by default.
You can override it in your MAKECONF if you want to debug issues in
pkgsrc with cross-building X11_TYPE=native, but let's try to make
things work out of the box here if you don't go out of your way.
To generate a diff of this commit:
cvs rdiff -u -r1.381 -r1.382 src/build.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/build.sh
diff -u src/build.sh:1.381 src/build.sh:1.382
--- src/build.sh:1.381 Fri Nov 29 16:56:40 2024
+++ src/build.sh Thu Dec 19 22:00:13 2024
@@ -1,5 +1,5 @@
#! /usr/bin/env sh
-# $NetBSD: build.sh,v 1.381 2024/11/29 16:56:40 riastradh Exp $
+# $NetBSD: build.sh,v 1.382 2024/12/19 22:00:13 riastradh Exp $
#
# Copyright (c) 2001-2023 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -2070,7 +2070,7 @@ createmakewrapper()
eval cat <<EOF ${makewrapout}
#! ${HOST_SH}
# Set proper variables to allow easy "make" building of a NetBSD subtree.
-# Generated from: \$NetBSD: build.sh,v 1.381 2024/11/29 16:56:40 riastradh Exp $
+# Generated from: \$NetBSD: build.sh,v 1.382 2024/12/19 22:00:13 riastradh Exp $
# with these arguments: ${_args}
#
@@ -2356,6 +2356,11 @@ DISTDIR= ${pkgroot}/distfiles
PACKAGES= ${pkgroot}/packages
WRKOBJDIR= ${pkgroot}/work
+# pkgsrc cross-builds are not set up to support native X, but also part
+# of the point of pkgsrc cross-build infrastructure is to not need
+# native X any more.
+X11_TYPE= modular
+
.-include "${MAKECONF}"
MKDEBUG= no # interferes with pkgsrc builds
