[Pkg-haskell-commits] darcs: helium: releasing version 1.6-6
Marco Túlio Gontijo e Silva
marcot at debian.org
Thu Mar 18 22:59:15 UTC 2010
Mon Mar 15 13:30:53 UTC 2010 Marco T[_\c3_][_\ba_]lio Gontijo e Silva <marcot at debian.org>
* releasing version 1.6-6
Ignore-this: 22ca105b17f98bb2755258178c77e5be
M ./changelog +6
M ./patches/01_fhs-and-destdir -3 +4
M ./patches/02_typed-punning -3 +4
M ./patches/03_add-readline-support -11 +11
M ./patches/04_fixes-for-ghc6 -12 +16
M ./patches/05_fixes-for-64bit -9 +12
M ./patches/06_no-strip -9 +12
M ./patches/10_autoconf -327 +354
M ./patches/11_iso-8859-1 -2 +2
M ./patches/12_no_rec -42 +42
Mon Mar 15 13:30:53 UTC 2010 Marco Túlio Gontijo e Silva <marcot at debian.org>
* releasing version 1.6-6
Ignore-this: 22ca105b17f98bb2755258178c77e5be
diff -rN -u old-helium/changelog new-helium/changelog
--- old-helium/changelog 2010-03-18 22:59:15.656726579 +0000
+++ new-helium/changelog 2010-03-18 22:59:15.724730214 +0000
@@ -1,3 +1,9 @@
+helium (1.6-6) unstable; urgency=low
+
+ * Refresh patches to make them work with Lenny's dpkg.
+
+ -- Marco Túlio Gontijo e Silva <marcot at debian.org> Mon, 15 Mar 2010 10:30:50 -0300
+
helium (1.6-5) unstable; urgency=low
* Use 3.0 (quilt) source format.
diff -rN -u old-helium/patches/01_fhs-and-destdir new-helium/patches/01_fhs-and-destdir
--- old-helium/patches/01_fhs-and-destdir 2010-03-18 22:59:15.656726579 +0000
+++ new-helium/patches/01_fhs-and-destdir 2010-03-18 22:59:15.720730000 +0000
@@ -1,8 +1,9 @@
# Description: FHS and destdir
# Author: Arjan Oosting <arjanoosting at home.nl>
-diff -urNad helium-1.6~/helium/src/Makefile.in helium-1.6/helium/src/Makefile.in
---- helium-1.6~/helium/src/Makefile.in 2006-09-15 06:03:02.000000000 +0200
-+++ helium-1.6/helium/src/Makefile.in 2006-09-15 06:05:29.000000000 +0200
+Index: helium-1.6/helium/src/Makefile.in
+===================================================================
+--- helium-1.6.orig/helium/src/Makefile.in 2006-02-05 14:34:46.000000000 -0200
++++ helium-1.6/helium/src/Makefile.in 2010-03-15 10:27:08.000000000 -0300
@@ -28,9 +28,9 @@
prefix = @prefix@
diff -rN -u old-helium/patches/02_typed-punning new-helium/patches/02_typed-punning
--- old-helium/patches/02_typed-punning 2010-03-18 22:59:15.648726151 +0000
+++ new-helium/patches/02_typed-punning 2010-03-18 22:59:15.720730000 +0000
@@ -1,8 +1,9 @@
# Description: Typed punning
# Author: Arjan Oosting <arjanoosting at home.nl>
-diff -urNad helium-1.6~/lvm/src/configure helium-1.6/lvm/src/configure
---- helium-1.6~/lvm/src/configure 2006-02-05 17:35:50.000000000 +0100
-+++ helium-1.6/lvm/src/configure 2006-09-15 06:25:03.000000000 +0200
+Index: helium-1.6/lvm/src/configure
+===================================================================
+--- helium-1.6.orig/lvm/src/configure 2006-02-05 14:35:50.000000000 -0200
++++ helium-1.6/lvm/src/configure 2010-03-15 10:27:12.000000000 -0300
@@ -662,7 +662,7 @@
echo "CONFIGPATH=../config" >> makefile;;
esac
diff -rN -u old-helium/patches/03_add-readline-support new-helium/patches/03_add-readline-support
--- old-helium/patches/03_add-readline-support 2010-03-18 22:59:15.648726151 +0000
+++ new-helium/patches/03_add-readline-support 2010-03-18 22:59:15.720730000 +0000
@@ -1,8 +1,9 @@
# Description: Add readline support
# Author: Arjan Oosting <arjanoosting at home.nl>
-diff -urNad helium-1.6~/helium/src/Makefile.in helium-1.6/helium/src/Makefile.in
---- helium-1.6~/helium/src/Makefile.in 2006-09-15 15:06:31.000000000 +0200
-+++ helium-1.6/helium/src/Makefile.in 2006-09-15 15:06:32.000000000 +0200
+Index: helium-1.6/helium/src/Makefile.in
+===================================================================
+--- helium-1.6.orig/helium/src/Makefile.in 2010-03-15 10:27:08.000000000 -0300
++++ helium-1.6/helium/src/Makefile.in 2010-03-15 10:27:14.000000000 -0300
@@ -48,7 +48,7 @@
PACKAGENET =
endif
@@ -12,9 +13,10 @@
AG = @WithAG@
AG_OPTS = -mscfr
-diff -urNad helium-1.6~/helium/src/texthint/Main.hs helium-1.6/helium/src/texthint/Main.hs
---- helium-1.6~/helium/src/texthint/Main.hs 2006-09-15 15:06:18.000000000 +0200
-+++ helium-1.6/helium/src/texthint/Main.hs 2006-09-15 15:07:44.000000000 +0200
+Index: helium-1.6/helium/src/texthint/Main.hs
+===================================================================
+--- helium-1.6.orig/helium/src/texthint/Main.hs 2006-02-05 14:34:36.000000000 -0200
++++ helium-1.6/helium/src/texthint/Main.hs 2010-03-15 10:27:14.000000000 -0300
@@ -15,6 +15,7 @@
import Monad(when)
import IO(stdout, hFlush)
@@ -22,8 +24,8 @@
+import qualified System.Console.Editline.Readline as RL
import OSSpecific(slash)
import Directory
-
-@@ -75,8 +76,11 @@
+
+@@ -75,7 +76,10 @@
else
return initialState
@@ -35,8 +37,7 @@
loop stateAfterLoad
return ()
-
-@@ -89,21 +89,24 @@
+@@ -89,21 +93,24 @@
loop :: State -> IO State
loop state = do
@@ -69,4 +70,3 @@
loop newState
where
prompt :: State -> String
-
diff -rN -u old-helium/patches/04_fixes-for-ghc6 new-helium/patches/04_fixes-for-ghc6
--- old-helium/patches/04_fixes-for-ghc6 2010-03-18 22:59:15.648726151 +0000
+++ new-helium/patches/04_fixes-for-ghc6 2010-03-18 22:59:15.720730000 +0000
@@ -1,8 +1,9 @@
# Description: Fixes for ghc6
# Author: Arjan Oosting <arjan at debian.org>
-diff -urNad helium~/Top/src/Top/Ordering/Tree.hs helium/Top/src/Top/Ordering/Tree.hs
---- helium~/Top/src/Top/Ordering/Tree.hs 2008-01-28 00:02:11.000000000 +0100
-+++ helium/Top/src/Top/Ordering/Tree.hs 2008-01-28 00:02:29.000000000 +0100
+Index: helium-1.6/Top/src/Top/Ordering/Tree.hs
+===================================================================
+--- helium-1.6.orig/Top/src/Top/Ordering/Tree.hs 2006-02-05 14:35:54.000000000 -0200
++++ helium-1.6/Top/src/Top/Ordering/Tree.hs 2010-03-15 10:27:16.000000000 -0300
@@ -36,13 +36,15 @@
infixr 8 .>. , .>>. , .<. , .<<.
@@ -25,9 +26,10 @@
------------------------------------------------------------------------
-diff -urNad helium~/Top/src/makefile helium/Top/src/makefile
---- helium~/Top/src/makefile 2008-01-28 00:02:11.000000000 +0100
-+++ helium/Top/src/makefile 2008-01-28 00:02:29.000000000 +0100
+Index: helium-1.6/Top/src/makefile
+===================================================================
+--- helium-1.6.orig/Top/src/makefile 2006-02-05 14:35:55.000000000 -0200
++++ helium-1.6/Top/src/makefile 2010-03-15 10:27:16.000000000 -0300
@@ -51,7 +51,7 @@
topsolver-prof:
@@ -37,9 +39,10 @@
#-----------------------------------------------------------------------
# Cobalt
-diff -urNad helium~/helium/src/Makefile.in helium/helium/src/Makefile.in
---- helium~/helium/src/Makefile.in 2008-01-28 00:02:29.000000000 +0100
-+++ helium/helium/src/Makefile.in 2008-01-28 00:03:59.000000000 +0100
+Index: helium-1.6/helium/src/Makefile.in
+===================================================================
+--- helium-1.6.orig/helium/src/Makefile.in 2010-03-15 10:27:14.000000000 -0300
++++ helium-1.6/helium/src/Makefile.in 2010-03-15 10:27:16.000000000 -0300
@@ -48,7 +48,7 @@
PACKAGENET =
endif
@@ -49,9 +52,10 @@
AG = @WithAG@
AG_OPTS = -mscfr
-diff -urNad helium~/lvm/src/lib/makefile helium/lvm/src/lib/makefile
---- helium~/lvm/src/lib/makefile 2008-01-28 00:02:11.000000000 +0100
-+++ helium/lvm/src/lib/makefile 2008-01-28 00:02:29.000000000 +0100
+Index: helium-1.6/lvm/src/lib/makefile
+===================================================================
+--- helium-1.6.orig/lvm/src/lib/makefile 2006-02-05 14:35:50.000000000 -0200
++++ helium-1.6/lvm/src/lib/makefile 2010-03-15 10:27:16.000000000 -0300
@@ -20,7 +20,7 @@
#the haskell compiler
diff -rN -u old-helium/patches/05_fixes-for-64bit new-helium/patches/05_fixes-for-64bit
--- old-helium/patches/05_fixes-for-64bit 2010-03-18 22:59:15.648726151 +0000
+++ new-helium/patches/05_fixes-for-64bit 2010-03-18 22:59:15.720730000 +0000
@@ -1,8 +1,9 @@
# Description: Fix for 64 bit
# Author: Arjan Oosting <arjan at debian.org>
-diff -urNad helium~/lvm/src/lib/common/Byte.hs helium/lvm/src/lib/common/Byte.hs
---- helium~/lvm/src/lib/common/Byte.hs 2007-02-05 23:44:40.000000000 +0100
-+++ helium/lvm/src/lib/common/Byte.hs 2007-02-05 23:46:19.000000000 +0100
+Index: helium-1.6/lvm/src/lib/common/Byte.hs
+===================================================================
+--- helium-1.6.orig/lvm/src/lib/common/Byte.hs 2006-02-05 14:35:48.000000000 -0200
++++ helium-1.6/lvm/src/lib/common/Byte.hs 2010-03-15 10:27:18.000000000 -0300
@@ -27,6 +27,8 @@
, stringFromByteList, bytesFromByteList
) where
@@ -82,9 +83,10 @@
} `catch` (\exception ->
let message = show exception ++ "\n\nUnable to read from file " ++ show path
in do { putStrLn message; exitWith (ExitFailure 1) })
-diff -urNad helium~/lvm/src/lib/common/Id.hs helium/lvm/src/lib/common/Id.hs
---- helium~/lvm/src/lib/common/Id.hs 2007-02-05 23:44:40.000000000 +0100
-+++ helium/lvm/src/lib/common/Id.hs 2007-02-05 23:46:19.000000000 +0100
+Index: helium-1.6/lvm/src/lib/common/Id.hs
+===================================================================
+--- helium-1.6.orig/lvm/src/lib/common/Id.hs 2006-02-05 14:35:48.000000000 -0200
++++ helium-1.6/lvm/src/lib/common/Id.hs 2010-03-15 10:27:18.000000000 -0300
@@ -29,16 +29,19 @@
import Standard (foldlStrict)
import qualified IntMap
@@ -213,9 +215,10 @@
-diff -urNad helium~/lvm/src/runtime/common/mlvalues.h helium/lvm/src/runtime/common/mlvalues.h
---- helium~/lvm/src/runtime/common/mlvalues.h 2007-02-05 23:42:52.000000000 +0100
-+++ helium/lvm/src/runtime/common/mlvalues.h 2007-02-05 23:45:30.000000000 +0100
+Index: helium-1.6/lvm/src/runtime/common/mlvalues.h
+===================================================================
+--- helium-1.6.orig/lvm/src/runtime/common/mlvalues.h 2006-02-05 14:35:31.000000000 -0200
++++ helium-1.6/lvm/src/runtime/common/mlvalues.h 2010-03-15 10:27:18.000000000 -0300
@@ -25,6 +25,7 @@
#ifndef _mlvalues_
#define _mlvalues_
diff -rN -u old-helium/patches/06_no-strip new-helium/patches/06_no-strip
--- old-helium/patches/06_no-strip 2010-03-18 22:59:15.648726151 +0000
+++ new-helium/patches/06_no-strip 2010-03-18 22:59:15.720730000 +0000
@@ -1,8 +1,9 @@
# Description: No strip
# Author: Arjan Oosting <arjan at debian.org>
-diff -urNad helium~/helium/src/Makefile.in helium/helium/src/Makefile.in
---- helium~/helium/src/Makefile.in 2007-08-12 21:28:06.000000000 +0200
-+++ helium/helium/src/Makefile.in 2007-08-12 21:30:06.000000000 +0200
+Index: helium-1.6/helium/src/Makefile.in
+===================================================================
+--- helium-1.6.orig/helium/src/Makefile.in 2010-03-15 10:27:16.000000000 -0300
++++ helium-1.6/helium/src/Makefile.in 2010-03-15 10:27:28.000000000 -0300
@@ -201,7 +201,7 @@
@echo "****************************************************"
$(HC) -o $(HELIUMBINDIR)/$(MAIN)$(EXE) $(HC_OPTS) $(OBJS)
@@ -21,9 +22,10 @@
texthint/Main.o: utils/OSSpecific.hi texthint/Main.hs
-diff -urNad helium~/lvm/src/lib/makefile helium/lvm/src/lib/makefile
---- helium~/lvm/src/lib/makefile 2007-08-12 21:28:06.000000000 +0200
-+++ helium/lvm/src/lib/makefile 2007-08-12 21:31:17.000000000 +0200
+Index: helium-1.6/lvm/src/lib/makefile
+===================================================================
+--- helium-1.6.orig/lvm/src/lib/makefile 2010-03-15 10:27:16.000000000 -0300
++++ helium-1.6/lvm/src/lib/makefile 2010-03-15 10:27:28.000000000 -0300
@@ -55,7 +55,7 @@
# The main target
$(MAIN)$(EXE): $(OBJS)
@@ -33,9 +35,10 @@
common/ghc/Special.hi: common/ghc/Special.hs
$(HC) -c $< -cpp -fglasgow-exts $(HC_OPTS)
-diff -urNad helium~/lvm/src/runtime/makefile helium/lvm/src/runtime/makefile
---- helium~/lvm/src/runtime/makefile 2007-05-11 07:32:11.000000000 +0200
-+++ helium/lvm/src/runtime/makefile 2007-08-12 21:32:04.000000000 +0200
+Index: helium-1.6/lvm/src/runtime/makefile
+===================================================================
+--- helium-1.6.orig/lvm/src/runtime/makefile 2006-02-05 14:35:35.000000000 -0200
++++ helium-1.6/lvm/src/runtime/makefile 2010-03-15 10:27:28.000000000 -0300
@@ -51,7 +51,7 @@
lvmrun$(EXE): $(OBJS)
diff -rN -u old-helium/patches/10_autoconf new-helium/patches/10_autoconf
--- old-helium/patches/10_autoconf 2010-03-18 22:59:15.648726151 +0000
+++ new-helium/patches/10_autoconf 2010-03-18 22:59:15.712729573 +0000
@@ -1,8 +1,9 @@
# Description: Autoconf
# Author: Arjan Oosting <arjanoosting at home.nl>
-diff -urNad helium~/helium/configure helium/helium/configure
---- helium~/helium/configure 2006-09-15 19:39:20.000000000 +0200
-+++ helium/helium/configure 2006-12-10 01:07:39.000000000 +0100
+Index: helium-1.6/helium/configure
+===================================================================
+--- helium-1.6.orig/helium/configure 2006-02-05 14:34:46.000000000 -0200
++++ helium-1.6/helium/configure 2010-03-15 10:27:30.000000000 -0300
@@ -1,46 +1,646 @@
#! /bin/sh
-
@@ -18,9 +19,7 @@
+## --------------------- ##
+## M4sh Initialization. ##
+## --------------------- ##
-
--# Defaults:
--ac_help=
++
+# Be Bourne compatible
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+ emulate sh
@@ -367,7 +366,9 @@
+fi
+
+
-+
+
+-# Defaults:
+-ac_help=
+(eval "as_func_return () {
+ (exit \$1)
+}
@@ -774,11 +775,11 @@
| --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
- cache_file="$ac_optarg" ;;
+ cache_file=$ac_optarg ;;
-
-- -datadir | --datadir | --datadi | --datad | --data | --dat | --da)
++
+ --config-cache | -C)
+ cache_file=config.cache ;;
-+
+
+- -datadir | --datadir | --datadi | --datad | --data | --dat | --da)
+ -datadir | --datadir | --datadi | --datad)
ac_prev=datadir ;;
- -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \
@@ -1263,6 +1264,10 @@
-rm -rf conftest* confdefs.h
-# AIX cpp loses on an empty file, so make sure it contains at least a newline.
-echo > confdefs.h
+-
+-# A filename unique to this package, relative to the directory that
+-# configure is in, which we can look for to find out if srcdir is correct.
+-ac_unique_file=src/Makefile.in
+ac_pwd=`pwd` && test -n "$ac_pwd" &&
+ac_ls_di=`ls -di .` &&
+ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
@@ -1271,10 +1276,7 @@
+test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
+ { echo "$as_me: error: pwd does not report name of working directory" >&2
+ { (exit 1); exit 1; }; }
-
--# A filename unique to this package, relative to the directory that
--# configure is in, which we can look for to find out if srcdir is correct.
--ac_unique_file=src/Makefile.in
++
# Find the source files, if location was not specified.
if test -z "$srcdir"; then
@@ -1325,8 +1327,7 @@
+ test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
+ { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
+ { (exit 1); exit 1; }; }
- fi
--srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'`
++fi
+ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
+ac_abs_confdir=`(
+ cd "$srcdir" && test -r "./$ac_unique_file" || { echo "$as_me: error: $ac_msg" >&2
@@ -1508,8 +1509,9 @@
+ fi || ac_status=$?
+ cd "$ac_pwd" || { ac_status=$?; break; }
+ done
-+fi
-+
+ fi
+-srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'`
+
+test -n "$ac_init_help" && exit $ac_status
+if $ac_init_version; then
+ cat <<\_ACEOF
@@ -1761,7 +1763,7 @@
+#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
+_ACEOF
+
-
++
+# Let the site file select an alternate cache file if it wants to.
# Prefer explicitly selected file to automatically selected ones.
-if test -z "$CONFIG_SITE"; then
@@ -1810,8 +1812,8 @@
+ { echo "$as_me:$LINENO: creating cache $cache_file" >&5
+echo "$as_me: creating cache $cache_file" >&6;}
+ >$cache_file
- fi
-
++fi
++
+# Check that the precious variables saved in the cache have kept the same
+# value.
+ac_cache_corrupted=false
@@ -1859,8 +1861,8 @@
+ { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
+echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
+ { (exit 1); exit 1; }; }
-+fi
-+
+ fi
+
+
+
+
@@ -1883,10 +1885,7 @@
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
+-
-ac_exeext=
-ac_objext=o
-if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
@@ -1896,6 +1895,10 @@
-' ac_t=' '
- else
- ac_n=-n ac_c= ac_t=
++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_c_compiler_gnu
++
+
+
+# check for C compiler
@@ -2261,13 +2264,26 @@
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
+-
+-cat > conftest.$ac_ext << EOF
+-
+-#line 674 "configure"
+-#include "confdefs.h"
+-
+-main(){return(0);}
+-EOF
+-if { (eval echo configure:679: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+- ac_cv_prog_cc_works=yes
+- # If we can't run a trivial program, we are probably using a cross compiler.
+- if (./conftest; exit) 2>/dev/null; then
+- ac_cv_prog_cc_cross=no
+ test -n "$ac_ct_CC" && break
+done
-
--cat > conftest.$ac_ext << EOF
++
+ if test "x$ac_ct_CC" = x; then
+ CC=""
-+ else
+ else
+- ac_cv_prog_cc_cross=yes
+ case $cross_compiling:$ac_tool_warned in
+yes:)
+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
@@ -2279,20 +2295,44 @@
+ac_tool_warned=yes ;;
+esac
+ CC=$ac_ct_CC
-+ fi
-+fi
-
--#line 674 "configure"
--#include "confdefs.h"
-+fi
-
--main(){return(0);}
+ fi
+-else
+- echo "configure: failed program was:" >&5
+- cat conftest.$ac_ext >&5
+- ac_cv_prog_cc_works=no
+ fi
+-rm -fr conftest*
+-ac_ext=c
+-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+-ac_cpp='$CPP $CPPFLAGS'
+-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+-cross_compiling=$ac_cv_prog_cc_cross
+-
+-echo "$ac_t""$ac_cv_prog_cc_works" 1>&6
+-if test $ac_cv_prog_cc_works = no; then
+- { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
+-fi
+-echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
+-echo "configure:705: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+-echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
+-cross_compiling=$ac_cv_prog_cc_cross
+-
+-echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
+-echo "configure:710: checking whether we are using GNU C" >&5
+-if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
+- echo $ac_n "(cached) $ac_c" 1>&6
+-else
+- cat > conftest.c <<EOF
+-#ifdef __GNUC__
+- yes;
+-#endif
-EOF
--if { (eval echo configure:679: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-- ac_cv_prog_cc_works=yes
-- # If we can't run a trivial program, we are probably using a cross compiler.
-- if (./conftest; exit) 2>/dev/null; then
-- ac_cv_prog_cc_cross=no
+-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:719: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+- ac_cv_prog_gcc=yes
++
++fi
++
+
+test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
+See \`config.log' for more details." >&5
@@ -2418,9 +2458,10 @@
+done
+test "$ac_cv_exeext" = no && ac_cv_exeext=
+
-+else
+ else
+- ac_cv_prog_gcc=no
+ ac_file=''
-+fi
+ fi
+
+{ echo "$as_me:$LINENO: result: $ac_file" >&5
+echo "${ECHO_T}$ac_file" >&6; }
@@ -2455,8 +2496,7 @@
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ cross_compiling=no
- else
-- ac_cv_prog_cc[...incomplete...]
More information about the Pkg-haskell-commits
mailing list