Date: Fri, 29 Jul 2016 07:22:53 +0000 (UTC) From: David Naylor <dbn@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r419229 - branches/2016Q3/Mk/Uses Message-ID: <201607290722.u6T7MrJL062845@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: dbn Date: Fri Jul 29 07:22:53 2016 New Revision: 419229 URL: https://svnweb.freebsd.org/changeset/ports/419229 Log: MFH: r418990 Mk/Uses/tcl.mk: fix stage-qa linking error. - If a port links to libtk then it will always also link to libtcl. Include libtcl in the LIB_DEPENDS when linking to libtk. - Fix indentation of '.if' statements PR: 211261 Approved by: ports-secteam (feld), gahr Modified: branches/2016Q3/Mk/Uses/tcl.mk Directory Properties: branches/2016Q3/ (props changed) Modified: branches/2016Q3/Mk/Uses/tcl.mk ============================================================================== --- branches/2016Q3/Mk/Uses/tcl.mk Fri Jul 29 05:43:30 2016 (r419228) +++ branches/2016Q3/Mk/Uses/tcl.mk Fri Jul 29 07:22:53 2016 (r419229) @@ -184,12 +184,13 @@ _TCLTK_WRAPPER_PORT= wish:x11-toolkits/t .endif # Construct the correct dependency lines (Tcl/Tk) -. if ${_TCLTK_PORT} == "tcl" +.if ${_TCLTK_PORT} == "tcl" _TCLTK_EXE_LINE= tclsh${TCL_VER}:lang/tcl${_TCLTK_WANTED_VERSION} _TCLTK_LIB_LINE= libtcl${TCL_SHLIB_VER}.so:lang/tcl${_TCLTK_WANTED_VERSION} -. elif ${_TCLTK_PORT} == "tk" +.elif ${_TCLTK_PORT} == "tk" _TCLTK_EXE_LINE= wish${TK_VER}:x11-toolkits/tk${_TCLTK_WANTED_VERSION} -_TCLTK_LIB_LINE= libtk${TK_SHLIB_VER}.so:x11-toolkits/tk${_TCLTK_WANTED_VERSION} +_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 .if ${tcl_ARGS:Mbuild}
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201607290722.u6T7MrJL062845>