[Pkg-tcltk-commits] r525 - tk8.4/trunk/debian

[sgolovan-guest at alioth.debian.org]

Author: sgolovan-guest
Date: 2008-02-25 07:34:48 +0000 (Mon, 25 Feb 2008)
New Revision: 525

Modified:
   tk8.4/trunk/debian/changelog
   tk8.4/trunk/debian/rules
Log:
[tk8.3]
  * Quoted CFLAGS in debian/rules when passing to the shell, not when
    assigning to a make variable; otherwise the quotes end up as part of
    the variable and many things go wrong, leading to a build failure.
  * Explicitly specified configure options --host and --build to make build
    results more predictable.


Modified: tk8.4/trunk/debian/changelog
===================================================================
--- tk8.4/trunk/debian/changelog	2008-02-25 07:34:29 UTC (rev 524)
+++ tk8.4/trunk/debian/changelog	2008-02-25 07:34:48 UTC (rev 525)
@@ -1,8 +1,12 @@
-tk8.4 (8.4.18-2) UNRELEASED; urgency=low
+tk8.4 (8.4.18-2) unstable; urgency=low
 
-  * NOT RELEASED YET
+  * Quoted CFLAGS in debian/rules when passing to the shell, not when
+    assigning to a make variable; otherwise the quotes end up as part of
+    the variable and many things go wrong, leading to a build failure.
+  * Explicitly specified configure options --host and --build to make build
+    results more predictable.
 
- -- Sergei Golovan <sgolovan at debian.org>  Sat,  9 Feb 2008 01:23:20 +0300
+ -- Sergei Golovan <sgolovan at debian.org>  Mon, 25 Feb 2008 10:29:17 +0300
 
 tk8.4 (8.4.18-1) unstable; urgency=low
 

Modified: tk8.4/trunk/debian/rules
===================================================================
--- tk8.4/trunk/debian/rules	2008-02-25 07:34:29 UTC (rev 524)
+++ tk8.4/trunk/debian/rules	2008-02-25 07:34:48 UTC (rev 525)
@@ -4,15 +4,18 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+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.4
 
 ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
-CFLAGS="-g -O0"
+CFLAGS=-g -O0
 else
 # See bug #446335
-CFLAGS="-g -O2 -fno-unit-at-a-time"
+CFLAGS=-g -O2 -fno-unit-at-a-time
 endif
 
 unpatch:
@@ -32,14 +35,16 @@
 
 	cd unix && \
 	  TK_LIBRARY="/usr/share/tcltk/tk$(v)" \
-	  ./configure --prefix=/usr \
+	  ./configure --host=$(DEB_HOST_GNU_TYPE) \
+		      --build=$(DEB_BUILD_GNU_TYPE) \
+		      --prefix=/usr \
 		      --includedir=/usr/include/tcl$(v) \
 		      --with-tcl=/usr/lib/tcl$(v) \
 		      --enable-shared \
 		      --enable-threads \
 		      --enable-man-symlinks \
 		      --enable-man-compression=gzip && \
-	  $(MAKE) CFLAGS=$(CFLAGS)
+	  $(MAKE) CFLAGS="$(CFLAGS)"
 
 # Build the static library.
 	cd unix && \