Merge lp:~peter-pearse/ubuntu/natty/tcl8.4/prop001 into lp:ubuntu/natty/tcl8.4

Proposed by Peter Pearse
Status: Merged
Merged at revision: 18
Proposed branch: lp:~peter-pearse/ubuntu/natty/tcl8.4/prop001
Merge into: lp:ubuntu/natty/tcl8.4
Diff against target: 28 lines (+10/-0)
2 files modified
debian/changelog (+7/-0)
debian/rules (+3/-0)
To merge this branch: bzr merge lp:~peter-pearse/ubuntu/natty/tcl8.4/prop001
Reviewer Review Type Date Requested Status
Steve Langasek Pending
Review via email: mp+49198@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2010-12-06 01:27:25 +0000
3+++ debian/changelog 2011-02-10 09:31:23 +0000
4@@ -1,3 +1,10 @@
5+tcl8.4 (8.4.19-4ubuntu3) maverick; urgency=low
6+
7+ * Pass CC to compiler and set ac_cv variables, to allow cross builds -
8+ see http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=597708
9+
10+ -- Peter Pearse <peter.pearse@linaro.org> Thu, 10 Feb 2011 09:26:48 +0000
11+
12 tcl8.4 (8.4.19-4ubuntu2) natty; urgency=low
13
14 * Update patch fortify-source to use a cleaner fix from upstream (use memcpy
15
16=== modified file 'debian/rules'
17--- debian/rules 2009-09-05 11:34:08 +0000
18+++ debian/rules 2011-02-10 09:31:23 +0000
19@@ -35,6 +35,9 @@
20 # So so ugly but it works...
21 touch generic/tclStubInit.c
22 cd unix && \
23+ CC=$(DEB_HOST_GNU_TYPE)-gcc \
24+ ac_cv_func_strtod=yes \
25+ tcl_cv_strtod_buggy=1 \
26 TCL_LIBRARY="/usr/share/tcltk/tcl$(v)" \
27 TCL_PACKAGE_PATH="/usr/local/lib/tcltk /usr/local/share/tcltk /usr/lib/tcltk /usr/share/tcltk /usr/lib" \
28 ./configure --host=$(DEB_HOST_GNU_TYPE) \

Subscribers

People subscribed via source and target branches

to all changes: