diff options
| author |   Keri Harris <keri@gentoo.org> | 2007-01-08 07:50:42 +0000 |
|---|---|---|
| committer | Keri Harris <keri@gentoo.org> | 2007-01-08 07:50:42 +0000 |
| commit | 292268ffb05f7f63de0473f472503429f904652d (patch) | |
| tree | eb7e300244bdb4e589e4f0872fdfabf0796382b8 /dev-lang/mercury | |
| parent | Fix troubles with newer ati drivers thanks to anarchy in bug 158701 (diff) | |
| download | gentoo-2-292268ffb05f7f63de0473f472503429f904652d.tar.gz gentoo-2-292268ffb05f7f63de0473f472503429f904652d.tar.bz2 gentoo-2-292268ffb05f7f63de0473f472503429f904652d.zip | |
Merge unboxed_float fix into bootstrap patch
(Portage version: 2.1.2_rc4-r2)
Diffstat (limited to 'dev-lang/mercury')
| -rw-r--r-- | dev-lang/mercury/ChangeLog | 5 | ||||
| -rw-r--r-- | dev-lang/mercury/files/mercury-0.12.2-bootstrap.patch | 37 |
2 files changed, 41 insertions, 1 deletions
diff --git a/dev-lang/mercury/ChangeLog b/dev-lang/mercury/ChangeLog index 263fd5fca4e3..8ebe6a10eab1 100644 --- a/dev-lang/mercury/ChangeLog +++ b/dev-lang/mercury/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-lang/mercury # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/ChangeLog,v 1.71 2007/01/08 06:27:34 keri Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/ChangeLog,v 1.72 2007/01/08 07:50:42 keri Exp $ + + 08 Jan 2007; keri <keri@gentoo.org> files/mercury-0.12.2-bootstrap.patch: + Merge unboxed_float fix into bootstrap patch. 08 Jan 2007; keri <keri@gentoo.org> files/mercury-0.12.2-bootstrap.patch, -files/mercury-0.12.2-unboxed_floats.patch, diff --git a/dev-lang/mercury/files/mercury-0.12.2-bootstrap.patch b/dev-lang/mercury/files/mercury-0.12.2-bootstrap.patch index 68e6dbc0ac94..32a2e6fbd921 100644 --- a/dev-lang/mercury/files/mercury-0.12.2-bootstrap.patch +++ b/dev-lang/mercury/files/mercury-0.12.2-bootstrap.patch @@ -1,5 +1,42 @@ --- mercury-compiler-0.12.2.orig/configure 2006-01-25 17:24:01.000000000 +1300 +++ mercury-compiler-0.12.2/configure 2006-07-24 20:11:45.000000000 +1200 +@@ -7232,21 +7232,21 @@ + + echo "$as_me:$LINENO: result: $mercury_cv_unboxed_floats" >&5 + echo "${ECHO_T}$mercury_cv_unboxed_floats" >&6 +-if test "$mercury_cv_unboxed_floats" = yes; then +- if test "$BOOTSTRAP_MC" = ""; then +- { echo "$as_me:$LINENO: WARNING: Mercury compiler not yet installed - +-**** cannot use unboxed floats, bootstrapping using boxed floats +-**** after installation is complete you may want to reinstall +-**** from scratch so you can use unboxed floats, which are more +-**** efficient." >&5 +-echo "$as_me: WARNING: Mercury compiler not yet installed - +-**** cannot use unboxed floats, bootstrapping using boxed floats +-**** after installation is complete you may want to reinstall +-**** from scratch so you can use unboxed floats, which are more +-**** efficient." >&2;} +- mercury_cv_unboxed_floats=no +- fi +-fi ++#if test "$mercury_cv_unboxed_floats" = yes; then ++# if test "$BOOTSTRAP_MC" = ""; then ++# { echo "$as_me:$LINENO: WARNING: Mercury compiler not yet installed - ++#**** cannot use unboxed floats, bootstrapping using boxed floats ++#**** after installation is complete you may want to reinstall ++#**** from scratch so you can use unboxed floats, which are more ++#**** efficient." >&5 ++#echo "$as_me: WARNING: Mercury compiler not yet installed - ++#**** cannot use unboxed floats, bootstrapping using boxed floats ++#**** after installation is complete you may want to reinstall ++#**** from scratch so you can use unboxed floats, which are more ++#**** efficient." >&2;} ++# mercury_cv_unboxed_floats=no ++# fi ++#fi + if test "$mercury_cv_unboxed_floats" = yes; then + HAVE_BOXED_FLOATS="--unboxed-float" + else @@ -8790,34 +8790,34 @@ if test "$BEST_GRADE_FOR_COMPILER" != "$BOOTSTRAP_GRADE"; then |