Merge lp:~clint-fewbar/ubuntu/maverick/libdbi/no-fast-math into lp:ubuntu/maverick/libdbi

Proposed by Clint Byrum
Status: Merged
Merge reported by: Benjamin Drung
Merged at revision: not available
Proposed branch: lp:~clint-fewbar/ubuntu/maverick/libdbi/no-fast-math
Merge into: lp:ubuntu/maverick/libdbi
Diff against target: 40 lines (+9/-2)
3 files modified
configure (+1/-1)
configure.in (+1/-1)
debian/changelog (+7/-0)
To merge this branch: bzr merge lp:~clint-fewbar/ubuntu/maverick/libdbi/no-fast-math
Reviewer Review Type Date Requested Status
Ubuntu Sponsors Pending
Review via email: mp+49347@code.launchpad.net

Description of the change

SRU for maverick. Note that this is identical to the fix for natty except the changelog entry version number and target (maverick-proposed)

As usual, this can't be proposed for merge with maverick-proposed/libdbi, because that does not exist yet.

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 'configure'
2--- configure 2010-07-28 12:44:39 +0000
3+++ configure 2011-02-11 05:31:17 +0000
4@@ -19257,7 +19257,7 @@
5 case $host in
6 *-*-linux*)
7 DEBUG="-g -Wall -D_REENTRANT -D__NO_MATH_INLINES -fsigned-char -std=gnu99"
8- CFLAGS="-O20 -ffast-math -D_REENTRANT -fsigned-char -std=gnu99"
9+ CFLAGS="-O20 -ffast-math -D_REENTRANT -fsigned-char -std=gnu99 -fno-fast-math"
10 PROFILE="-pg -g -O20 -ffast-math -D_REENTRANT -fsigned-char -std=gnu99";;
11 sparc-sun-*)
12 DEBUG="-g -Wall -D__NO_MATH_INLINES -fsigned-char -mv8 -std=gnu99"
13
14=== modified file 'configure.in'
15--- configure.in 2010-07-28 12:44:39 +0000
16+++ configure.in 2011-02-11 05:31:17 +0000
17@@ -55,7 +55,7 @@
18 case $host in
19 *-*-linux*)
20 DEBUG="-g -Wall -D_REENTRANT -D__NO_MATH_INLINES -fsigned-char -std=gnu99"
21- CFLAGS="-O20 -ffast-math -D_REENTRANT -fsigned-char -std=gnu99"
22+ CFLAGS="-O20 -ffast-math -D_REENTRANT -fsigned-char -std=gnu99 -fno-fast-math"
23 PROFILE="-pg -g -O20 -ffast-math -D_REENTRANT -fsigned-char -std=gnu99";;
24 sparc-sun-*)
25 DEBUG="-g -Wall -D__NO_MATH_INLINES -fsigned-char -mv8 -std=gnu99"
26
27=== modified file 'debian/changelog'
28--- debian/changelog 2010-07-28 12:44:39 +0000
29+++ debian/changelog 2011-02-11 05:31:17 +0000
30@@ -1,3 +1,10 @@
31+libdbi (0.8.3-0ubuntu1.1) maverick-proposed; urgency=low
32+
33+ * configure.in, configure: patched CFLAGS to pass -fno-fast-math to
34+ prevent floating point problems on i386 (LP: #673307)
35+
36+ -- Clint Byrum <clint@ubuntu.com> Thu, 10 Feb 2011 20:31:59 -0800
37+
38 libdbi (0.8.3-0ubuntu1) maverick; urgency=low
39
40 * New upstream release.

Subscribers

People subscribed via source and target branches

to all changes: