[Git][haskell-team/DHG_packages][experimental] tweak

Clint Adams (@clint) gitlab at salsa.debian.org
Tue Aug 24 17:38:36 BST 2021 


Clint Adams pushed to branch experimental at Debian Haskell Group / DHG_packages


Commits:
0309e197 by Clint Adams at 2021-08-24T12:35:29-04:00
tweak

- - - - -


17 changed files:

- p/ghc/debian/changelog
- p/ghc/debian/control
- p/ghc/debian/patches/11f8eef5a9625c77f78a829406c446b615ed6168.patch
- p/ghc/debian/patches/3c12355ece0fa14e534c71a9f7327eda9773fad9.patch
- p/ghc/debian/patches/ARM-VFPv3D16
- p/ghc/debian/patches/buildpath-abi-stability.patch
- p/ghc/debian/patches/fix-32bit-atomic
- − p/ghc/debian/patches/fix-build-using-unregisterised-v8.6
- p/ghc/debian/patches/haddock-remove-googleapis-fonts
- p/ghc/debian/patches/kfreebsd-aclocal.m4
- p/ghc/debian/patches/llvm-arm-unknown-linux-gnueabi.patch
- p/ghc/debian/patches/local-mathjax
- p/ghc/debian/patches/no-missing-haddock-file-warning
- p/ghc/debian/patches/series
- p/ghc/debian/patches/use-debian-gen_contents_index
- p/ghc/debian/patches/use-stage1-binaries-for-install.patch
- p/ghc/debian/patches/x32-use-native-x86_64-insn.patch


Changes:

=====================================
p/ghc/debian/changelog
=====================================
@@ -1,4 +1,4 @@
-ghc (8.10.6-1~exp1) experimental; urgency=medium
+ghc (8.10.6-1~exp2) experimental; urgency=medium
 
   * New upstream version.
 


=====================================
p/ghc/debian/control
=====================================
@@ -16,7 +16,7 @@ Build-Depends:
   pkg-config,
   ghc:native (>= 8.6),
   libgmp-dev,
-  llvm-13 [arm64 armel armhf],
+  llvm-12 [arm64 armel armhf],
   libffi-dev,
   libncurses5-dev,
   python3-sphinx <!cross>,
@@ -32,7 +32,7 @@ Vcs-Browser: https://salsa.debian.org/haskell-team/DHG_packages/tree/master/p/gh
 Package: ghc
 Architecture: any
 Depends:
-  llvm-13 [arm64 armel armhf],
+  llvm-12 [arm64 armel armhf],
   gcc,
   libgmp-dev,
   libffi-dev,
