From nobody Wed Oct 16 09:45:24 2024 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XT5g86sK5z5ZlWH; Wed, 16 Oct 2024 09:45:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XT5g85158z40SR; Wed, 16 Oct 2024 09:45:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729071924; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2DEIhuHdSreKKJqPCRV+a/Y88uR8fuocTw79ACjFhWU=; b=qQqM4B9r8ogD0REAGquXIyVT7M2zW5cQzlp8vfRQVtWAAMocp55zncZNLTKMzYCp4jiPhO iK9/u6ucefsFUsAVbE5sHWkMA+1EPUpgV9eHDyPh5Ez2qG8jTdFydkJy/Y02dXkgX9oV0v wgy+H+CNyFWmM+aOwrF5phe720EJ5abKAHzkC08l1LtAevNSdbGz/GIqng7TmjgaQQ817x Y0GZo4JVzKMdvNO7C2UJJb7Ae7vQUUlJcS8sJtuv1pvmQfcRmCwmiOo0j/kWEM6mawAb1s 5G8kJuCNBGElU72ewfey6oQUG05pUTkAJljDogA2aFXfeamSH1sm1CFmZYC9tw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729071924; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2DEIhuHdSreKKJqPCRV+a/Y88uR8fuocTw79ACjFhWU=; b=im7OVk0ijsasuiOhqXjdkVjIGFnXuCKOPiWD7NQP8ccMhoBLNE9nbaylKX6Ha2yPz1uJCY 0PuIFLS3nv/MMe/fF38i5if3JudLbnPz279glKkMGmsfG4W5++QfJVsYmvvpdiUe0kOpXm 6Jr/kuXjMQPoLykPO0GQIqIjo71Zy0AnWkYjQ79hxDZiy6LO2GgZ1w6JJHWH7Q8dWQUFR2 Dde7GfFXUrbf1dmQ+92WsPdAV3uyJirGILVweEvT1XUoRHpCTMSN0xzAhxq0ra2zcdy5NH XZ1sl/1DT3yjyjK8UGznXOxfrFR92nt0syzHitSIL2pFdsvCO7Thsl+F6ZT25g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729071924; a=rsa-sha256; cv=none; b=UoUwTpguXBUdF3ud3/dpYFIGIk91fTI9cjlYdsmTfqC9z3YlVR1OREl2P1H5plwQmHQfQM LYSgqWevi2Iv5HjyYXowTY5PcmW2TlqggbPjUNcvutN4jgHEXWB/HJjUS0WgKOrVbUv30s CoKs+uqg9b7g4WMVoxaw7asioJMKW93esSnao9vU8qK0meSK3tDl5fKXmo2ih5AGB14jvQ wpiM18q910KjqGKzkiwwVMYBYNvmJhUwA7Vh6H6wZTvlePSI5cOcuEFhqMNW5E+6rDJCk9 Z9nRqxEN+lls14KmWNx3kPbqEkEUxjvfOgNd3UFJ/pUgO4wBIesbejt3hEVxPg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XT5g84cZ9z11VD; Wed, 16 Oct 2024 09:45:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49G9jOk4098234; Wed, 16 Oct 2024 09:45:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49G9jOCV098231; Wed, 16 Oct 2024 09:45:24 GMT (envelope-from git) Date: Wed, 16 Oct 2024 09:45:24 GMT Message-Id: <202410160945.49G9jOCV098231@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Pietro Cerutti Subject: git: f1b6b49a6ab2 - main - Mk/Uses/tcl.mk: provide two additional variables to help with Tcl9 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gahr X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f1b6b49a6ab2faa4ce6190ef75db08f433cab235 Auto-Submitted: auto-generated The branch main has been updated by gahr: URL: https://cgit.FreeBSD.org/ports/commit/?id=f1b6b49a6ab2faa4ce6190ef75db08f433cab235 commit f1b6b49a6ab2faa4ce6190ef75db08f433cab235 Author: Pietro Cerutti AuthorDate: 2024-10-16 09:43:42 +0000 Commit: Pietro Cerutti CommitDate: 2024-10-16 09:45:22 +0000 Mk/Uses/tcl.mk: provide two additional variables to help with Tcl9 These define prefixes for shared libraries and postfixes for stub libraries when building TEA-based extensions against Tcl 8 or Tcl 9. --- Mk/Uses/tcl.mk | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/Mk/Uses/tcl.mk b/Mk/Uses/tcl.mk index dd9b7d842d83..0a3b470ea0ce 100644 --- a/Mk/Uses/tcl.mk +++ b/Mk/Uses/tcl.mk @@ -12,6 +12,13 @@ # # TCL_INCLUDEDIR - Path where the Tcl C headers can be found # +# TCL_PKG_LIB_PREFIX - Library prefix, as per TIP595. This is tcl9 when +# when building against Tcl 9.0, and empty otherwise +# +# TCL_PKG_STUB_POSTFIX - Stub library postfix. This is empty when building +# against Tcl 9.0, and DISTVERSION otherwise. +# See https://core.tcl-lang.org/tclconfig/info/381985d331b96ba9 +# # # TK_VER - Major.Minor version of Tk # @@ -216,7 +223,15 @@ LIB_DEPENDS+= ${_TCLTK_LIB_LINE} . if ${tcl_ARGS:Mtea} GNU_CONFIGURE= yes TCL_PKG?= ${PORTNAME:C/^tcl(-?)//:C/(-?)tcl\$//}${PORTVERSION} -PLIST_SUB+= TCL_PKG=${TCL_PKG} +. if ${TCL_VER} == "9.0" +TCL_PKG_LIB_PREFIX= tcl9 +TCL_PKG_STUB_POSTFIX= +. else +TCL_PKG_LIB_PREFIX= +TCL_PKG_STUB_POSTFIX= ${DISTVERSION} +. endif +PLIST_SUB+= TCL_PKG=${TCL_PKG} TCL_PKG_LIB_PREFIX=${TCL_PKG_LIB_PREFIX} \ + TCL_PKG_STUB_POSTFIX=${TCL_PKG_STUB_POSTFIX} CONFIGURE_ARGS+=--exec-prefix=${PREFIX} \ --with-tcl=${TCL_LIBDIR} \ --with-tclinclude=${TCL_INCLUDEDIR}