[Git][haskell-team/DHG_packages][experimental] 2 commits: ghc: Drop redundant build-dep on devscripts

[Ilias Tsitsimpis (@iliastsi)]

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


Commits:
bb8e7126 by Ilias Tsitsimpis at 2024-08-28T11:34:12+03:00
ghc: Drop redundant build-dep on devscripts

- - - - -
970e22ee by Ilias Tsitsimpis at 2024-08-28T15:44:18+03:00
ghc: Add missing dependency on libstdc++-X-dev library

The 'system-cxx-std-lib' virtual GHC package captures the
configuration necessary for linking against the C++ standard library.
It depends on the version of libstdc++ we had available during build
time. We need to capture this dependency against the correct version of
the libstdc++-X-dev library.

We use a 'Recommends' rather than a 'Depends', since this is only needed
in case we want to use the 'system-cxx-std-lib' virtual GHC package.

- - - - -


4 changed files:

- p/ghc/debian/changelog
- p/ghc/debian/control
- p/ghc/debian/provided_substvars
- p/ghc/debian/rules


Changes:

=====================================
p/ghc/debian/changelog
=====================================
@@ -1,6 +1,9 @@
 ghc (9.6.6-1~exp5) experimental; urgency=medium
 
   * Use gold on arm{el,hf}
+  * Drop redundant build-dep on devscripts
+  * Add missing build-dep on libnuma-dev
+  * Add missing dependency on libstdc++-X-dev library
 
  -- Ilias Tsitsimpis <iliastsi at debian.org>  Mon, 26 Aug 2024 17:37:05 +0300
 


=====================================
p/ghc/debian/control
=====================================
@@ -10,7 +10,8 @@ Rules-Requires-Root: no
 Build-Depends:
   debhelper-compat (= 12),
   haskell-devscripts-minimal (>= 0.16.31) <!cross>,
-  devscripts,
+  gcc,
+  g++,
   pkg-config,
   ghc:native (>= 9.2),
   hadrian:native (>= 9.6.6) <!pkg.ghc.nohadrian>,
@@ -19,6 +20,7 @@ Build-Depends:
   libgmp-dev,
   libffi-dev,
   libncurses-dev,
+  libnuma-dev,
   python3:native,
   python3-sphinx <!cross>,
 Build-Depends-Indep:
@@ -41,6 +43,8 @@ Depends:
   libncurses-dev,
   ${shlibs:Depends},
   ${misc:Depends}
+Recommends:
+  ${shlibs:Recommends},
 Pre-Depends: dpkg (>= 1.16.1)
 Provides:
   haskell-compiler,


=====================================
p/ghc/debian/provided_substvars
=====================================


=====================================
p/ghc/debian/rules
=====================================
@@ -401,7 +401,6 @@ override_dh_compress:
 override_dh_gencontrol:
 ifeq (NO,$(BUILD_CROSS))
 	# Generate substvars
-	chmod +x debian/provided_substvars
 	debian/provided_substvars
 	# Check if we have a ghci binary
 	if test -e debian/tmp/usr/bin/ghci-$(ProjectVersion); then \
@@ -409,6 +408,15 @@ ifeq (NO,$(BUILD_CROSS))
 	# Add haddock substvars
 	echo "haddock:Provides=haddock-interface-$$(debian/tmp/usr/lib/ghc/bin/haddock --interface-version)" >> debian/ghc.substvars
 	echo "haddock:Depends=haddock-interface-$$(debian/tmp/usr/lib/ghc/bin/haddock --interface-version)" >> debian/ghc-doc.substvars
+	# Add a dependency for the libstdc++-X-dev library the 'system-cxx-std-lib'
+	# package uses. Since we need libstdc++ only when using the
+	# 'system-cxx-std-lib' package, make this a recommends, rather than a depends.
+	echo "shlibs:Recommends=$$(\
+		_build/stage1/bin/ghc-pkg --simple-output field system-cxx-std-lib library-dirs | \
+		xargs realpath ${# resolve ../} | \
+		xargs -I{} dpkg-query -S '{}/libstdc++.so' ${# get package names} | \
+		sed 's/: .*//' ${# strip trailing ': filename'} | \
+		sort -u ${# unique packages})" >> debian/ghc.substvars
 	dh_haskell_provides
 endif
 	dh_gencontrol



View it on GitLab: https://salsa.debian.org/haskell-team/DHG_packages/-/compare/9e34e22e4c733f7de4b13c78226a6764b6f42712...970e22eeccebb80bae82c689b7cb415fbc9a85c1

-- 
View it on GitLab: https://salsa.debian.org/haskell-team/DHG_packages/-/compare/9e34e22e4c733f7de4b13c78226a6764b6f42712...970e22eeccebb80bae82c689b7cb415fbc9a85c1
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/20240828/6867d257/attachment-0001.htm>