[Pkg-tcltk-commits] r400 - in tcl8.5/trunk/debian: . patches

[sgolovan-guest at alioth.debian.org]

Author: sgolovan-guest
Date: 2007-11-28 08:44:10 +0000 (Wed, 28 Nov 2007)
New Revision: 400

Added:
   tcl8.5/trunk/debian/patches/stack2.diff
Modified:
   tcl8.5/trunk/debian/changelog
   tcl8.5/trunk/debian/patches/series
   tcl8.5/trunk/debian/rules
Log:
  * Temporarily disabled stack checking on hppa architecture since it
    doesn't work yet.
  * Added explicit --host and --build configure options taken from
    DPKG_HOST_GNU_TYPE and DPKG_BUILD_GNU_TYPE.


Modified: tcl8.5/trunk/debian/changelog
===================================================================
--- tcl8.5/trunk/debian/changelog	2007-11-27 19:20:09 UTC (rev 399)
+++ tcl8.5/trunk/debian/changelog	2007-11-28 08:44:10 UTC (rev 400)
@@ -1,3 +1,12 @@
+tcl8.5 (0.b3-3) unstable; urgency=low
+
+  * Temporarily disabled stack checking on hppa architecture since it
+    doesn't work yet.
+  * Added explicit --host and --build configure options taken from
+    DPKG_HOST_GNU_TYPE and DPKG_BUILD_GNU_TYPE.
+
+ -- Sergei Golovan <sgolovan at debian.org>  Wed, 28 Nov 2007 09:51:59 +0300
+
 tcl8.5 (0.b3-2) unstable; urgency=low
 
   * Added a patch by Miguel Sofer which fixes a bug in tclsh with

Modified: tcl8.5/trunk/debian/patches/series
===================================================================
--- tcl8.5/trunk/debian/patches/series	2007-11-27 19:20:09 UTC (rev 399)
+++ tcl8.5/trunk/debian/patches/series	2007-11-28 08:44:10 UTC (rev 400)
@@ -1,4 +1,5 @@
 stack.diff
+stack2.diff
 tcllibrary.diff
 tclpackagepath.diff
 tclprivate.diff

Added: tcl8.5/trunk/debian/patches/stack2.diff
===================================================================
--- tcl8.5/trunk/debian/patches/stack2.diff	                        (rev 0)
+++ tcl8.5/trunk/debian/patches/stack2.diff	2007-11-28 08:44:10 UTC (rev 400)
@@ -0,0 +1,38 @@
+Index: tcl/generic/tclBasic.c
+===================================================================
+RCS file: /cvsroot/tcl/tcl/generic/tclBasic.c,v
+retrieving revision 1.285
+diff -u -r1.285 tclBasic.c
+--- tcl/generic/tclBasic.c	26 Nov 2007 19:11:11 -0000	1.285
++++ tcl/generic/tclBasic.c	27 Nov 2007 15:38:10 -0000
+@@ -351,7 +351,7 @@
+     TclpGetCStackParams(&((iPtr)->stackBound))
+ #ifdef TCL_STACK_GROWS_UP
+ #define CheckCStack(iPtr, localIntPtr) \
+-	   (!(iPtr)->stackBound || (localIntPtr) < (iPtr)->stackBound)
++	   ((localIntPtr) < (iPtr)->stackBound)
+ #else /* TCL_STACK_GROWS_UP */
+ #define CheckCStack(iPtr, localIntPtr) \
+ 	   ((localIntPtr) > (iPtr)->stackBound)
+Index: tcl/unix/tclUnixInit.c
+===================================================================
+RCS file: /cvsroot/tcl/tcl/unix/tclUnixInit.c,v
+retrieving revision 1.81
+diff -u -r1.81 tclUnixInit.c
+--- tcl/unix/tclUnixInit.c	26 Nov 2007 19:11:13 -0000	1.81
++++ tcl/unix/tclUnixInit.c	27 Nov 2007 15:38:10 -0000
+@@ -1059,10 +1059,14 @@
+ 	result = GetStackSize(&stackSize);
+ 	if (result != TCL_OK) {
+ 	    /* Can't check, assume it always succeeds */
++#ifdef TCLSTACK_GROWS_UP
++	    tsdPtr->stackBound = (int *)-1;
++#else
+ #ifdef TCL_CROSS_COMPILE
+ 	    stackGrowsDown = 1;
+ #endif
+ 	    tsdPtr->stackBound = NULL;
++#endif
+ 	    goto done;
+ 	}
+     }

Modified: tcl8.5/trunk/debian/rules
===================================================================
--- tcl8.5/trunk/debian/rules	2007-11-27 19:20:09 UTC (rev 399)
+++ tcl8.5/trunk/debian/rules	2007-11-28 08:44:10 UTC (rev 400)
@@ -4,16 +4,25 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+DEB_HOST_ARCH := $(shell dpkg-architecture -qDEB_HOST_ARCH)
+DEB_HOST_GNU_TYPE := $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_BUILD_GNU_TYPE := $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+
 export QUILT_PATCHES := debian/patches
 
 v = 8.5
 
 ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
-CFLAGS="-g -O0"
+CFLAGS = "-g -O0"
 else
 # See bug #446335 for -fno-unit-at-a-time
-CFLAGS="-g -O2 -fno-unit-at-a-time"
+ifeq ($(DEB_HOST_ARCH), hppa)
+# Disable stack checking for hppa (it doesn't work yet)
+CFLAGS = "-g -O2 -fno-unit-at-a-time -DTCL_NO_STACK_CHECK=1"
+else
+CFLAGS = "-g -O2 -fno-unit-at-a-time"
 endif
+endif
 
 unpatch:
 	dh_testdir
@@ -30,19 +39,24 @@
 build-stamp: patch-stamp
 	dh_testdir
 
+# additional print of stack limit
+	/bin/sh -c "ulimit -Hs" || true
+
 # so so ugly but it works...
 	touch generic/tclStubInit.c
 	cd unix && \
 	  TCL_LIBRARY="/usr/share/tcltk/tcl8.5" \
 	  TCL_PACKAGE_PATH="/usr/local/lib/tcltk /usr/local/share/tcltk /usr/lib/tcltk /usr/share/tcltk /usr/lib" \
-	  ./configure --prefix=/usr \
-	  	      --includedir=/usr/include/tcl$(v) \
-	    	      --enable-shared \
+	  ./configure --host=$(DEB_HOST_GNU_TYPE) \
+		      --build=$(DEB_BUILD_GNU_TYPE) \
+		      --prefix=/usr \
+		      --includedir=/usr/include/tcl$(v) \
+		      --enable-shared \
 		      --enable-threads \
 		      --disable-rpath \
-	    	      --mandir=/usr/share/man \
+		      --mandir=/usr/share/man \
 		      --enable-man-symlinks \
-	    	      --enable-man-compression=gzip && \
+		      --enable-man-compression=gzip && \
 	  touch ../generic/tclStubInit.c && \
 	  $(MAKE) CFLAGS=$(CFLAGS)