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

Proposed by Clint Byrum
Status: Merged
Merged at revision: 5
Proposed branch: lp:~clint-fewbar/ubuntu/natty/libdbi/no-fast-math
Merge into: lp:ubuntu/natty/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/natty/libdbi/no-fast-math
Reviewer Review Type Date Requested Status
Martin Pitt Approve
Colin Watson Needs Fixing
Review via email: mp+45447@code.launchpad.net

Description of the change

Appends -fno-fast-math in configure script.

To post a comment you must log in.
Revision history for this message
Colin Watson (cjwatson) :
review: Approve
Revision history for this message
Colin Watson (cjwatson) wrote :

It's not a good idea to change only a generated file and not its source. The next time somebody runs autoconf your fix will be dropped.

Could you please change configure.in too?

review: Needs Fixing
Revision history for this message
Clint Byrum (clint-fewbar) wrote :

On Fri, 2011-01-07 at 13:31 +0000, Colin Watson wrote:
> Review: Needs Fixing
> It's not a good idea to change only a generated file and not its source. The next time somebody runs autoconf your fix will be dropped.
>
> Could you please change configure.in too?

Makes perfect sense.

Pushed w/ configure.in changed as well.

6. By Clint Byrum

configure.in, configure: patched CFLAGS to pass -fno-fast-math to
prevent floating point problems on i386 (LP: #673307)

Revision history for this message
Martin Pitt (pitti) wrote :

Thanks, this looks good now!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'configure'
--- configure 2010-07-28 12:44:39 +0000
+++ configure 2011-01-07 17:49:14 +0000
@@ -19257,7 +19257,7 @@
19257 case $host in19257 case $host in
19258 *-*-linux*)19258 *-*-linux*)
19259 DEBUG="-g -Wall -D_REENTRANT -D__NO_MATH_INLINES -fsigned-char -std=gnu99"19259 DEBUG="-g -Wall -D_REENTRANT -D__NO_MATH_INLINES -fsigned-char -std=gnu99"
19260 CFLAGS="-O20 -ffast-math -D_REENTRANT -fsigned-char -std=gnu99"19260 CFLAGS="-O20 -ffast-math -D_REENTRANT -fsigned-char -std=gnu99 -fno-fast-math"
19261 PROFILE="-pg -g -O20 -ffast-math -D_REENTRANT -fsigned-char -std=gnu99";;19261 PROFILE="-pg -g -O20 -ffast-math -D_REENTRANT -fsigned-char -std=gnu99";;
19262 sparc-sun-*)19262 sparc-sun-*)
19263 DEBUG="-g -Wall -D__NO_MATH_INLINES -fsigned-char -mv8 -std=gnu99"19263 DEBUG="-g -Wall -D__NO_MATH_INLINES -fsigned-char -mv8 -std=gnu99"
1926419264
=== modified file 'configure.in'
--- configure.in 2010-07-28 12:44:39 +0000
+++ configure.in 2011-01-07 17:49:14 +0000
@@ -55,7 +55,7 @@
55 case $host in55 case $host in
56 *-*-linux*)56 *-*-linux*)
57 DEBUG="-g -Wall -D_REENTRANT -D__NO_MATH_INLINES -fsigned-char -std=gnu99"57 DEBUG="-g -Wall -D_REENTRANT -D__NO_MATH_INLINES -fsigned-char -std=gnu99"
58 CFLAGS="-O20 -ffast-math -D_REENTRANT -fsigned-char -std=gnu99"58 CFLAGS="-O20 -ffast-math -D_REENTRANT -fsigned-char -std=gnu99 -fno-fast-math"
59 PROFILE="-pg -g -O20 -ffast-math -D_REENTRANT -fsigned-char -std=gnu99";;59 PROFILE="-pg -g -O20 -ffast-math -D_REENTRANT -fsigned-char -std=gnu99";;
60 sparc-sun-*)60 sparc-sun-*)
61 DEBUG="-g -Wall -D__NO_MATH_INLINES -fsigned-char -mv8 -std=gnu99"61 DEBUG="-g -Wall -D__NO_MATH_INLINES -fsigned-char -mv8 -std=gnu99"
6262
=== modified file 'debian/changelog'
--- debian/changelog 2010-07-28 12:44:39 +0000
+++ debian/changelog 2011-01-07 17:49:14 +0000
@@ -1,3 +1,10 @@
1libdbi (0.8.3-0ubuntu2) natty; urgency=low
2
3 * configure.in, configure: patched CFLAGS to pass -fno-fast-math to
4 prevent floating point problems on i386 (LP: #673307)
5
6 -- Clint Byrum <clint@ubuntu.com> Fri, 07 Jan 2011 09:46:04 -0800
7
1libdbi (0.8.3-0ubuntu1) maverick; urgency=low8libdbi (0.8.3-0ubuntu1) maverick; urgency=low
29
3 * New upstream release.10 * New upstream release.

Subscribers

People subscribed via source and target branches

to all changes: