[Git][haskell-team/DHG_packages][hadrian] ghc: Minor fixes

[Ilias Tsitsimpis (@iliastsi)]

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


Commits:
00581173 by Ilias Tsitsimpis at 2023-09-16T10:06:14+03:00
ghc: Minor fixes

Fix the symlink for '/usr/lib/ghc/lib/package.conf.d'. Aslo do not
move unlit since ghc expects to find it in '/usr/lib/ghc/lib/bin/unlit'.

- - - - -


2 changed files:

- p/ghc/debian/ghc.links
- p/ghc/debian/patches/hadrian-iserv


Changes:

=====================================
p/ghc/debian/ghc.links
=====================================
@@ -4,4 +4,4 @@
 # Create a symlink, so that 'ghc-pkg' continues to work.
 # In the future, we should decide whether it makes sense to modify the
 # default package-db for ghc-pkg, or move everything under /usr/lib.
-/var/lib/ghc/package.conf.d /usr/lib/ghc/package.conf.d
+/var/lib/ghc/package.conf.d /usr/lib/ghc/lib/package.conf.d


=====================================
p/ghc/debian/patches/hadrian-iserv
=====================================
@@ -12,22 +12,7 @@ Index: b/hadrian/src/Packages.hs
      -- Likewise for @iserv@ and @unlit at .
      name <- programName context
 -    path <- if package `elem` [iserv, touchy, unlit]
-+    path <- if package `elem` [touchy]
++    path <- if package `elem` [touchy, unlit]
                then stageLibPath stage <&> (-/- "bin")
                else stageBinPath stage
      return $ path -/- name <.> exe
-Index: b/hadrian/bindist/Makefile
-===================================================================
---- a/hadrian/bindist/Makefile
-+++ b/hadrian/bindist/Makefile
-@@ -179,7 +179,9 @@ install_lib: lib/settings
- 		    $(INSTALL_DATA) $$i "$$dest/`dirname $$i`" ;; \
- 		esac; \
- 	done; \
--	chmod ugo+rx "$$dest"/bin/*
-+	if test -d "$$dest"/bin/; then \
-+		chmod ugo+rx "$$dest"/bin/*; \
-+	fi
- 	for i in $(DOCS); do \
- 		cp -R $$i "$(DESTDIR)$(docdir)/"; \
- 	done



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

-- 
View it on GitLab: https://salsa.debian.org/haskell-team/DHG_packages/-/commit/00581173cc70aa97bc78ca318c6e92c424ff7814
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/20230916/052bade7/attachment-0001.htm>