svn commit: r418990 - head/Mk/Uses

David Naylor dbn at FreeBSD.org
Sun Jul 24 08:45:32 UTC 2016


Author: dbn
Date: Sun Jul 24 08:45:30 2016
New Revision: 418990
URL: https://svnweb.freebsd.org/changeset/ports/418990

Log:
  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:	gahr
  MFH:		2016Q3

Modified:
  head/Mk/Uses/tcl.mk

Modified: head/Mk/Uses/tcl.mk
==============================================================================
--- head/Mk/Uses/tcl.mk	Sun Jul 24 08:04:01 2016	(r418989)
+++ head/Mk/Uses/tcl.mk	Sun Jul 24 08:45:30 2016	(r418990)
@@ -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}


More information about the svn-ports-head mailing list