From: CJ van den Berg <cj@vdobnline.com>
Date: Wed, 20 Apr 2011 21:25:16 +0000 (+0100)
Subject: This is required to successfully load terminfo into GHCi in current
X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=commitdiff_plain;h=a8c51c335cfa5201acf80a8d57d0d19b2779d5bc

This is required to successfully load terminfo into GHCi in current
versions of Fedora. The INPUT command is use by libncursesw.so in
Fedora.
---

diff --git a/rts/Linker.c b/rts/Linker.c
index c840857..f39112f 100644
--- a/rts/Linker.c
+++ b/rts/Linker.c
@@ -1190,7 +1190,7 @@ initLinker( void )
            REG_EXTENDED);
     ASSERT( compileResult == 0 );
     compileResult = regcomp(&re_realso,
-           "GROUP *\\( *(([^ )])+)",
+           "(GROUP|INPUT) *\\( *(([^ )])+)",
            REG_EXTENDED);
     ASSERT( compileResult == 0 );
 #   endif
@@ -1361,8 +1361,8 @@ addDLL( char *dll_name )
          if (regexec(&re_realso, line, (size_t) NMATCH, match, 0) == 0) {
             // success -- try to dlopen the first named file
             IF_DEBUG(linker, debugBelch("match%s\n",""));
-            line[match[1].rm_eo] = '\0';
-            errmsg = internal_dlopen(line+match[1].rm_so);
+            line[match[2].rm_eo] = '\0';
+            errmsg = internal_dlopen(line+match[2].rm_so);
             break;
          }
          // if control reaches here, no GROUP ( ... ) directive was found