From 152a6bc119e05c6c6da85b2fce57feb8c31d80b1 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 15 Aug 2022 02:26:52 +0100 Subject: gentoo auto-resync : 15:08:2022 - 02:26:52 --- .../ghc/files/ghc-8.0.2-no-relax-everywhere.patch | 17 -------------- dev-lang/ghc/files/ghc-8.10.4-sphinx-quote.patch | 27 ---------------------- .../files/ghc-8.4.2-allow-cross-bootstrap.patch | 23 ------------------ dev-lang/ghc/files/ghc-8.6.5-numa.patch | 22 ------------------ dev-lang/ghc/files/ghc-8.8.4-autoconf-2.71.patch | 22 ------------------ 5 files changed, 111 deletions(-) delete mode 100644 dev-lang/ghc/files/ghc-8.0.2-no-relax-everywhere.patch delete mode 100644 dev-lang/ghc/files/ghc-8.10.4-sphinx-quote.patch delete mode 100644 dev-lang/ghc/files/ghc-8.4.2-allow-cross-bootstrap.patch delete mode 100644 dev-lang/ghc/files/ghc-8.6.5-numa.patch delete mode 100644 dev-lang/ghc/files/ghc-8.8.4-autoconf-2.71.patch (limited to 'dev-lang/ghc/files') diff --git a/dev-lang/ghc/files/ghc-8.0.2-no-relax-everywhere.patch b/dev-lang/ghc/files/ghc-8.0.2-no-relax-everywhere.patch deleted file mode 100644 index d6cff3373801..000000000000 --- a/dev-lang/ghc/files/ghc-8.0.2-no-relax-everywhere.patch +++ /dev/null @@ -1,17 +0,0 @@ -https://github.com/gentoo-haskell/gentoo-haskell/issues/704 - -Allow users to specify -W,--relax externally and pass --Wl,-no-relax unconditonally on all arches. - -Reported-by: wmyrda -diff --git a/compiler/main/DriverPipeline.hs b/compiler/main/DriverPipeline.hs -index acd0d61..5830517 100644 ---- a/compiler/main/DriverPipeline.hs -+++ b/compiler/main/DriverPipeline.hs -@@ -2172,5 +2172,3 @@ joinObjectFiles dflags o_files output_fn = do - -- disable --relax explicitly. -- ++ (if platformArch (targetPlatform dflags) -- `elem` [ArchSPARC, ArchSPARC64] -- && ldIsGnuLd -+ ++ (if ldIsGnuLd - then [SysTools.Option "-Wl,-no-relax"] diff --git a/dev-lang/ghc/files/ghc-8.10.4-sphinx-quote.patch b/dev-lang/ghc/files/ghc-8.10.4-sphinx-quote.patch deleted file mode 100644 index e9517dbea06e..000000000000 --- a/dev-lang/ghc/files/ghc-8.10.4-sphinx-quote.patch +++ /dev/null @@ -1,27 +0,0 @@ -https://bugs.gentoo.org/792558 - -From 83407ffc7acc00cc025b9f6ed063add9ab9f9bcc Mon Sep 17 00:00:00 2001 -From: Krzysztof Gogolewski -Date: Fri, 25 Sep 2020 02:52:19 +0200 -Subject: [PATCH] Various documentation fixes - -* Use r'' in conf.py. This fixes a Sphinx warning: - WARNING: Support for evaluating Python 2 syntax is deprecated and will be removed in Sphinx 4.0. Convert docs/users_guide/conf.py to Python 3 syntax. ---- a/docs/users_guide/conf.py -+++ b/docs/users_guide/conf.py -@@ -100,13 +100,13 @@ htmlhelp_basename = 'GHCUsersGuide' - latex_elements = { - 'inputenc': '', - 'utf8extra': '', -- 'preamble': ''' -+ 'preamble': r''' - \usepackage{fontspec} - \usepackage{makeidx} - \setsansfont{DejaVu Sans} - \setromanfont{DejaVu Serif} - \setmonofont{DejaVu Sans Mono} --\setlength{\\tymin}{45pt} -+\setlength{\tymin}{45pt} - ''', - } - diff --git a/dev-lang/ghc/files/ghc-8.4.2-allow-cross-bootstrap.patch b/dev-lang/ghc/files/ghc-8.4.2-allow-cross-bootstrap.patch deleted file mode 100644 index 071d4970a25b..000000000000 --- a/dev-lang/ghc/files/ghc-8.4.2-allow-cross-bootstrap.patch +++ /dev/null @@ -1,23 +0,0 @@ -Allow using cross-compilers to bootstrap GHC. - -In my case I'm using "cross"-compiler from -x86_64-unknown-linux to x86_64-HEAD-linux. - -Those targets have the same ABI and can boot one another. -diff --git a/configure.ac b/configure.ac -index a8b8681a36..791367e8bf 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -228,11 +228,11 @@ FPTOOLS_SET_PLATFORM_VARS - if test "$BuildPlatform" != "$bootstrap_target" - then - echo "This GHC (${WithGhc}) does not generate code for the build platform" - echo " GHC target platform : $bootstrap_target" - echo " Desired build platform : $BuildPlatform" -- exit 1 -+ #exit 1 - fi - - # Testing if we shall enable shared libs support on Solaris. - # Anything older than SunOS 5.11 aka Solaris 11 (Express) is broken. - diff --git a/dev-lang/ghc/files/ghc-8.6.5-numa.patch b/dev-lang/ghc/files/ghc-8.6.5-numa.patch deleted file mode 100644 index 61c6cfdbfb13..000000000000 --- a/dev-lang/ghc/files/ghc-8.6.5-numa.patch +++ /dev/null @@ -1,22 +0,0 @@ -Disable automagic NUMA linking. - -Reported-by: Sergey Alirzaev -Bug: https://github.com/gentoo-haskell/gentoo-haskell/issues/955 ---- a/configure.ac -+++ b/configure.ac -@@ -1264,10 +1264,14 @@ dnl ** Have libnuma? - dnl -------------------------------------------------------------- - HaveLibNuma=0 - AC_CHECK_HEADERS([numa.h numaif.h]) -- - if test "$ac_cv_header_numa_h$ac_cv_header_numaif_h" = "yesyes" ; then - AC_CHECK_LIB(numa, numa_available,HaveLibNuma=1) - fi -+AC_ARG_ENABLE(numa, -+ [AC_HELP_STRING([--enable-numa], -+ [Enable NUMA thread balancing support in the runtime system via numactl's libnuma [default=auto]])]) -+AS_IF([test "x$enable_numa" = "xno"], [HaveLibNuma=0]) -+ - AC_DEFINE_UNQUOTED([HAVE_LIBNUMA], [$HaveLibNuma], [Define to 1 if you have libnuma]) - if test $HaveLibNuma = "1" ; then - AC_SUBST([CabalHaveLibNuma],[True]) diff --git a/dev-lang/ghc/files/ghc-8.8.4-autoconf-2.71.patch b/dev-lang/ghc/files/ghc-8.8.4-autoconf-2.71.patch deleted file mode 100644 index 5de8c6806b79..000000000000 --- a/dev-lang/ghc/files/ghc-8.8.4-autoconf-2.71.patch +++ /dev/null @@ -1,22 +0,0 @@ -https://bugs.gentoo.org/829162 -https://gitlab.haskell.org/ghc/ghc/-/issues/19655 -https://gitlab.haskell.org/ghc/ghc/-/commit/ad2ef3a13f1eb000eab8e3d64592373b91a52806 - -From: Moritz Angermann -Date: Wed, 17 Feb 2021 21:13:07 +0800 -Subject: [PATCH] [configure] Fix _AC_PROG_CC_99 - -_AC_PROG_CC_99 isn't available anymore in recent autoconf versions. -This broke on aarch64-darwin. ---- a/aclocal.m4 -+++ b/aclocal.m4 -@@ -659,7 +659,7 @@ AC_DEFUN([FP_SET_CFLAGS_C99], - CPPFLAGS="$$3" - unset ac_cv_prog_cc_c99 - dnl perform detection -- _AC_PROG_CC_C99 -+ AC_PROG_CC_C99 - fp_cc_c99="$ac_cv_prog_cc_c99" - case "x$ac_cv_prog_cc_c99" in - x) ;; # noop -GitLab -- cgit v1.2.3