[Git][haskell-team/DHG_packages][master] 3 commits: ghc: Disable parallel install (#944493)

[Ilias Tsitsimpis (@iliastsi)]

Ilias Tsitsimpis pushed to branch master at Debian Haskell Group / DHG_packages


Commits:
1b3e1255 by Ilias Tsitsimpis at 2021-10-03T14:29:26+03:00
ghc: Disable parallel install (#944493)

- - - - -
788639ac by Ilias Tsitsimpis at 2021-10-03T14:29:27+03:00
ghc: Fix FTBFS with autoconf 2.71 (#995036)

- - - - -
8231e6df by Ilias Tsitsimpis at 2021-10-03T14:29:27+03:00
ghc: Fix FTBFS with Sphinx 4.2.0 (#995429)

- - - - -


5 changed files:

- p/ghc/debian/changelog
- + p/ghc/debian/patches/newer-autoconf
- + p/ghc/debian/patches/newer-sphinx
- p/ghc/debian/patches/series
- p/ghc/debian/rules


Changes:

=====================================
p/ghc/debian/changelog
=====================================
@@ -1,3 +1,13 @@
+ghc (8.8.4-3) unstable; urgency=medium
+
+  * Disable parallel install to fix races with missing directories
+    (Closes: #944493)
+  * Fix FTBFS with autoconf 2.71. Thanks to Matthias Klose for the patch
+    (Closes: #995036)
+  * Fix FTBFS with Sphinx 4.2.0 (Closes: #995429)
+
+ -- Ilias Tsitsimpis <iliastsi at debian.org>  Sun, 03 Oct 2021 14:27:00 +0300
+
 ghc (8.8.4-2) unstable; urgency=medium
 
   [ Ilias Tsitsimpis ]


=====================================
p/ghc/debian/patches/newer-autoconf
=====================================
@@ -0,0 +1,18 @@
+Description: Fix build with newer autoconf (2.71)
+Author: Matthias Klose <doko at debian.org>
+Bug-Debian: https://bugs.debian.org/995036
+Applied-Upstream: https://gitlab.haskell.org/ghc/ghc/-/commit/ad2ef3a13f1eb000eab8e3d64592373b91a52806
+
+Index: b/aclocal.m4
+===================================================================
+--- a/aclocal.m4
++++ b/aclocal.m4
+@@ -613,7 +613,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


=====================================
p/ghc/debian/patches/newer-sphinx
=====================================
@@ -0,0 +1,25 @@
+Description: Fix build with newer Sphinx
+ This is a partial cherry-pick of 83407ffc7acc00cc025b9f6ed063add9ab9f9bcc.
+Origin: https://gitlab.haskell.org/ghc/ghc/-/commit/83407ffc7acc00cc025b9f6ed063add9ab9f9bcc
+Bug-Debian: https://bugs.debian.org/995429
+
+Index: b/docs/users_guide/conf.py
+===================================================================
+--- a/docs/users_guide/conf.py
++++ b/docs/users_guide/conf.py
+@@ -77,13 +77,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}
+ ''',
+ }
+ 


=====================================
p/ghc/debian/patches/series
=====================================
@@ -14,3 +14,5 @@ fix-32bit-atomic
 11f8eef5a9625c77f78a829406c446b615ed6168.patch
 haddock-remove-googleapis-fonts
 fix-big-endian-ffi
+newer-autoconf
+newer-sphinx


=====================================
p/ghc/debian/rules
=====================================
@@ -173,7 +173,8 @@ FILES = \( -type f -o -type l \)
 PROF_FILE = \( -name "*.p_*" -o -name "lib*_p.a" \)
 
 override_dh_auto_install:
-	dh_auto_install
+	# See https://bugs.debian.org/944493 for why we use --no-parallel.
+	dh_auto_install --no-parallel
 
 	# Delete all the library LICENSE files
 	rm -f debian/tmp/usr/share/doc/ghc-doc/html/libraries/*/LICENSE



View it on GitLab: https://salsa.debian.org/haskell-team/DHG_packages/-/compare/a5538cbd240894d40ec0ec49b69dc0a4f9c683cb...8231e6df6710f5e95ef891d90b3397dbcc682ad6

-- 
View it on GitLab: https://salsa.debian.org/haskell-team/DHG_packages/-/compare/a5538cbd240894d40ec0ec49b69dc0a4f9c683cb...8231e6df6710f5e95ef891d90b3397dbcc682ad6
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/20211003/1f2296a2/attachment-0001.htm>