gentoo auto-resync : 14:10:2023 - 06:19:37

7 files changed, 0 insertions, 262 deletions

diff --git a/dev-lang/ghc/files/ghc-7.0.4-CHOST-prefix.patch b/dev-lang/ghc/files/ghc-7.0.4-CHOST-prefix.patch
deleted file mode 100644
index e38d9165e065..000000000000
--- a/dev-lang/ghc/files/ghc-7.0.4-CHOST-prefix.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Strip versioning components from *HOST for Darwin and Solaris
-
---- a/aclocal.m4
-+++ b/aclocal.m4
-@@ -1358,6 +1358,12 @@
-   freebsd*)
-     $2="freebsd"
-     ;;
-+  darwin*)
-+    $2="darwin"
-+	;;
-+  solaris2.*)
-+    $2="solaris2"
-+	;;
-   *)
-     echo "Unknown OS $1"
-     exit 1
diff --git a/dev-lang/ghc/files/ghc-7.8.3-prim-lm.patch b/dev-lang/ghc/files/ghc-7.8.3-prim-lm.patch
deleted file mode 100644
index 3ef2313fcec1..000000000000
--- a/dev-lang/ghc/files/ghc-7.8.3-prim-lm.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Fix underlinking on ghc-prim.
-Fixes ghc-stage2 crahs on hardened toolchain.
-Reported-by: aranea
-diff --git a/libraries/ghc-prim/ghc-prim.cabal b/libraries/ghc-prim/ghc-prim.cabal
-index ffb32af..0431380 100644
---- a/libraries/ghc-prim/ghc-prim.cabal
-+++ b/libraries/ghc-prim/ghc-prim.cabal
-@@ -68,0 +68,4 @@ Library
-+
-+    -- ghc 'sin' (and other) primops generate 'libm' calls,
-+    -- but ghc itself does not add '-lm'
-+    extra-libraries: m
diff --git a/dev-lang/ghc/files/ghc-8.10.5-modorigin-verbose-conflict.patch b/dev-lang/ghc/files/ghc-8.10.5-modorigin-verbose-conflict.patch
deleted file mode 100644
index a34c0c9059fe..000000000000
--- a/dev-lang/ghc/files/ghc-8.10.5-modorigin-verbose-conflict.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/compiler/main/Packages.hs
-+++ b/compiler/main/Packages.hs
-@@ -219,12 +219,14 @@ fromFlag = ModOrigin Nothing [] [] True
- instance Semigroup ModuleOrigin where
-     ModOrigin e res rhs f <> ModOrigin e' res' rhs' f' =
-         ModOrigin (g e e') (res ++ res') (rhs ++ rhs') (f || f')
--      where g (Just b) (Just b')
-+      where g x@(Just b) y@(Just b')
-                 | b == b'   = Just b
--                | otherwise = panic "ModOrigin: package both exposed/hidden"
-+                | otherwise = pprPanic "ModOrigin: package both exposed/hidden" $
-+                                text "x: " <> ppr x $$ text "y: " <> ppr y
-             g Nothing x = x
-             g x Nothing = x
--    _x <> _y = panic "ModOrigin: hidden module redefined"
-+    x <> y = pprPanic "ModOrigin: hidden module redefined" $
-+               text "x: " <> ppr x $$ text "y: " <> ppr y
- 
- instance Monoid ModuleOrigin where
-     mempty = ModOrigin Nothing [] [] False
diff --git a/dev-lang/ghc/files/ghc-8.10.6-aclocal.patch b/dev-lang/ghc/files/ghc-8.10.6-aclocal.patch
deleted file mode 100644
index 8bd3ce58d072..000000000000
--- a/dev-lang/ghc/files/ghc-8.10.6-aclocal.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/aclocal.m4 b/aclocal.m4
-index 47d69c5..212ebc6 100644
---- a/aclocal.m4
-+++ b/aclocal.m4
-@@ -966,17 +966,15 @@ struct nlist xYzzY1[] = {{"xYzzY1", 0},{0}};
- struct nlist xYzzY2[] = {{"_xYzzY2", 0},{0}};
- #endif
- 
--int main(argc, argv)
--int argc;
--char **argv;
-+int main(int argc, char **argv)
- {
- #if defined(HAVE_NLIST_H)
-     if(nlist(argv[0], xYzzY1) == 0 && xYzzY1[0].n_value != 0)
--        exit(1);
-+        return 1;
-     if(nlist(argv[0], xYzzY2) == 0 && xYzzY2[0].n_value != 0)
--        exit(0);
-+        return 0;
- #endif
--    exit(1);
-+    return 1;
- }]])],[fptools_cv_leading_underscore=yes],[fptools_cv_leading_underscore=no],[fptools_cv_leading_underscore=no])
- ;;
- esac]);
diff --git a/dev-lang/ghc/files/ghc-8.2.1-darwin.patch b/dev-lang/ghc/files/ghc-8.2.1-darwin.patch
deleted file mode 100644
index 53fedc4e4402..000000000000
--- a/dev-lang/ghc/files/ghc-8.2.1-darwin.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From d39a3409acd3c40fb018ec1c114f15d3ecef6ef9 Mon Sep 17 00:00:00 2001
-From: Sergei Trofimovich <slyfox@gentoo.org>
-Date: Thu, 1 Jun 2017 22:30:05 +0100
-Subject: [PATCH] aclocal.m4: add support for versioned darwin triplets
-
-The change adds support for 'darwin*' OS:
-    $ ./configure --target=aarch64-apple-darwin14
-
-Reported-by: jp_rider
-Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
----
- aclocal.m4 | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/aclocal.m4 b/aclocal.m4
-index 7ad9c36453..437974a0c7 100644
---- a/aclocal.m4
-+++ b/aclocal.m4
-@@ -1906,6 +1906,9 @@ AC_DEFUN([GHC_CONVERT_OS],[
-       aix*) # e.g. powerpc-ibm-aix7.1.3.0
-         $3="aix"
-         ;;
-+      darwin*) # e.g. aarch64-apple-darwin14
-+        $3="darwin"
-+        ;;
-       freebsd*) # like i686-gentoo-freebsd7
-                 #      i686-gentoo-freebsd8
-                 #      i686-gentoo-freebsd8.2
--- 
-2.14.1
-
diff --git a/dev-lang/ghc/files/ghc-8.2.1_rc1-hp2ps-cross.patch b/dev-lang/ghc/files/ghc-8.2.1_rc1-hp2ps-cross.patch
deleted file mode 100644
index 26382b3cf44c..000000000000
--- a/dev-lang/ghc/files/ghc-8.2.1_rc1-hp2ps-cross.patch
+++ /dev/null
@@ -1,104 +0,0 @@
-commit ff84d052850b637b03bbb98cf05202e44886257d
-Author: Sergei Trofimovich <slyfox@gentoo.org>
-Date:   Sat Apr 8 10:02:34 2017 +0100
-
-    cross-build 'unlit' and 'hp2ps' for stage2 install
-    
-    In navive build case it does not matter much if we build
-    'unlit' and 'hp2ps' tools with ghc-stage0 or ghc-stage1:
-    both GHCs are native compilers and both tools are written
-    in C (have no haskell code).
-    
-    But in cross-case the difference is substantial:
-    In Stag1Only=YES case we need to install native tools built
-    by ghc-stage0/${host}-cc.
-    In Stag1Only=NO  case we need to install cross-built tools
-    built by ghc-stage1/${target}-cc.
-    
-    Before this change GHC did not have a rule to build cross-built
-    'unlit' and 'hp2ps'.
-    
-    The change adds cross-built 'unlit' and 'hp2ps' as 'dist-install'
-    targets.
-    
-    'inplace/lib/bin/unlit.bin' target is unchanged and still contains
-    native binary.
-    
-    As a result this change allows cross-building and packaging whole
-    GHC for target platform!
-    
-    Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
-
-diff --git a/utils/hp2ps/ghc.mk b/utils/hp2ps/ghc.mk
-index f6e01ec6c1..21ce87dcfa 100644
---- a/utils/hp2ps/ghc.mk
-+++ b/utils/hp2ps/ghc.mk
-@@ -10,6 +10,7 @@
- #
- # -----------------------------------------------------------------------------
- 
-+# stage0
- utils/hp2ps_dist_C_SRCS          = AreaBelow.c Curves.c Error.c Main.c \
-                                    Reorder.c TopTwenty.c AuxFile.c Deviation.c \
-                                    HpFile.c Marks.c Scale.c TraceElement.c \
-@@ -17,11 +18,27 @@ utils/hp2ps_dist_C_SRCS          = AreaBelow.c Curves.c Error.c Main.c \
-                                    Utilities.c
- utils/hp2ps_dist_EXTRA_LIBRARIES = m
- utils/hp2ps_dist_PROGNAME        = hp2ps
--utils/hp2ps_dist_INSTALL         = YES
- utils/hp2ps_dist_INSTALL_INPLACE = YES
- utils/hp2ps_dist_SHELL_WRAPPER              = YES
- utils/hp2ps_dist_INSTALL_SHELL_WRAPPER_NAME = hp2ps
- 
- utils/hp2ps_CC_OPTS += $(addprefix -I,$(GHC_INCLUDE_DIRS))
- 
-+# stage 1
-+utils/hp2ps_dist-install_C_SRCS = $(utils/hp2ps_dist_C_SRCS)
-+utils/hp2ps_dist-install_EXTRA_LIBRARIES = $(utils/hp2ps_dist_EXTRA_LIBRARIES)
-+utils/hp2ps_dist-install_PROGNAME        = $(utils/hp2ps_dist_PROGNAME)
-+utils/hp2ps_dist-install_INSTALL_INPLACE = NO
-+utils/hp2ps_dist-install_SHELL_WRAPPER              = YES
-+utils/hp2ps_dist-install_INSTALL_SHELL_WRAPPER_NAME = $(utils/hp2ps_dist_INSTALL_SHELL_WRAPPER_NAME)
-+
-+ifeq "$(Stage1Only)" "YES"
-+utils/hp2ps_dist_INSTALL         = YES
-+utils/hp2ps_dist-install_INSTALL = NO
-+else
-+utils/hp2ps_dist_INSTALL         = NO
-+utils/hp2ps_dist-install_INSTALL = YES
-+endif
-+
- $(eval $(call build-prog,utils/hp2ps,dist,0))
-+$(eval $(call build-prog,utils/hp2ps,dist-install,1))
-diff --git a/utils/unlit/ghc.mk b/utils/unlit/ghc.mk
-index e947989b5e..8911f4e856 100644
---- a/utils/unlit/ghc.mk
-+++ b/utils/unlit/ghc.mk
-@@ -10,11 +10,25 @@
- #
- # -----------------------------------------------------------------------------
- 
-+# built by ghc-stage0
- utils/unlit_dist_C_SRCS  = unlit.c
- utils/unlit_dist_PROGNAME = unlit
- utils/unlit_dist_TOPDIR  = YES
--utils/unlit_dist_INSTALL = YES
- utils/unlit_dist_INSTALL_INPLACE = YES
- 
--$(eval $(call build-prog,utils/unlit,dist,0))
-+# built by ghc-stage1
-+utils/unlit_dist-install_C_SRCS = $(utils/unlit_dist_C_SRCS)
-+utils/unlit_dist-install_PROGNAME = $(utils/unlit_dist_PROGNAME)
-+utils/unlit_dist-install_TOPDIR = $(utils/unlit_dist_TOPDIR)
-+utils/unlit_dist-install_INSTALL_INPLACE = NO
-+
-+ifeq "$(Stage1Only)" "YES"
-+utils/unlit_dist_INSTALL         = YES
-+utils/unlit_dist-install_INSTALL = NO
-+else
-+utils/unlit_dist_INSTALL         = NO
-+utils/unlit_dist-install_INSTALL = YES
-+endif
- 
-+$(eval $(call build-prog,utils/unlit,dist,0))
-+$(eval $(call build-prog,utils/unlit,dist-install,1))
diff --git a/dev-lang/ghc/files/ghc-8.8.1-revert-CPP.patch b/dev-lang/ghc/files/ghc-8.8.1-revert-CPP.patch
deleted file mode 100644
index 8535cf09ef34..000000000000
--- a/dev-lang/ghc/files/ghc-8.8.1-revert-CPP.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-Don't pass CPP options. Otherwise ghc-8.8.1 can't build itself.
-Eventually ghc will fix it's headers at propagate defines.
-
-https://gitlab.haskell.org/ghc/ghc/commit/cfd3e0f1cfd16c8f35cae139d2a871a32eb4d2e1
-https://gitlab.haskell.org/ghc/ghc/issues/17146
-
---- a/compiler/main/DriverPipeline.hs
-+++ b/compiler/main/DriverPipeline.hs
-@@ -1190,6 +1190,9 @@ runPhase (RealPhase Cmm) input_fn dflags
- -----------------------------------------------------------------------------
- -- Cc phase
- 
-+-- we don't support preprocessing .c files (with -E) now.  Doing so introduces
-+-- way too many hacks, and I can't say I've ever used it anyway.
-+
- runPhase (RealPhase cc_phase) input_fn dflags
-    | any (cc_phase `eqPhase`) [Cc, Ccxx, HCc, Cobjc, Cobjcxx]
-    = do
-@@ -1211,16 +1214,6 @@ runPhase (RealPhase cc_phase) input_fn dflags
-               (includePathsQuote cmdline_include_paths)
-         let include_paths = include_paths_quote ++ include_paths_global
- 
--        -- pass -D or -optP to preprocessor when compiling foreign C files
--        -- (#16737). Doing it in this way is simpler and also enable the C
--        -- compiler to performs preprocessing and parsing in a single pass,
--        -- but it may introduce inconsistency if a different pgm_P is specified.
--        let more_preprocessor_opts = concat
--              [ ["-Xpreprocessor", i]
--              | not hcc
--              , i <- getOpts dflags opt_P
--              ]
--
-         let gcc_extra_viac_flags = extraGccViaCFlags dflags
-         let pic_c_flags = picCCOpts dflags
- 
-@@ -1230,7 +1223,7 @@ runPhase (RealPhase cc_phase) input_fn dflags
-         -- hc code doesn't not #include any header files anyway, so these
-         -- options aren't necessary.
-         pkg_extra_cc_opts <- liftIO $
--          if hcc
-+          if cc_phase `eqPhase` HCc
-              then return []
-              else getPackageExtraCcOpts dflags pkgs
- 
-@@ -1312,7 +1305,6 @@ runPhase (RealPhase cc_phase) input_fn dflags
-                        ++ [ "-include", ghcVersionH ]
-                        ++ framework_paths
-                        ++ include_paths
--                       ++ more_preprocessor_opts
-                        ++ pkg_extra_cc_opts
-                        ))
-