[Git][haskell-team/DHG_packages][master] 9 commits: ghc: Remove files generated by gen_contents_index

Ilias Tsitsimpis (@iliastsi) gitlab at salsa.debian.org
Wed Dec 13 11:41:15 GMT 2023



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


Commits:
ab39c2d3 by Ilias Tsitsimpis at 2023-11-12T18:33:23+02:00
ghc: Remove files generated by gen_contents_index

- - - - -
c029a347 by Ilias Tsitsimpis at 2023-11-12T18:35:24+02:00
ghc: Canonicalize paths in gen_contents_index

GHC with the new Hadrian build system produces library configuration
files (package.conf) that contain '../' in them. Canonicalize them
so that gen_contents_index works.

- - - - -
f1ba9d64 by Ilias Tsitsimpis at 2023-11-12T21:33:59+02:00
ghc: Backport upstream fix for CLRRI opcode on mips64el

- - - - -
452b653e by Ilias Tsitsimpis at 2023-11-14T21:10:46+02:00
ghc: Fix pattern matching rule for third-party library docs

abs_path() removes the trailing slash, so we have to adjust our pattern
matching rule.

- - - - -
86487079 by Ilias Tsitsimpis at 2023-11-15T16:57:18+02:00
ghc: Remove package.cache.lock file in prerm

- - - - -
7b1b3347 by Ilias Tsitsimpis at 2023-11-16T20:04:13+02:00
ghc: Remove files generated by gen_contents_index

- - - - -
2dc47c03 by Ilias Tsitsimpis at 2023-12-13T12:25:05+02:00
Merge branch 'experimental'

- - - - -
e7e87975 by Ilias Tsitsimpis at 2023-12-13T12:28:54+02:00
ghc: Pass number of parallel jobs to hadrian

- - - - -
6779dcaf by Ilias Tsitsimpis at 2023-12-13T12:32:37+02:00
ghc: Restore --disable-ld-override

- - - - -


7 changed files:

- p/ghc/debian/changelog
- p/ghc/debian/gen_contents_index
- p/ghc/debian/ghc-doc.prerm
- p/ghc/debian/ghc.prerm
- + p/ghc/debian/patches/ppc64el-fix-clrri
- p/ghc/debian/patches/series
- p/ghc/debian/rules


Changes:

