[Git][haskell-team/DHG_packages][hadrian] 2 commits: hadrian: Apply iserv patch

[Ilias Tsitsimpis (@iliastsi)]

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


Commits:
5cbbfdb1 by Ilias Tsitsimpis at 2023-09-21T20:15:25+03:00
hadrian: Apply iserv patch

- - - - -
2cd63838 by Ilias Tsitsimpis at 2023-09-21T20:15:51+03:00
ghc: Replace pkgroot

- - - - -


4 changed files:

- p/ghc/debian/rules
- − p/haskell-hadrian/debian/hlibrary.setup
- + p/haskell-hadrian/debian/patches/hadrian-iserv
- p/haskell-hadrian/debian/patches/series


Changes:

=====================================
p/ghc/debian/rules
=====================================
@@ -213,6 +213,13 @@ debian/tmp: $(BINDIST)/mk/install.mk
 	# Modify the ghc-doc path in package.conf files
 	sed -ri 's,share/doc/ghc-doc/html/libraries/(.*)\.haddock,lib/ghc-doc/haddock/ghc/\1.haddock,' debian/tmp/var/lib/ghc/package.conf.d/*.conf
 
+	# Replace ${pkgroot} in the package.conf files.
+	# The "pkgroot" is the directory containing the package database,
+	# which for us should be '/usr/lib/ghc/lib/'.
+	# The reason we change it here is because we are moving the package.conf
+	# files under '/var/lib/ghc/package.conf.d'.
+	sed -ri 's,\$$\{pkgroot\},/usr/lib/ghc/lib,' debian/tmp/var/lib/ghc/package.conf.d/*.conf
+
 	# manpages
 ifeq (NO,$(BUILD_CROSS))
 	echo ".so man1/ghc.1" > debian/tmp/usr/share/man/man1/ghc-$(ProjectVersion).1


=====================================
p/haskell-hadrian/debian/hlibrary.setup deleted
=====================================
Binary files a/p/haskell-hadrian/debian/hlibrary.setup and /dev/null differ


=====================================
p/haskell-hadrian/debian/patches/hadrian-iserv
=====================================
@@ -0,0 +1,18 @@
+Description: Fix installation patch for iserv/unlit
+Author: Ilias Tsitsimpis <iliastsi at debian.org>
+Bug: https://gitlab.haskell.org/ghc/ghc/-/issues/22557
+Bug: https://gitlab.haskell.org/ghc/ghc/-/issues/22697
+
+Index: b/src/Packages.hs
+===================================================================
+--- a/src/Packages.hs
++++ b/src/Packages.hs
+@@ -192,7 +192,7 @@ programPath context at Context {..} = do
+     -- See: https://github.com/snowleopard/hadrian/issues/570
+     -- Likewise for @iserv@ and @unlit at .
+     name <- programName context
+-    path <- if package `elem` [iserv, touchy, unlit]
++    path <- if package `elem` [touchy, unlit]
+               then stageLibPath stage <&> (-/- "bin")
+               else stageBinPath stage
+     return $ path -/- name <.> exe


=====================================
p/haskell-hadrian/debian/patches/series
=====================================
@@ -1,2 +1,3 @@
 newer-cabal
 hadrian-haddock-opts
+hadrian-iserv



View it on GitLab: https://salsa.debian.org/haskell-team/DHG_packages/-/compare/a10b258a0247f4159dcd32d4a874a5529ada4735...2cd638389f9e686cd708175780576ca925f6c117

-- 
View it on GitLab: https://salsa.debian.org/haskell-team/DHG_packages/-/compare/a10b258a0247f4159dcd32d4a874a5529ada4735...2cd638389f9e686cd708175780576ca925f6c117
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/20230921/ef47c114/attachment-0001.htm>