Commit 0f4622a8 authored by Gianfranco Costamagna's avatar Gianfranco Costamagna
Browse files

ghc: Add armel and mathjax patches from master branch

parent b5b34581
Loading
Loading
Loading
Loading
+23 −0
Original line number Diff line number Diff line
ghc (8.6.4+dfsg1-2) experimental; urgency=medium

  * Merge with unstable changes in 8.4.4+dfsg1-3

 -- Gianfranco Costamagna <locutusofborg@debian.org>  Thu, 20 Jun 2019 10:18:39 +0200

ghc (8.4.4+dfsg1-3) unstable; urgency=medium

  * Use the ARM7TDMI core on armel (Closes: #915333)

 -- Ilias Tsitsimpis <iliastsi@debian.org>  Thu, 20 Jun 2019 00:08:21 +0300

ghc (8.4.4+dfsg1-2) unstable; urgency=medium

  [ Clint Adams ]
  * Patch Sphinx config to use locally-installed MathJax instead of a
    copy on the Internet.  closes: #919518.

  [ Gianfranco Costamagna ]
  * Fix sphinx 1.8 build with upstream patch (Closes: #923445)

 -- Gianfranco Costamagna <locutusofborg@debian.org>  Thu, 28 Feb 2019 15:18:49 +0100

ghc (8.6.4+dfsg1-1) experimental; urgency=medium

  * New upstream release
+1 −2
Original line number Diff line number Diff line
Description: with new ghc 8.4.3, the armel situation seems to have improved,
 apply this patch unconditionally.

Index: b/llvm-targets
===================================================================
--- a/llvm-targets
@@ -9,7 +8,7 @@ Index: b/llvm-targets
 ,("x86_64-unknown-windows", ("e-m:w-i64:64-f80:128-n8:16:32:64-S128", "x86-64", ""))
 ,("arm-unknown-linux-gnueabihf", ("e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64", "arm1176jzf-s", "+strict-align"))
 ,("armv6-unknown-linux-gnueabihf", ("e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64", "arm1136jf-s", "+strict-align"))
+,("arm-unknown-linux-gnueabi", ("e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64", "arm1136jf-s", "+strict-align"))
+,("arm-unknown-linux-gnueabi", ("e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64", "arm7tdmi", "+soft-float -fp-only-sp -d16 -vfp2 -vfp3 -fp16 -vfp4 -fp-armv8 -neon -crypto +strict-align"))
 ,("armv6l-unknown-linux-gnueabihf", ("e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64", "arm1176jzf-s", "+strict-align"))
 ,("armv7-unknown-linux-gnueabihf", ("e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64", "generic", ""))
 ,("armv7a-unknown-linux-gnueabi", ("e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64", "generic", ""))
+11 −0
Original line number Diff line number Diff line
--- a/docs/users_guide/conf.py
+++ b/docs/users_guide/conf.py
@@ -58,7 +58,7 @@
 html_show_copyright = True
 
 # See GHC #15006
-mathjax_path = 'https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/MathJax.js'
+mathjax_path = 'file:///usr/share/javascript/mathjax/MathJax.js'
 
 # If true, an OpenSearch description file will be output, and all pages will
 # contain a <link> tag referring to it.  The value of this option must be the
+1 −0
Original line number Diff line number Diff line
@@ -10,3 +10,4 @@ e175aaf6918bb2b497b83618dc4c270a0d231a1c.patch
fix-build-using-unregisterized-v8.2
add_-latomic_to_ghc-prim
kfreebsd-aclocal.m4
local-mathjax