forked from mirrors/nixpkgs
2b56b020c7
Alex and happy use CPP to generate some internal template files, but the code is unprepared for the output from CPP 4.8.0, which generates LINE pragmas that contain more information than they thought it would.
13 lines
617 B
Diff
13 lines
617 B
Diff
diff -ubr happy-1.18.6-orig/Setup.lhs happy-1.18.6/Setup.lhs
|
|
--- happy-1.18.6-orig/Setup.lhs 2013-04-19 14:17:10.865999210 +0200
|
|
+++ happy-1.18.6/Setup.lhs 2013-04-19 14:17:15.285214809 +0200
|
|
@@ -25,7 +25,7 @@
|
|
-- hack to turn cpp-style '# 27 "GenericTemplate.hs"' into
|
|
-- '{-# LINE 27 "GenericTemplate.hs" #-}'.
|
|
crazy_perl_regexp =
|
|
- "s/^#\\s+(\\d+)\\s+(\"[^\"]*\")/{-# LINE \\1 \\2 #-}/g;s/\\$(Id:.*)\\$/\\1/g"
|
|
+ "s/^#\\s+(\\d+)\\s+(\"[^\"]*\").*/{-# LINE \\1 \\2 #-}/g;s/\\$(Id:.*)\\$/\\1/g"
|
|
|
|
myPostBuild _ flags _ lbi = do
|
|
let runProgram p = rawSystemProgramConf (buildVerbose flags) p (withPrograms lbi)
|