Tags: patch Hi,
the error Daniel reported, is caused by a difference in the new ghc6 (6.4.1),
which produces an output of several lines instead of a only one-liner, when
it precompiles (-E) the program, that consists only of:
"__GLASGOW_HASKELL__"
Since scripts/confhc uses this output in function ghcsym() and creates
lib/debian/config, I've modified this in patch_hmake_confhc.patch.
However there is still another compile-error about multi-line-strings in
src/interpreter/HInteractive.hs. (Sorry for not including error output here).
I've also attached a patch to solve this (patch_hmake_hinteractive.patch).
Cheers,
Stefan.
--- hmake-3.10.orig/script/confhc
+++ hmake-3.10/script/confhc
@@ -78,7 +78,7 @@
ghcsym () {
echo __GLASGOW_HASKELL__ >ghcsym.hs;
$1 -E -cpp -optP-P ghcsym.hs -o ghcsym.out;
- grep -v '^#' ghcsym.out > $2;
+ grep -E '[0-9]+' ghcsym.out | grep -v '#' > $2;
rm -f ghcsym.hs ghcsym.out;
}
echo -n " Looking for ghc... "
--- hmake-3.10.orig/src/interpreter/HInteractive.hs +++ hmake-3.10/src/interpreter/HInteractive.hs @@ -348,39 +348,39 @@ help = "hi - help command does not work in hbc < 0.9999.5" #else -banner = "\ -\__ __ __ _____________________________________\n\ -\|| || ______ ___ || _ ____ hmake interactive (hi):\n\ -\||___|| || || || ___|| ||/ ||__|| Copyright (c) May 2000\n\ -\||---|| || || || ||__|| ||\\_ ||__ http://www.cs.york.ac.uk/fp/hmake/\n\ -\|| || Report bugs to: [EMAIL PROTECTED] -\|| || Version: "++hmakeVersion++" -------------------------------------" +banner = "\ +__ __ __ _____________________________________\n\ +|| || ______ ___ || _ ____ hmake interactive (hi):\n\ +||___|| || || || ___|| ||/ ||__|| Copyright (c) May 2000\n\ +||---|| || || || ||__|| ||\\_ ||__ http://www.cs.york.ac.uk/fp/hmake/\n\ +|| || Report bugs to: [EMAIL PROTECTED] +|| || Version: "++hmakeVersion++" -------------------------------------" -help = "\ -\Commands (can be abbreviated to first letter):\n\ -\ <expr> evaluate expression\n\ -\ :type <expr> show type of expression [nhc98 only]\n\ -\ :quit quit\n\ -\ :Quit quit\n\ -\ :load mod [mod...] load modules (note, not filenames)\n\ -\ :load clear all modules\n\ -\ :also mod [mod...] load additional modules (note, not filenames)\n\ -\ :reload repeat last load command\n\ -\ :freshen remove, recompile, and reload all current modules\n\ -\ :module mod set module scope for evaluating expressions\n\ -\ :edit file edit filename\n\ -\ :edit edit current module\n\ -\ :cd dir change directory\n\ -\ :cd show current directory\n\ -\ :dir list current directory\n\ -\ :hc compiler set Haskell compiler to use\n\ -\ :hc show current compiler and other available compilers\n\ -\ :set options set hmake/compiler options\n\ -\ :unset options remove hmake/compiler options\n\ -\ :observe name debug function 'name' with 'Hood' [coming soon]\n\ -\ :trace [on|off] switch on/off debugging with 'Hat' [nhc98 only]\n\ -\ :!command shell escape\n\ -\ :version show hmake version\n\ -\ :? display this list of commands" +help = "\ +Commands (can be abbreviated to first letter):\n\ + <expr> evaluate expression\n\ + :type <expr> show type of expression [nhc98 only]\n\ + :quit quit\n\ + :Quit quit\n\ + :load mod [mod...] load modules (note, not filenames)\n\ + :load clear all modules\n\ + :also mod [mod...] load additional modules (note, not filenames)\n\ + :reload repeat last load command\n\ + :freshen remove, recompile, and reload all current modules\n\ + :module mod set module scope for evaluating expressions\n\ + :edit file edit filename\n\ + :edit edit current module\n\ + :cd dir change directory\n\ + :cd show current directory\n\ + :dir list current directory\n\ + :hc compiler set Haskell compiler to use\n\ + :hc show current compiler and other available compilers\n\ + :set options set hmake/compiler options\n\ + :unset options remove hmake/compiler options\n\ + :observe name debug function 'name' with 'Hood' [coming soon]\n\ + :trace [on|off] switch on/off debugging with 'Hat' [nhc98 only]\n\ + :!command shell escape\n\ + :version show hmake version\n\ + :? display this list of commands" #endif
pgpQXe0xgl5Xp.pgp
Description: PGP signature