=====================================
p/ghc/debian/changelog
=====================================
@@ -1,3 +1,16 @@
+ghc (9.4.7-2) unstable; urgency=medium
+
+  * Remove files generated by gen_contents_index at installation time (Closes:
+    #1055817)
+  * Canonicalize paths in gen_contents_index (Closes: #1055070)
+  * Backport upstream fix for CLRRI opcode on mips64el (Closes: #1054894)
+  * Pass number of parallel jobs from DEB_BUILD_OPTIONS to hadrian.
+    Code adapted from the debian/rules file for src:cmake.
+    Thanks to John Paul Adrian Glaubitz for the fix (Closes: #1056742).
+  * Restore --disable-ld-override for affected architectures (Closes: #1056636)
+
+ -- Ilias Tsitsimpis <iliastsi at debian.org>  Wed, 13 Dec 2023 12:28:47 +0200
+
 ghc (9.4.7-1) unstable; urgency=medium
 
   * Upload to unstable


=====================================
p/ghc/debian/gen_contents_index
=====================================
@@ -3,6 +3,8 @@
 # Copyright 2009 Kari Pahula
 # Licensed under BSD3, see /usr/share/common-licenses/BSD
 
+use Cwd qw(abs_path);
+
 my @ifaces;
 my %pkgs;
 
@@ -31,6 +33,7 @@ sub addInfo {
         chomp ($dat{ver} = <$fh>);
         chomp ($dat{ifaces} = <$fh>);
         chomp ($dat{html} = <$fh>);
+        $dat{html} = abs_path($dat{html});
         process(\%dat, @_);
     }
 }
@@ -45,7 +48,7 @@ sub process {
     return undef if (exists $$pkgs{$p});
     if ($$dat{html} =~ m,^/usr/share/doc/ghc-doc/html/libraries/(.*),) {
         $path = $1;
-    } elsif ($$dat{html} =~ m,^/usr/share/doc/([^/]*-doc/html/.*),) {
+    } elsif ($$dat{html} =~ m,^/usr/share/doc/([^/]*-doc/html.*),) {
         $path = "../../../$1";
     }
 


=====================================
p/ghc/debian/ghc-doc.prerm
=====================================
@@ -28,6 +28,7 @@ case "$1" in
 	    /usr/share/doc/ghc-doc/html/libraries/ocean.css \
 	    /usr/share/doc/ghc-doc/html/libraries/haddock-bundle.min.js \
 	    /usr/share/doc/ghc-doc/html/libraries/quick-jump.css \
+	    /usr/share/doc/ghc-doc/html/libraries/linuwial.css \
 	    /usr/share/doc/ghc-doc/html/libraries/synopsis.png
     ;;
     *)


=====================================
p/ghc/debian/ghc.prerm
=====================================
@@ -24,7 +24,8 @@ case "$1" in
     remove|upgrade|deconfigure|failed-upgrade)
         update-alternatives --remove runhaskell $execdir/runghc
         update-alternatives --remove haskell-compiler $execdir/ghc
-	rm -f $vardir/package.conf.d/package.cache
+        rm -f $vardir/package.conf.d/package.cache \
+            $vardir/package.conf.d/package.cache.lock
     ;;
     *)
         echo "prerm called with unknown argument \`$1'" >&2


=====================================
p/ghc/debian/patches/ppc64el-fix-clrri
=====================================
@@ -0,0 +1,38 @@
+From 368444785432ac9f73b99ff15153ac33f95aed6d Mon Sep 17 00:00:00 2001
+From: Peter Trommler <ptrommler at acm.org>
+Date: Tue, 7 Nov 2023 21:47:24 +0100
+Subject: [PATCH] PPC NCG: Generate clear right insn at arch width
+
+The clear right immediate (clrrxi) is only available in word and
+doubleword width. Generate clrrxi instructions at architecture
+width for all MachOp widths.
+
+Fixes #24145
+---
+ compiler/GHC/CmmToAsm/PPC/CodeGen.hs | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+Index: b/compiler/GHC/CmmToAsm/PPC/CodeGen.hs
+===================================================================
+--- a/compiler/GHC/CmmToAsm/PPC/CodeGen.hs
++++ b/compiler/GHC/CmmToAsm/PPC/CodeGen.hs
+@@ -547,7 +547,7 @@ getRegister' config platform (CmmMachOp
+                                  CLRLI arch_fmt dst src1 (arch_bits - size)
+                  return (Any (intFormat to) code)
+ 
+-getRegister' _ _ (CmmMachOp mop [x, y]) -- dyadic PrimOps
++getRegister' _ platform (CmmMachOp mop [x, y]) -- dyadic PrimOps
+   = case mop of
+       MO_F_Eq _ -> condFltReg EQQ x y
+       MO_F_Ne _ -> condFltReg NE  x y
+@@ -627,8 +627,9 @@ getRegister' _ _ (CmmMachOp mop [x, y])
+                 (src, srcCode) <- getSomeReg x
+                 let clear_mask = if imm == -4 then 2 else 3
+                     fmt = intFormat rep
++                    arch_fmt = intFormat (wordWidth platform)
+                     code dst = srcCode
+-                               `appOL` unitOL (CLRRI fmt dst src clear_mask)
++                      `appOL` unitOL (CLRRI arch_fmt dst src clear_mask)
+                 return (Any fmt code)
+         _ -> trivialCode rep False AND x y
+       MO_Or rep    -> trivialCode rep False OR x y


=====================================
p/ghc/debian/patches/series
=====================================
@@ -21,3 +21,4 @@ fix-32-bit-unreg
 hadrian-fix-dnosmp
 hadrian-enable-interpreter
 use-modern-atomics
+ppc64el-fix-clrri


=====================================
p/ghc/debian/rules
=====================================
@@ -67,9 +67,10 @@ endif
 # once #901947 has been fixed.
 # Do the same for powerpcspe, due to https://bugs.debian.org/904915
 # Do the same for sparc64, due to https://bugs.debian.org/908998
-# ifneq (,$(filter mips mipsel powerpc powerpcspe sparc64, $(DEB_HOST_ARCH)))
-#   EXTRA_CONFIGURE_FLAGS += --disable-ld-override
-# endif
+# See also https://bugs.debian.org/1056636
+ifneq (,$(filter mips mipsel powerpc powerpcspe sparc64, $(DEB_HOST_ARCH)))
+  EXTRA_CONFIGURE_FLAGS += --disable-ld-override
+endif
 
 ifneq (,$(filter armhf, $(DEB_HOST_ARCH)))
 	EXTRA_HADRIAN_FLAGS += "*.*.ghc.hs.opts += -D__ARM_PCS_VFP"
@@ -95,6 +96,10 @@ ifneq (,$(filter noopt, $(DEB_BUILD_OPTIONS)))
 	EXTRA_HADRIAN_FLAGS += "*.*.rts.*.opts += -O0"
 endif
 
+ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+    NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+endif
+
 # Use system libffi
 EXTRA_CONFIGURE_FLAGS += --with-system-libffi
 
@@ -152,7 +157,7 @@ ifeq (YES,$(BUILD_CROSS))
 	$(error cross-compilation is not supported)
 endif
 	hadrian/hadrian \
-		-V -j \
+		-V -j$(NUMJOBS) \
 		--docs=no-haddocks --docs=no-sphinx-html --docs=no-sphinx-pdfs \
 		binary-dist-dir \
 		$(EXTRA_HADRIAN_FLAGS)
@@ -175,7 +180,7 @@ ifeq (YES,$(BUILD_CROSS))
 	$(error override_dh_auto_build-indep is not supported when cross compiling)
 endif
 	hadrian/hadrian \
-		-V -j \
+		-V -j$(NUMJOBS) \
 		--docs=no-sphinx-pdfs \
 		binary-dist-dir \
 		$(EXTRA_HADRIAN_FLAGS)
@@ -261,6 +266,22 @@ endif
 	cp debian/gen_contents_index debian/tmp/usr/lib/ghc-doc/
 	chmod +x debian/tmp/usr/lib/ghc-doc/gen_contents_index
 
+	# Delete 'doc-index.html' and 'index.html' files. These are generated at
+	# installation time using 'gen_contents_index'.
+	rm -f debian/tmp/usr/share/doc/ghc-doc/html/libraries/doc-index*.html \
+		debian/tmp/usr/share/doc/ghc-doc/html/libraries/index.html \
+		debian/tmp/usr/share/doc/ghc-doc/html/libraries/frames.html \
+		debian/tmp/usr/share/doc/ghc-doc/html/libraries/index-frames.html \
+	    debian/tmp/usr/share/doc/ghc-doc/html/libraries/haddock-util.js \
+	    debian/tmp/usr/share/doc/ghc-doc/html/libraries/hslogo-16.png \
+	    debian/tmp/usr/share/doc/ghc-doc/html/libraries/minus.gif \
+	    debian/tmp/usr/share/doc/ghc-doc/html/libraries/plus.gif \
+	    debian/tmp/usr/share/doc/ghc-doc/html/libraries/ocean.css \
+	    debian/tmp/usr/share/doc/ghc-doc/html/libraries/haddock-bundle.min.js \
+	    debian/tmp/usr/share/doc/ghc-doc/html/libraries/quick-jump.css \
+	    debian/tmp/usr/share/doc/ghc-doc/html/libraries/linuwial.css \
+	    debian/tmp/usr/share/doc/ghc-doc/html/libraries/synopsis.png
+
 	# Move haddock files to the correct folder
 	# (Create folders if they don't exist, i.e., if we are building '-arch')
 	mkdir -p debian/tmp/usr/lib/ghc-doc/haddock/ghc/



View it on GitLab: https://salsa.debian.org/haskell-team/DHG_packages/-/compare/5e08edfeba1729c62d7292cdf47408de95a5b37c...6779dcaf5f0ce91b02c2598619a2668cb86a5a22

-- 
View it on GitLab: https://salsa.debian.org/haskell-team/DHG_packages/-/compare/5e08edfeba1729c62d7292cdf47408de95a5b37c...6779dcaf5f0ce91b02c2598619a2668cb86a5a22
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/20231213/c23d3951/attachment-0001.htm>


More information about the Pkg-haskell-commits mailing list