[Git][haskell-team/DHG_packages][experimental] ghc: cherry-pick two upstream changes to build with llvm-13 on arm*

[Gianfranco Costamagna (@locutusofborg)]

Gianfranco Costamagna pushed to branch experimental at Debian Haskell Group / DHG_packages


Commits:
b16997ae by Gianfranco Costamagna at 2022-06-10T15:41:18+02:00
ghc: cherry-pick two upstream changes to build with llvm-13 on arm*

- - - - -


5 changed files:

- p/ghc/debian/changelog
- p/ghc/debian/control
- + p/ghc/debian/patches/78db231ffdf8385662812781c1d09c630cfad313.patch
- + p/ghc/debian/patches/ddd2591c5ca395e39ea36855e5b7e0a3464b7ad8.patch
- p/ghc/debian/patches/series


Changes:

=====================================
p/ghc/debian/changelog
=====================================
@@ -1,3 +1,11 @@
+ghc (9.0.2-1~exp2) experimental; urgency=medium
+
+  * Cherry-pick two upstream changes to build with llvm-13 on arm*
+    - debian/patches/78db231ffdf8385662812781c1d09c630cfad313.patch:
+    - debian/patches/ddd2591c5ca395e39ea36855e5b7e0a3464b7ad8.patch:
+
+ -- Gianfranco Costamagna <locutusofborg at debian.org>  Fri, 10 Jun 2022 15:39:19 +0200
+
 ghc (9.0.2-1~exp1) experimental; urgency=medium
 
   [ Gianfranco Costamagna ]


=====================================
p/ghc/debian/control
=====================================
@@ -16,7 +16,7 @@ Build-Depends:
   pkg-config,
   ghc:native (>= 8.6),
   libgmp-dev,
-  llvm-12 [arm64 armel armhf],
+  llvm-13 [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-12 [arm64 armel armhf],
+  llvm-13 [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-12
+Suggests: perl, ghc-prof, ghc-doc, haskell-doc, llvm-13
 Description: The Glasgow Haskell Compilation system
  The Glorious Glasgow Haskell Compilation system (GHC) is a compiler for
  Haskell.


=====================================
p/ghc/debian/patches/78db231ffdf8385662812781c1d09c630cfad313.patch
=====================================
@@ -0,0 +1,24 @@
+From 78db231ffdf8385662812781c1d09c630cfad313 Mon Sep 17 00:00:00 2001
+From: Cheng Shao <astrohavoc at gmail.com>
+Date: Thu, 27 Jan 2022 12:12:14 +0000
+Subject: [PATCH] configure: bump LlvmMaxVersion to 14
+
+LLVM 13.0.0 is released in Oct 2021, and latest head validates against
+LLVM 13 just fine if LlvmMaxVersion is bumped.
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index e8a95726a35..71879adeb04 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -681,7 +681,7 @@ AC_SUBST(InstallNameToolCmd)
+ # versions of LLVM simultaneously, but that stopped working around
+ # 3.5/3.6 release of LLVM.
+ LlvmMinVersion=9  # inclusive
+-LlvmMaxVersion=13 # not inclusive
++LlvmMaxVersion=14 # not inclusive
+ AC_SUBST([LlvmMinVersion])
+ AC_SUBST([LlvmMaxVersion])
+ sUPPORTED_LLVM_VERSION_MIN=$(echo \($LlvmMinVersion\) | sed 's/\./,/')


=====================================
p/ghc/debian/patches/ddd2591c5ca395e39ea36855e5b7e0a3464b7ad8.patch
=====================================
@@ -0,0 +1,26 @@
+From ddd2591c5ca395e39ea36855e5b7e0a3464b7ad8 Mon Sep 17 00:00:00 2001
+From: Ben Gamari <ben at smart-cactus.org>
+Date: Fri, 29 Apr 2022 12:51:26 -0400
+Subject: [PATCH] Update supported LLVM versions
+
+Pull forward minimum version to match 9.2.
+
+(cherry picked from commit c26faa54c5fbe902ccb74e79d87e3fa705e270d1)
+---
+ configure.ac                     | 2 +-
+ docs/users_guide/9.4.1-notes.rst | 6 ++++++
+ 2 files changed, 7 insertions(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index f0d3160d1f7..0fd6442d51b 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -555,7 +555,7 @@ AC_SUBST(InstallNameToolCmd)
+ # tools we are looking for. In the past, GHC supported a number of
+ # versions of LLVM simultaneously, but that stopped working around
+ # 3.5/3.6 release of LLVM.
+-LlvmMinVersion=9  # inclusive
++LlvmMinVersion=10  # inclusive
+ LlvmMaxVersion=14 # not inclusive
+ AC_SUBST([LlvmMinVersion])
+ AC_SUBST([LlvmMaxVersion])


=====================================
p/ghc/debian/patches/series
=====================================
@@ -10,3 +10,5 @@ haddock-remove-googleapis-fonts
 fix-llvm-armel
 latomic-subword
 latomic-64bit
+78db231ffdf8385662812781c1d09c630cfad313.patch
+ddd2591c5ca395e39ea36855e5b7e0a3464b7ad8.patch



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

-- 
View it on GitLab: https://salsa.debian.org/haskell-team/DHG_packages/-/commit/b16997ae9270c8f88b7f8548e5cb6fdf93a07c43
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/20220610/eeb92ed2/attachment-0001.htm>