1 files changed, 130 insertions, 0 deletions
diff --git a/dev-util/bnfc/files/bnfc-2.8.1-ghc84-p2.patch b/dev-util/bnfc/files/bnfc-2.8.1-ghc84-p2.patch
new file mode 100644
index 000000000000..a1e944c2d154
--- /dev/null
+++ b/dev-util/bnfc/files/bnfc-2.8.1-ghc84-p2.patch
@@ -0,0 +1,130 @@
+--- a/src/BNFC/Backend/C/CFtoCAbs.hs
++++ b/src/BNFC/Backend/C/CFtoCAbs.hs
+@@ -50,3 +50,3 @@ import Data.List
+ import Data.Char(toLower)
+-
++import Prelude hiding ((<>))
+ 
+--- a/src/BNFC/Backend/C/CFtoCPrinter.hs
++++ b/src/BNFC/Backend/C/CFtoCPrinter.hs
+@@ -53,2 +53,3 @@ import Data.Either (lefts)
+ import BNFC.PrettyPrint
++import Prelude hiding ((<>))
+ 
+--- a/src/BNFC/Backend/C/CFtoCSkel.hs
++++ b/src/BNFC/Backend/C/CFtoCSkel.hs
+@@ -49,2 +49,3 @@ import Data.Either (lefts)
+ import Text.PrettyPrint
++import Prelude hiding ((<>))
+ 
+--- a/src/BNFC/Backend/CPP/NoSTL/CFtoCPPAbs.hs
++++ b/src/BNFC/Backend/CPP/NoSTL/CFtoCPPAbs.hs
+@@ -50,3 +50,3 @@ import Data.Char(toLower)
+ import Text.PrettyPrint
+-
++import Prelude hiding ((<>))
+ 
+--- a/src/BNFC/Backend/CPP/NoSTL/CFtoCVisitSkel.hs
++++ b/src/BNFC/Backend/CPP/NoSTL/CFtoCVisitSkel.hs
+@@ -49,2 +49,3 @@ import Data.Either (lefts)
+ import BNFC.PrettyPrint
++import Prelude hiding ((<>))
+ 
+--- a/src/BNFC/Backend/CPP/PrettyPrinter.hs
++++ b/src/BNFC/Backend/CPP/PrettyPrinter.hs
+@@ -32,2 +32,3 @@ import BNFC.Backend.CPP.STL.STLUtils
+ import BNFC.PrettyPrint
++import Prelude hiding ((<>))
+ 
+--- a/src/BNFC/Backend/CPP/STL/CFtoBisonSTL.hs
++++ b/src/BNFC/Backend/CPP/STL/CFtoBisonSTL.hs
+@@ -56,2 +56,3 @@ import BNFC.Backend.C.CFtoBisonC (startSymbol)
+ import BNFC.PrettyPrint
++import Prelude hiding ((<>))
+ 
+--- a/src/BNFC/Backend/Common.hs
++++ b/src/BNFC/Backend/Common.hs
+@@ -4,2 +4,3 @@ module BNFC.Backend.Common (renderListSepByPrecedence) where
+ import BNFC.PrettyPrint
++import Prelude hiding ((<>))
+ 
+--- a/src/BNFC/Backend/Common/NamedVariables.hs
++++ b/src/BNFC/Backend/Common/NamedVariables.hs
+@@ -75,2 +75,3 @@ import Control.Arrow (left, (&&&))
+ import Data.Either (lefts)
++import Prelude hiding ((<>))
+ 
+--- a/src/BNFC/Backend/Java.hs
++++ b/src/BNFC/Backend/Java.hs
+@@ -56,2 +56,3 @@ import qualified BNFC.Backend.Common.Makefile as Makefile
+ import BNFC.PrettyPrint
++import Prelude hiding ((<>))
+ -------------------------------------------------------------------
+--- a/src/BNFC/Backend/Java/CFtoComposVisitor.hs
++++ b/src/BNFC/Backend/Java/CFtoComposVisitor.hs
+@@ -29,2 +29,3 @@ import Data.Either (lefts)
+ import BNFC.PrettyPrint
++import Prelude hiding ((<>))
+ 
+--- a/src/BNFC/Backend/Java/CFtoFoldVisitor.hs
++++ b/src/BNFC/Backend/Java/CFtoFoldVisitor.hs
+@@ -28,2 +28,3 @@ import Data.Either (lefts)
+ import BNFC.PrettyPrint
++import Prelude hiding ((<>))
+ 
+--- a/src/BNFC/Backend/Java/CFtoJLex15.hs
++++ b/src/BNFC/Backend/Java/CFtoJLex15.hs
+@@ -46,2 +46,3 @@ import BNFC.Backend.Common.NamedVariables
+ import Text.PrettyPrint
++import Prelude hiding ((<>))
+ 
+--- a/src/BNFC/Backend/Java/CFtoJavaAbs15.hs
++++ b/src/BNFC/Backend/Java/CFtoJavaAbs15.hs
+@@ -56,2 +56,3 @@ import Data.Maybe (mapMaybe)
+ import Text.PrettyPrint
++import Prelude hiding ((<>))
+ 
+--- a/src/BNFC/Backend/Java/CFtoJavaPrinter15.hs
++++ b/src/BNFC/Backend/Java/CFtoJavaPrinter15.hs
+@@ -58,2 +58,3 @@ import Data.Either (lefts)
+ import BNFC.PrettyPrint
++import Prelude hiding ((<>))
+ 
+--- a/src/BNFC/Backend/Java/CFtoVisitSkel15.hs
++++ b/src/BNFC/Backend/Java/CFtoVisitSkel15.hs
+@@ -48,2 +48,3 @@ import Text.PrettyPrint
+ import Data.Either (lefts)
++import Prelude hiding ((<>))
+ 
+--- a/src/BNFC/Backend/OCaml/CFtoOCamlLex.hs
++++ b/src/BNFC/Backend/OCaml/CFtoOCamlLex.hs
+@@ -34,2 +34,3 @@ import BNFC.Backend.OCaml.CFtoOCamlYacc (terminal)
+ import BNFC.Utils ((+++))
++import Prelude hiding ((<>))
+ 
+--- a/src/BNFC/Backend/OCaml/CFtoOCamlPrinter.hs
++++ b/src/BNFC/Backend/OCaml/CFtoOCamlPrinter.hs
+@@ -30,3 +30,3 @@ import BNFC.PrettyPrint
+ import BNFC.Backend.Haskell.CFtoPrinter (compareRules)
+-
++import Prelude hiding ((<>))
+ 
+--- a/src/BNFC/Backend/OCaml/CFtoOCamlTest.hs
++++ b/src/BNFC/Backend/OCaml/CFtoOCamlTest.hs
+@@ -25,2 +25,3 @@ import BNFC.CF
+ import BNFC.Backend.OCaml.OCamlUtil
++import Prelude hiding ((<>))
+ 
+--- a/src/BNFC/Backend/Pygments.hs
++++ b/src/BNFC/Backend/Pygments.hs
+@@ -17,2 +17,3 @@ import BNFC.Utils
+ import BNFC.PrettyPrint
++import Prelude hiding ((<>))
+ 
+--- a/src/BNFC/Lexing.hs
++++ b/src/BNFC/Lexing.hs
+@@ -8,3 +8,3 @@ import PrintBNF
+ import BNFC.CF
+-
++import Prelude hiding ((<>))
+