[Debian-astro-commits] [funtools] 01/03: Build against Tcl Stubs

[Ole Streicher]

This is an automated email from the git hooks/post-receive script.

olebole pushed a commit to branch debian
in repository funtools.

commit 72357aa74fc8c8e68cb9c6a1fe3af5b560b1a5e9
Author: Ole Streicher <ole at aip.de>
Date:   Thu Jun 23 13:00:47 2016 +0200

    Build against Tcl Stubs
---
 debian/changelog                  |  9 ++++---
 debian/patches/build_tclfun.patch | 54 ++++++++++++++++++++++++++++++++++++++-
 2 files changed, 58 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 26e8987..ae3d3ce 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,13 +1,14 @@
 funtools (1.4.6+git150811-3) UNRELEASED; urgency=low
 
-  [ Ole Streicher ]
-  * Update standards-version to 3.9.8 (no changes)
-  * Update VCS fields, add ASCL-Id
-
   [ Alexis Bienvenüe ]
   * Sort object files to pass to mklib, to make the build reproducible.
     Closes: #827864
 
+  [ Ole Streicher ]
+  * Update standards-version to 3.9.8 (no changes)
+  * Update VCS fields, add ASCL-Id
+  * Build against Tcl Stubs
+
  -- Ole Streicher <olebole at debian.org>  Fri, 26 Feb 2016 15:55:16 +0100
 
 funtools (1.4.6+git150811-2) unstable; urgency=low
diff --git a/debian/patches/build_tclfun.patch b/debian/patches/build_tclfun.patch
index a307e00..1d23664 100644
--- a/debian/patches/build_tclfun.patch
+++ b/debian/patches/build_tclfun.patch
@@ -24,6 +24,15 @@ Description: Build the Tcl extension as a shared library.
  
  # extra libs
  EXTRA_LIBS =		@EXTRA_LIBS@
+@@ -137,7 +142,7 @@
+ 
+ CC  =		@CC@
+ 
+-CC_SWITCHES =	-I. ${CFLAGS} ${CPPFLAGS} @USE_DL@ ${INCLUDES} ${AC_FLAGS}
++CC_SWITCHES =	-I. ${CFLAGS} ${CPPFLAGS} @USE_DL@ ${INCLUDES} ${AC_FLAGS} -DUSE_TCL_STUBS
+ 
+ DEPEND_SWITCHES = -I. ${CFLAGS} ${INCLUDES} ${AC_FLAGS}
+ 
 @@ -249,9 +254,9 @@
  
  shtclfun:	tclfun
@@ -73,7 +82,7 @@ Description: Build the Tcl extension as a shared library.
  if test x"${no_tcl}" = x ; then
      AC_DEFINE([HAVE_TCL], [1], [Define if tcl is used.])
 +    SC_LOAD_TCLCONFIG
-+    TCL_LIBS="$TCL_LIB_SPEC"
++    TCL_LIBS="$TCL_STUB_LIB_SPEC"
 +    AC_SUBST(TCL_LIBS)
  fi
  
@@ -89,3 +98,46 @@ Description: Build the Tcl extension as a shared library.
  	Tcl_SetResult(interp, "can't create Tcl chan for pipe", TCL_STATIC);
  	return TCL_ERROR;
        }
+@@ -485,6 +485,12 @@
+ {
+   Tcl_Interp *interp = (Tcl_Interp *)vinterp;
+ 
++#ifdef USE_TCL_STUBS
++  if (Tcl_InitStubs(interp, "8.4", 0) == NULL) {
++      return TCL_ERROR;
++  }
++#endif
++
+   /* add mainlib commands to this interpreter */
+   Tcl_CreateObjCommand(interp, TCL_MAINLIB_NAME,
+ 		       MainLibProcess_Tcl, 
+--- a/funtclmainlib.c
++++ b/funtclmainlib.c
+@@ -16,6 +16,12 @@
+ {
+   Tcl_Interp *interp = (Tcl_Interp *)vinterp;
+ 
++#ifdef USE_TCL_STUBS
++  if (Tcl_InitStubs(interp, "8.4", 0) == NULL) {
++      return TCL_ERROR;
++  }
++#endif
++
+   Tcl_CreateObjCommand(interp, "funcen", MainLib_Tcl,
+     (ClientData)NULL, (Tcl_CmdDeleteProc *)NULL);
+   Tcl_CreateObjCommand(interp, "funcnts", MainLib_Tcl,
+--- a/mkfunmainlib
++++ b/mkfunmainlib
+@@ -49,6 +49,12 @@
+     printf("{\n")
+     printf("  Tcl_Interp *interp = (Tcl_Interp *)vinterp;\n")
+     printf("\n")
++    printf("#ifdef USE_TCL_STUBS\n")
++    printf("  if (Tcl_InitStubs(interp, \"8.4\", 0) == NULL) {\n")
++    printf("      return TCL_ERROR;\n")
++    printf("  }\n")
++    printf("#endif\n")
++    printf("\n")
+     for(i=0; i<j; i++){
+       printf("  Tcl_CreateObjCommand(interp, \"%s\", MainLibProcess_Tcl,\n", name[i])
+       printf("    (ClientData)NULL, (Tcl_CmdDeleteProc *)NULL);\n")

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-astro/packages/funtools.git