pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/mk/tools mk: Fix PR pkg/56299
details: https://anonhg.NetBSD.org/pkgsrc/rev/9be75e43ca45
branches: trunk
changeset: 456079:9be75e43ca45
user: triaxx <triaxx%pkgsrc.org@localhost>
date: Mon Jul 19 09:55:04 2021 +0000
description:
mk: Fix PR pkg/56299
Add a test to check that an xbase set is installed when a tool depends on
X11 and X11_TYPE=native.
Thanks to Greg and Edgar for their comments and suggestions!
diffstat:
mk/tools/replace.mk | 16 +++++++++++++++-
1 files changed, 15 insertions(+), 1 deletions(-)
diffs (37 lines):
diff -r 44ae80cbcea4 -r 9be75e43ca45 mk/tools/replace.mk
--- a/mk/tools/replace.mk Mon Jul 19 07:07:32 2021 +0000
+++ b/mk/tools/replace.mk Mon Jul 19 09:55:04 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: replace.mk,v 1.291 2020/10/06 17:36:50 rillig Exp $
+# $NetBSD: replace.mk,v 1.292 2021/07/19 09:55:04 triaxx Exp $
#
# Copyright (c) 2005 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -1276,6 +1276,16 @@
######################################################################
.for _t_ in ${_USE_TOOLS}
+###
+### For each tool that depends on X11 for its native version, make
+### sure it is really installed (i.e. xbase has been installed).
+###
+. if defined(TOOLS_PATH.${_t_}) && !empty(X11_TYPE:Mnative)
+. if !exists(${TOOLS_PATH.${_t_}}) && !empty(TOOLS_PATH.${_t_}:M${X11BASE}*)
+_tmiss_+= ${_t_}
+. endif
+. endif
+
. if !empty(_TOOLS_USE_PKGSRC.${_t_}:M[yY][eE][sS]) && \
!defined(TOOLS_IGNORE.${_t_})
#####
@@ -1336,6 +1346,10 @@
. endif
.endfor
+.if !empty(_tmiss_)
+PKG_FAIL_REASON+= "${X11BASE}: X11_TYPE=native but xbase set is not installed (missing: ${_tmiss_}). Either set X11_TYPE to modular or install xbase."
+.endif
+
######################################################################
# For each tool that pkgsrc requires, make sure that the "TOOL" name
Home |
Main Index |
Thread Index |
Old Index