[Pkg-haskell-commits] darcs: ghc: Drop improve_linker_script_handling, applied upstream

[Joachim Breitner]

Sat Nov 19 17:33:28 UTC 2011  Joachim Breitner <mail at joachim-breitner.de>
  * Drop improve_linker_script_handling, applied upstream
  Ignore-this: 7d996f5a48b772a57153d1bf928e509f

    M ./changelog +1
    R ./patches/improve_linker_script_handling
    M ./patches/series -1

Sat Nov 19 17:33:28 UTC 2011  Joachim Breitner <mail at joachim-breitner.de>
  * Drop improve_linker_script_handling, applied upstream
  Ignore-this: 7d996f5a48b772a57153d1bf928e509f
diff -rN -u old-ghc//changelog new-ghc//changelog
--- old-ghc//changelog	2012-02-03 16:39:17.811248459 +0000
+++ new-ghc//changelog	2012-02-03 16:39:19.091249742 +0000
@@ -4,6 +4,7 @@
   * Call autoconf and remove configure in clean, to avoid having an
     autoreconf-patch in debian/patches. 
   * Drop patches/hash-version-number, applied upstream
+  * Drop improve_linker_script_handling, applied upstream
 
  -- Joachim Breitner <nomeata at debian.org>  Sat, 19 Nov 2011 18:24:34 +0100
 
diff -rN -u old-ghc//patches/improve_linker_script_handling new-ghc//patches/improve_linker_script_handling
--- old-ghc//patches/improve_linker_script_handling	2012-02-03 16:39:17.811248459 +0000
+++ new-ghc//patches/improve_linker_script_handling	1970-01-01 00:00:00.000000000 +0000
@@ -1,37 +0,0 @@
-* Handle linker scripts for which dlopen returns "file too short" (for
-  example libncurses.so). Also support INPUT commands in linker scripts.
-
-  Taken from upstream commits 44315e136cf9bc994185e689babec649c127e045 and
-  a8c51c335cfa5201acf80a8d57d0d19b2779d5bc
-
-Iain Lane <laney at debian.org>
-
-Index: ghc-7.0.3/rts/Linker.c
-===================================================================
---- ghc-7.0.3.orig/rts/Linker.c	2011-09-06 00:09:58.486412360 +0100
-+++ ghc-7.0.3/rts/Linker.c	2011-09-06 00:10:10.721919762 +0100
-@@ -1182,11 +1182,11 @@
- #   endif /* RTLD_DEFAULT */
- 
-     compileResult = regcomp(&re_invalid,
--           "(([^ \t()])+\\.so([^ \t:()])*):([ \t])*invalid ELF header",
-+           "(([^ \t()])+\\.so([^ \t:()])*):([ \t])*(invalid ELF header|file too short)",
-            REG_EXTENDED);
-     ASSERT( compileResult == 0 );
-     compileResult = regcomp(&re_realso,
--           "GROUP *\\( *(([^ )])+)",
-+           "(GROUP|INPUT) *\\( *(([^ )])+)",
-            REG_EXTENDED);
-     ASSERT( compileResult == 0 );
- #   endif
-@@ -1357,8 +1357,8 @@
-          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
diff -rN -u old-ghc//patches/series new-ghc//patches/series
--- old-ghc//patches/series	2012-02-03 16:39:17.811248459 +0000
+++ new-ghc//patches/series	2012-02-03 16:39:18.895247328 +0000
@@ -5,5 +5,4 @@
 lpthread-bootstrap-workaround
 configure-s390x
 haddock-expose-interface-version
-improve_linker_script_handling
 no_ghci_on_powerpc