@@ -55,7 +55,7 @@ Replaces: ghc6 (<< 7), ghc-dynamic (<< 7.8), ghc-haddock (<< 7.10), ${conflictin
 Conflicts: ghc6 (<< 7), ghc-dynamic (<< 7.8)
 Breaks: cabal-install (<< 1.22), haskell-devscripts (<< 0.8.13),
  ghc-doc (<< 7.10), ghc-haddock (<< 7.10), ${conflicting-devs}
-Suggests: perl, ghc-prof, ghc-doc, haskell-doc, llvm-13
+Suggests: perl, ghc-prof, ghc-doc, haskell-doc, llvm-12
 Description: The Glasgow Haskell Compilation system
  The Glorious Glasgow Haskell Compilation system (GHC) is a compiler for
  Haskell.


=====================================
p/ghc/debian/patches/11f8eef5a9625c77f78a829406c446b615ed6168.patch
=====================================
@@ -9,11 +9,9 @@ Subject: [PATCH] fixup! Fix endian handling w.r.t. CPP macro WORDS_BIGENDIAN
  testsuite/tests/codeGen/should_run/T7600.hs    | 2 +-
  3 files changed, 3 insertions(+), 3 deletions(-)
 
-Index: ghc-8.10.1/libraries/base/GHC/ByteOrder.hs
-===================================================================
---- ghc-8.10.1.orig/libraries/base/GHC/ByteOrder.hs
-+++ ghc-8.10.1/libraries/base/GHC/ByteOrder.hs
-@@ -21,7 +21,7 @@
+--- a/libraries/base/GHC/ByteOrder.hs
++++ b/libraries/base/GHC/ByteOrder.hs
+@@ -21,7 +21,7 @@ module GHC.ByteOrder where
  #include <ghcautoconf.h>
  
  -- Required for WORDS_BIGENDIAN
@@ -22,11 +20,9 @@ Index: ghc-8.10.1/libraries/base/GHC/ByteOrder.hs
  
  -- | Byte ordering.
  data ByteOrder
-Index: ghc-8.10.1/libraries/base/GHC/IO/Encoding/CodePage/API.hs
-===================================================================
---- ghc-8.10.1.orig/libraries/base/GHC/IO/Encoding/CodePage/API.hs
-+++ ghc-8.10.1/libraries/base/GHC/IO/Encoding/CodePage/API.hs
-@@ -11,7 +11,7 @@
+--- a/libraries/base/GHC/IO/Encoding/CodePage/API.hs
++++ b/libraries/base/GHC/IO/Encoding/CodePage/API.hs
+@@ -11,7 +11,7 @@ module GHC.IO.Encoding.CodePage.API (
  #include <ghcautoconf.h>
  
  -- Required for WORDS_BIGENDIAN


=====================================
p/ghc/debian/patches/3c12355ece0fa14e534c71a9f7327eda9773fad9.patch
=====================================
@@ -12,11 +12,9 @@ with commit 6c59cc71dc).
  testsuite/tests/codeGen/should_run/T7600.hs    | 4 ++++
  3 files changed, 10 insertions(+)
 
-Index: ghc-8.10.1/libraries/base/GHC/ByteOrder.hs
-===================================================================
---- ghc-8.10.1.orig/libraries/base/GHC/ByteOrder.hs
-+++ ghc-8.10.1/libraries/base/GHC/ByteOrder.hs
-@@ -20,6 +20,9 @@
+--- a/libraries/base/GHC/ByteOrder.hs
++++ b/libraries/base/GHC/ByteOrder.hs
+@@ -20,6 +20,9 @@ module GHC.ByteOrder where
  -- Required for WORDS_BIGENDIAN
  #include <ghcautoconf.h>
  
@@ -26,11 +24,9 @@ Index: ghc-8.10.1/libraries/base/GHC/ByteOrder.hs
  -- | Byte ordering.
  data ByteOrder
      = BigEndian    -- ^ most-significant-byte occurs in lowest address.
-Index: ghc-8.10.1/libraries/base/GHC/IO/Encoding/CodePage/API.hs
-===================================================================
---- ghc-8.10.1.orig/libraries/base/GHC/IO/Encoding/CodePage/API.hs
-+++ ghc-8.10.1/libraries/base/GHC/IO/Encoding/CodePage/API.hs
-@@ -10,6 +10,9 @@
+--- a/libraries/base/GHC/IO/Encoding/CodePage/API.hs
++++ b/libraries/base/GHC/IO/Encoding/CodePage/API.hs
+@@ -10,6 +10,9 @@ module GHC.IO.Encoding.CodePage.API (
  -- Required for WORDS_BIGENDIAN
  #include <ghcautoconf.h>
  


=====================================
p/ghc/debian/patches/ARM-VFPv3D16
=====================================
@@ -6,11 +6,9 @@ Author: Jani Monoses <jani at ubuntu.com>
 Upstream-Bug: https://ghc.haskell.org/trac/ghc/ticket/5914
 Launchpad-Bug: https://ghc.haskell.org/trac/ghc/ticket/5914
 
-Index: ghc-8.10.2/aclocal.m4
-===================================================================
---- ghc-8.10.2.orig/aclocal.m4
-+++ ghc-8.10.2/aclocal.m4
-@@ -468,7 +468,7 @@
+--- a/aclocal.m4
++++ b/aclocal.m4
+@@ -476,7 +476,7 @@ AC_DEFUN([GET_ARM_ISA],
                  )],
                  [changequote(, )dnl
                   ARM_ISA=ARMv7


=====================================
p/ghc/debian/patches/buildpath-abi-stability.patch
=====================================
@@ -1,10 +1,8 @@
 Forwarded to https://ghc.haskell.org/trac/ghc/ticket/10424
 
-Index: ghc-8.10.1/compiler/iface/MkIface.hs
-===================================================================
---- ghc-8.10.1.orig/compiler/iface/MkIface.hs
-+++ ghc-8.10.1/compiler/iface/MkIface.hs
-@@ -679,7 +679,7 @@
+--- a/compiler/iface/MkIface.hs
++++ b/compiler/iface/MkIface.hs
+@@ -679,7 +679,7 @@ addFingerprints hsc_env iface0
     iface_hash <- computeFingerprint putNameLiterally
                        (mod_hash,
                         ann_fn (mkVarOcc "module"),  -- See mkIfaceAnnCache
@@ -13,7 +11,7 @@ Index: ghc-8.10.1/compiler/iface/MkIface.hs
                         sorted_deps,
                         mi_hpc iface0)
  
-@@ -714,6 +714,9 @@
+@@ -714,6 +714,9 @@ addFingerprints hsc_env iface0
      (non_orph_rules, orph_rules) = mkOrphMap ifRuleOrph    (mi_rules iface0)
      (non_orph_fis,   orph_fis)   = mkOrphMap ifFamInstOrph (mi_fam_insts iface0)
      ann_fn = mkIfaceAnnCache (mi_anns iface0)


=====================================
p/ghc/debian/patches/fix-32bit-atomic
=====================================
@@ -3,8 +3,6 @@ Author: Ilias Tsitsimpis <iliastsi at debian.org>
 Bug: https://gitlab.haskell.org/ghc/ghc/issues/17886
 Forwarded: https://gitlab.haskell.org/ghc/ghc/merge_requests/2804
 
-Index: b/libraries/ghc-prim/cbits/atomic.c
-===================================================================
 --- a/libraries/ghc-prim/cbits/atomic.c
 +++ b/libraries/ghc-prim/cbits/atomic.c
 @@ -361,6 +361,7 @@ hs_atomicread32(StgWord x)


=====================================
p/ghc/debian/patches/fix-build-using-unregisterised-v8.6 deleted
=====================================
@@ -1,31 +0,0 @@
-Description: Allow unregisterised ghc-8.6 to build newer GHC
- Commit af9b744bbf1 introduced a regression stopping existing unregisterised
- compilers from being able to compile newer versions of GHC. The problem is
- that the bootstrap compiler uses the newer `includes/stg/MiscClosures.h` file
- where some defines have been renamed, resulting in the following error:
-.
- error: ‘stg_atomicModifyMutVarzh’ undeclared (first use in this function); did you mean ‘stg_atomicModifyMutVar2zh’?
-.
- For more information, see https://gitlab.haskell.org/ghc/ghc/issues/17111.
-.
- This patch can be removed, once ghc-8.6 is no longer the bootstrap compiler.
-Author: Ilias Tsitsimpis <iliastsi at debian.org>
-Bug: https://gitlab.haskell.org/ghc/ghc/issues/17111
-
-Index: ghc-8.10.1/includes/stg/MiscClosures.h
-===================================================================
---- ghc-8.10.1.orig/includes/stg/MiscClosures.h
-+++ ghc-8.10.1/includes/stg/MiscClosures.h
-@@ -391,8 +391,12 @@
- RTS_FUN_DECL(stg_casSmallArrayzh);
- 
- RTS_FUN_DECL(stg_newMutVarzh);
-+#if __GLASGOW_HASKELL__ < 808
-+RTS_FUN_DECL(stg_atomicModifyMutVarzh);
-+#else
- RTS_FUN_DECL(stg_atomicModifyMutVar2zh);
- RTS_FUN_DECL(stg_atomicModifyMutVarzuzh);
-+#endif
- RTS_FUN_DECL(stg_casMutVarzh);
- 
- RTS_FUN_DECL(stg_isEmptyMVarzh);


=====================================
p/ghc/debian/patches/haddock-remove-googleapis-fonts
=====================================
@@ -2,11 +2,9 @@ Description: Remove hard-coded googleapis font URL
 Bug: https://github.com/haskell/haddock/issues/1211
 Bug-Debian: https://bugs.debian.org/963690
 
-Index: b/utils/haddock/haddock-api/src/Haddock/Backends/Xhtml.hs
-===================================================================
 --- a/utils/haddock/haddock-api/src/Haddock/Backends/Xhtml.hs
 +++ b/utils/haddock/haddock-api/src/Haddock/Backends/Xhtml.hs
-@@ -127,13 +127,13 @@ headHtml docTitle themes mathjax_url =
+@@ -126,13 +126,13 @@ headHtml docTitle themes mathjax_url =
      , thetitle << docTitle
      , styleSheet themes
      , thelink ! [ rel "stylesheet", thetype "text/css", href quickJumpCssFile] << noHtml


=====================================
p/ghc/debian/patches/kfreebsd-aclocal.m4
=====================================
@@ -2,11 +2,9 @@ Description: Add kfreebsdgnu to GHC_CONVERT_OS in aclocal.m4
 Author: Svante Signell <svante.signell at gmail.com>
 Bug-Debian: https://bugs.debian.org/913140
 
-Index: ghc-8.10.2/aclocal.m4
-===================================================================
---- ghc-8.10.2.orig/aclocal.m4
-+++ ghc-8.10.2/aclocal.m4
-@@ -2107,7 +2107,7 @@
+--- a/aclocal.m4
++++ b/aclocal.m4
+@@ -2137,7 +2137,7 @@ AC_DEFUN([GHC_CONVERT_OS],[
          $3="openbsd"
          ;;
        # As far as I'm aware, none of these have relevant variants
@@ -15,7 +13,7 @@ Index: ghc-8.10.2/aclocal.m4
          $3="$1"
          ;;
        msys)
-@@ -2127,6 +2127,9 @@
+@@ -2157,6 +2157,9 @@ AC_DEFUN([GHC_CONVERT_OS],[
                  #      i686-gentoo-freebsd8.2
          $3="freebsd"
          ;;


=====================================
p/ghc/debian/patches/llvm-arm-unknown-linux-gnueabi.patch
=====================================
@@ -10,7 +10,7 @@ Forwarded: https://gitlab.haskell.org/ghc/ghc/merge_requests/2789
  [("i386-unknown-windows", ("e-m:x-p:32:32-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:32-n8:16:32-a:0:32-S32", "pentium4", ""))
  ,("i686-unknown-windows", ("e-m:x-p:32:32-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:32-n8:16:32-a:0:32-S32", "pentium4", ""))
  ,("x86_64-unknown-windows", ("e-m:w-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128", "x86-64", ""))
-+,("arm-unknown-linux-gnueabi", ("e-m:e-p:32:32-Fi8-i64:64-v128:64:128-a:0:32-n32-S64", "arm7tdmi", "+soft-float -fp16 -vfp2 -vfp2sp -vfp2d16 -vfp2d16sp -vfp3 -vfp3sp -vfp3d16 -vfp3d16sp -vfp4 -vfp4sp -vfp4d16 -vfp4d16sp -fp-armv8 -fp-armv8sp -fp-armv8d16 -fp-armv8d16sp -fullfp16 -neon -crypto -dotprod -fp16fml -fp64 -d32 -fpregs +strict-align"))
++,("arm-unknown-linux-gnueabi", ("e-m:e-p:32:32-Fi8-i64:64-v128:64:128-a:0:32-n32-S64", "arm7tdmi", "+soft-float +strict-align"))
  ,("arm-unknown-linux-gnueabihf", ("e-m:e-p:32:32-Fi8-i64:64-v128:64:128-a:0:32-n32-S64", "arm1176jzf-s", "+strict-align"))
  ,("arm-unknown-linux-musleabihf", ("e-m:e-p:32:32-Fi8-i64:64-v128:64:128-a:0:32-n32-S64", "arm1176jzf-s", "+strict-align"))
  ,("armv6-unknown-linux-gnueabihf", ("e-m:e-p:32:32-Fi8-i64:64-v128:64:128-a:0:32-n32-S64", "arm1136jf-s", "+strict-align"))


=====================================
p/ghc/debian/patches/local-mathjax
=====================================
@@ -1,8 +1,6 @@
-Index: ghc-8.10.1/docs/users_guide/conf.py
-===================================================================
---- ghc-8.10.1.orig/docs/users_guide/conf.py
-+++ ghc-8.10.1/docs/users_guide/conf.py
-@@ -81,7 +81,7 @@
+--- a/docs/users_guide/conf.py
++++ b/docs/users_guide/conf.py
+@@ -78,7 +78,7 @@ html_use_opensearch = 'https://downloads
  html_show_copyright = True
  
  # See GHC #15006


=====================================
p/ghc/debian/patches/no-missing-haddock-file-warning
=====================================
@@ -3,11 +3,9 @@ Description: Do not emit a warning if the .haddock file is missing
  without the -doc package.
 Author: Joachim Breitner <nomeata at debian.org>
 
-Index: ghc-8.10.1/utils/ghc-pkg/Main.hs
-===================================================================
---- ghc-8.10.1.orig/utils/ghc-pkg/Main.hs
-+++ ghc-8.10.1/utils/ghc-pkg/Main.hs
-@@ -1914,8 +1914,10 @@
+--- a/utils/ghc-pkg/Main.hs
++++ b/utils/ghc-pkg/Main.hs
+@@ -1914,8 +1914,10 @@ checkPackageConfig pkg verbosity db_stac
    mapM_ (checkDir True  "dynamic-library-dirs") (libraryDynDirs pkg)
    mapM_ (checkDir True  "include-dirs") (includeDirs pkg)
    mapM_ (checkDir True  "framework-dirs") (frameworkDirs pkg)


=====================================
p/ghc/debian/patches/series
=====================================
@@ -6,7 +6,6 @@ x32-use-native-x86_64-insn.patch
 use-stage1-binaries-for-install.patch
 kfreebsd-aclocal.m4
 local-mathjax
-fix-build-using-unregisterised-v8.6
 llvm-arm-unknown-linux-gnueabi.patch
 fix-32bit-atomic
 3c12355ece0fa14e534c71a9f7327eda9773fad9.patch


=====================================
p/ghc/debian/patches/use-debian-gen_contents_index
=====================================
@@ -1,8 +1,6 @@
-Index: ghc-8.10.1/ghc.mk
-===================================================================
---- ghc-8.10.1.orig/ghc.mk
-+++ ghc-8.10.1/ghc.mk
-@@ -802,7 +802,6 @@
+--- a/ghc.mk
++++ b/ghc.mk
+@@ -802,7 +802,6 @@ endif
  # Build the Haddock contents and index
  ifeq "$(HADDOCK_DOCS)" "YES"
  libraries/dist-haddock/index.html: $(haddock_INPLACE) $(ALL_HADDOCK_FILES)
@@ -10,7 +8,7 @@ Index: ghc-8.10.1/ghc.mk
  ifeq "$(phase)" "final"
  $(eval $(call all-target,library_doc_index,libraries/dist-haddock/index.html))
  endif
-@@ -924,12 +923,8 @@
+@@ -936,12 +935,8 @@ endif
  	$(INSTALL_DIR) "$(DESTDIR)$(docdir)/html"
  	$(INSTALL_DOC) $(INSTALL_OPTS) docs/index.html "$(DESTDIR)$(docdir)/html"
  ifneq "$(INSTALL_LIBRARY_DOCS)" ""
@@ -24,7 +22,7 @@ Index: ghc-8.10.1/ghc.mk
  endif
  ifneq "$(INSTALL_HTML_DOC_DIRS)" ""
  	for i in $(INSTALL_HTML_DOC_DIRS); do \
-@@ -1052,7 +1047,6 @@
+@@ -1064,7 +1059,6 @@ $(eval $(call bindist-list,.,\
      mk/project.mk \
      mk/install.mk.in \
      bindist.mk \


=====================================
p/ghc/debian/patches/use-stage1-binaries-for-install.patch
=====================================
@@ -7,11 +7,9 @@ Description: Use the stage1 binaries for install
 Author: John Paul Adrian Glaubitz <glaubitz at physik.fu-berlin.de>
 Last-Update: 2017-01-29
 
-Index: ghc-8.10.1/ghc.mk
-===================================================================
---- ghc-8.10.1.orig/ghc.mk
-+++ ghc-8.10.1/ghc.mk
-@@ -943,8 +943,12 @@
+--- a/ghc.mk
++++ b/ghc.mk
+@@ -955,8 +955,12 @@ else # CrossCompiling
  # Install packages in the right order, so that ghc-pkg doesn't complain..
  # Also, install ghc-pkg first.
  ifeq "$(Windows_Host)" "NO"


=====================================
p/ghc/debian/patches/x32-use-native-x86_64-insn.patch
=====================================
@@ -12,11 +12,9 @@ Description: Use native x86_64 instructions on x32
  See: https://ghc.haskell.org/trac/ghc/ticket/11571
  .
 
-Index: ghc-8.10.2/rts/RtsSymbols.c
-===================================================================
---- ghc-8.10.2.orig/rts/RtsSymbols.c
-+++ ghc-8.10.2/rts/RtsSymbols.c
-@@ -981,7 +981,7 @@
+--- a/rts/RtsSymbols.c
++++ b/rts/RtsSymbols.c
+@@ -991,7 +991,7 @@
  
  
  // 64-bit support functions in libgcc.a



View it on GitLab: https://salsa.debian.org/haskell-team/DHG_packages/-/commit/0309e197a83fca904f6a70e1561565bcce1d129e

-- 
View it on GitLab: https://salsa.debian.org/haskell-team/DHG_packages/-/commit/0309e197a83fca904f6a70e1561565bcce1d129e
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-haskell-commits/attachments/20210824/494bb629/attachment-0001.htm>

More information about the Pkg-haskell-commits mailing list