[Pkg-tcltk-commits] r521 - tcl8.3/trunk/debian
sgolovan-guest at alioth.debian.org
sgolovan-guest at alioth.debian.org
Mon Feb 25 07:32:51 UTC 2008
Author: sgolovan-guest
Date: 2008-02-25 07:32:51 +0000 (Mon, 25 Feb 2008)
New Revision: 521
Modified:
tcl8.3/trunk/debian/changelog
tcl8.3/trunk/debian/rules
Log:
[tcl8.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.
* Cleaned up debian/rules.
Modified: tcl8.3/trunk/debian/changelog
===================================================================
--- tcl8.3/trunk/debian/changelog 2008-02-20 19:09:50 UTC (rev 520)
+++ tcl8.3/trunk/debian/changelog 2008-02-25 07:32:51 UTC (rev 521)
@@ -1,8 +1,13 @@
-tcl8.3 (8.3.5-11) UNRELEASED; urgency=low
+tcl8.3 (8.3.5-11) 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.
+ * Cleaned up debian/rules.
- -- Sergei Golovan <sgolovan at debian.org> Wed, 14 Nov 2007 09:23:22 +0300
+ -- Sergei Golovan <sgolovan at debian.org> Mon, 25 Feb 2008 10:24:14 +0300
tcl8.3 (8.3.5-10) unstable; urgency=low
Modified: tcl8.3/trunk/debian/rules
===================================================================
--- tcl8.3/trunk/debian/rules 2008-02-20 19:09:50 UTC (rev 520)
+++ tcl8.3/trunk/debian/rules 2008-02-25 07:32:51 UTC (rev 521)
@@ -1,16 +1,19 @@
#!/usr/bin/make -f
-# Uncomment this to turn on verbose mode.
+# 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.3
ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
-CFLAGS="-g -O0 -D_REENTRANT=1"
+CFLAGS=-g -O0 -D_REENTRANT=1
else
-CFLAGS="-g -O2 -D_REENTRANT=1"
+CFLAGS=-g -O2 -D_REENTRANT=1
endif
unpatch:
@@ -28,17 +31,19 @@
build-stamp: patch-stamp
dh_testdir
-# so so ugly but it works...
+# So so ugly but it works...
touch generic/tclStubInit.c
cd unix && \
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 \
--mandir=/usr/share/man && \
touch ../generic/tclStubInit.c && \
- $(MAKE) CFLAGS=$(CFLAGS) \
- TCL_LIBRARY="/usr/share/tcltk/tcl$(v)"
+ $(MAKE) CFLAGS="$(CFLAGS)" \
+ TCL_LIBRARY="/usr/share/tcltk/tcl$(v)"
# Build the static library.
cd unix && \
@@ -69,7 +74,8 @@
$(MAKE) INSTALL_ROOT=`pwd`/../debian/tmp \
MAN_INSTALL_DIR=`pwd`/../debian/tmp/usr/share/man \
MANN_INSTALL_DIR=`pwd`/../debian/tmp/usr/share/man/man3 \
- TCL_LIBRARY="/usr/share/tcltk/tcl$(v)" install
+ TCL_LIBRARY="/usr/share/tcltk/tcl$(v)" \
+ install
# Fix up the libraries.
cp unix/libtcl$(v).a debian/tmp/usr/lib
mv debian/tmp/usr/lib/libtcl$(v).so debian/tmp/usr/lib/libtcl$(v).so.1
@@ -84,12 +90,12 @@
ln -s euc-cn.enc debian/tmp/usr/share/tcltk/tcl$(v)/encoding/gb2312.enc; \
fi
# Fix up the include files.
- install -d debian/tmp/usr/include/tcl$(v)/tcl-private/compat
- cp compat/*.h debian/tmp/usr/include/tcl$(v)/tcl-private/compat
install -d debian/tmp/usr/include/tcl$(v)/tcl-private/generic
cp generic/*.h debian/tmp/usr/include/tcl$(v)/tcl-private/generic
install -d debian/tmp/usr/include/tcl$(v)/tcl-private/unix
cp unix/*.h debian/tmp/usr/include/tcl$(v)/tcl-private/unix
+ install -d debian/tmp/usr/include/tcl$(v)/tcl-private/compat
+ cp compat/*.h debian/tmp/usr/include/tcl$(v)/tcl-private/compat
# Fix up the manpages.
cd debian/tmp/usr/share/man/man1 && \
mv tclsh.1 tclsh$(v).1
@@ -97,11 +103,11 @@
for f in *.[3n] ; do \
f2=$$(echo $$f | sed -e 's/\.[3n]/.3tcl/') ; \
if [ -L $$f ]; then \
- l=$$(readlink -n $$f |sed -e 's/\.[3n]/.3tcl/') ; \
- rm $$f ; \
- ln -sf $$l $$f2 ; \
+ l=$$(readlink -n $$f |sed -e 's/\.[3n]/.3tcl/') ; \
+ rm $$f ; \
+ ln -sf $$l $$f2 ; \
else \
- cat $$f | sed -e 's/^\.TH \([^ ]\+\|"[^"]\+"\) [3n]/.TH \1 3tcl/' \
+ cat $$f | sed -e 's/^\.TH \([^ ]\+\|"[^"]\+"\) [3n]/.TH \1 3tcl/' \
-e 's/\(Tk_[0-9A-Za-z]*\)(3)/\1(3tk)/g' \
-e 's/\([A-Z][0-9A-Za-z_]*\)(3)/\1(3tcl)/g' \
-e 's/send(n)/send(3tk)/g' \
@@ -109,7 +115,7 @@
-e 's/tk(n)/tk(3tk)/g' \
-e 's/winfo(n)/winfo(3tk)/g' \
-e 's/(n)/(3tcl)/g' >$$f2 ; \
- rm $$f ; \
+ rm $$f ; \
fi ; \
done
@@ -158,9 +164,10 @@
source diff:
@echo >&2 'source and diff are obsolete - use dpkg-source -b'; false
+binary: binary-indep binary-arch
+
get-orig-source:
wget -O tcl8.3_8.3.5.orig.tar.gz \
http://prdownloads.sourceforge.net/tcl/tcl8.3.5-src.tar.gz
-binary: binary-indep binary-arch
.PHONY: patch unpatch clean-patched build clean binary-indep binary-arch binary install get-orig-source
More information about the Pkg-tcltk-commits
mailing list