Date: Tue, 26 May 2026 07:17:20 +0000 From: Pietro Cerutti <gahr@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 2dbc787a0117 - main - Mk/Uses/tcl.mk: allow combining build, test, and run Message-ID: <6a154900.19118.1d38dc1@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by gahr: URL: https://cgit.FreeBSD.org/ports/commit/?id=2dbc787a01171dde415a0570e9f410f467a43ef1 commit 2dbc787a01171dde415a0570e9f410f467a43ef1 Author: Pietro Cerutti <gahr@FreeBSD.org> AuthorDate: 2026-05-26 07:07:19 +0000 Commit: Pietro Cerutti <gahr@FreeBSD.org> CommitDate: 2026-05-26 07:07:19 +0000 Mk/Uses/tcl.mk: allow combining build, test, and run PR: 295582 Reported by: michaelo@ --- Mk/Uses/tcl.mk | 29 +++++++++++++---------------- 1 file changed, 13 insertions(+), 16 deletions(-) diff --git a/Mk/Uses/tcl.mk b/Mk/Uses/tcl.mk index 616bf7153ba5..ed72501293d1 100644 --- a/Mk/Uses/tcl.mk +++ b/Mk/Uses/tcl.mk @@ -179,13 +179,6 @@ TK_LIBDIR:= ${LOCALBASE}/lib/tk${TK_VER} TK_INCLUDEDIR:= ${LOCALBASE}/include/tk${TK_VER} . endif -# -# Dependencies -# -_TCLTK_BUILD_DEPENDS= -_TCLTK_RUN_DEPENDS= -_TCLTK_LIB_DEPENDS= - # Construct the correct dependency lines (wrapper) . if ${tcl_ARGS:Mwrapper} . if ${_TCLTK_PORT} == "tcl" @@ -205,19 +198,23 @@ _TCLTK_LIB_LINE= libtk${TK_SHLIB_VER}.so:x11-toolkits/tk${_TCLTK_WANTED_VERSION} libtcl${TCL_SHLIB_VER}.so:lang/tcl${_TCLTK_WANTED_VERSION} . endif +.undef _TCLTK_DEPENDS_FOUND . if ${tcl_ARGS:Mbuild} -BUILD_DEPENDS+= ${_TCLTK_WRAPPER_PORT} \ - ${_TCLTK_EXE_LINE} -. elif ${tcl_ARGS:Mrun} -RUN_DEPENDS+= ${_TCLTK_WRAPPER_PORT} \ - ${_TCLTK_EXE_LINE} -. elif ${tcl_ARGS:Mtest} -TEST_DEPENDS+= ${_TCLTK_WRAPPER_PORT} \ - ${_TCLTK_EXE_LINE} -. else +BUILD_DEPENDS+= ${_TCLTK_WRAPPER_PORT} ${_TCLTK_EXE_LINE} +_TCLTK_DEPENDS_FOUND= yes +. endif +. if ${tcl_ARGS:Mrun} +RUN_DEPENDS+= ${_TCLTK_WRAPPER_PORT} ${_TCLTK_EXE_LINE} +_TCLTK_DEPENDS_FOUND= yes +. endif +. if ${tcl_ARGS:Mtest} +TEST_DEPENDS+= ${_TCLTK_WRAPPER_PORT} ${_TCLTK_EXE_LINE} +. endif +. if !defined(_TCLTK_DEPENDS_FOUND) RUN_DEPENDS+= ${_TCLTK_WRAPPER_PORT} LIB_DEPENDS+= ${_TCLTK_LIB_LINE} . endif +.undef _TCLTK_DEPENDS_FOUND # Setup TEA stuff . if ${tcl_ARGS:Mtea}home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?6a154900.19118.1d38dc1>