lib: adapt Tcl_InitStubs for Tcl 9

Version requirement of Tcl_InitStubs function should be of same major version number unless version argument finishes with "-" character.
envmodules · Sep 16, 2024 · 9a7aeb0 · 9a7aeb0
1 parent 4a9012f
commit 9a7aeb0
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/NEWS.rst b/NEWS.rst
@@ -99,6 +99,7 @@ Modules 5.5.0 (not yet released)
   Ruby script. (fix issue #535)
 * Add PowerShell Core (``pwsh``) shell support. (fix issue #326 with
   contribution from Simon Lukas Märtens)
+* Lib: adapt Modules Tcl extension library to properly load on Tcl 9.
 
 .. warning:: Variant names are now fully checked instead of just verifying
    their first character. Only characters within the ``A-Za-z0-9_-`` range are

diff --git a/lib/envmodules.c b/lib/envmodules.c
@@ -591,8 +591,8 @@ DLLEXPORT int
 Envmodules_Init(
    Tcl_Interp* interp      /* Tcl interpreter */
 ) {
-    /* Require Tcl */
-   if (Tcl_InitStubs(interp, "8.5", 0) == NULL) {
+    /* Require at least Tcl 8.5 */
+   if (Tcl_InitStubs(interp, "8.5-", 0) == NULL) {
       return TCL_ERROR;
    }
 

diff --git a/testsuite/modules.00-init/120-siteconfig.exp b/testsuite/modules.00-init/120-siteconfig.exp
@@ -361,7 +361,7 @@ if {[info exists tclextlib_file] && [file executable ./tclsh83]} {
     setenv_var TESTSUITE_ENABLE_SITECONFIG_TCLEXTLIBLOAD83 1
 
     set tserr [escre "$error_msgs: Site configuration source failed
-  version conflict for package \"Tcl\": have 8.3, need 8.5
+  version conflict for package \"Tcl\": have 8.3, need 8.5-
       while executing
   \"exec ./tclsh83 << \"load \[getConf tcl_ext_lib\] Envmodules\"<EXM>\"
       (file \"$siteconfig_file\" line 2)<EXM>"]