[Git][haskell-team/haskell-devscripts][master] 3 commits: Patch from Steve Langasek to not build docs during binary-arch. closes: #1018979.
Clint Adams (@clint)
gitlab at salsa.debian.org
Tue Sep 6 21:34:42 BST 2022
Clint Adams pushed to branch master at Debian Haskell Group / haskell-devscripts
Commits:
a6f75d66 by Clint Adams at 2022-09-06T15:20:21-04:00
Patch from Steve Langasek to not build docs during binary-arch. closes: #1018979.
- - - - -
364466d4 by Clint Adams at 2022-09-06T16:31:56-04:00
Only install extra-packages file for -dev package. closes: #1016506
- - - - -
87af94d4 by Clint Adams at 2022-09-06T16:32:58-04:00
changelog for 0.16.28
- - - - -
3 changed files:
- debian/changelog
- dh_haskell_extra_depends_ghc
- hlibrary.mk
Changes:
=====================================
debian/changelog
=====================================
@@ -1,3 +1,12 @@
+haskell-devscripts (0.16.28) unstable; urgency=medium
+
+ * Patch from Steve Langasek to not build docs during
+ binary-arch. closes: #1018979.
+ * Only install extra-packages file for -dev package.
+ closes: #1016506
+
+ -- Clint Adams <clint at debian.org> Tue, 06 Sep 2022 16:32:30 -0400
+
haskell-devscripts (0.16.27) unstable; urgency=medium
* Fix GetCabalVersion.hs on GHC 8.8.4
=====================================
dh_haskell_extra_depends_ghc
=====================================
@@ -42,10 +42,15 @@ const my $COMMA => q{,};
const my $NEWLINE => qq{\n};
-init();
+init(
+ options => {
+ 'type=s' => \$dh{TYPE},
+ });
+
+my $type = $dh{TYPE} // $EMPTY;
# this installs the extra-packages file
-if (length $ENV{DEB_GHC_EXTRA_PACKAGES}) {
+if ($type eq 'dev' && length $ENV{DEB_GHC_EXTRA_PACKAGES}) {
die encode_utf8('Need CABAL_PACKAGE for DEB_GHC_EXTRA_PACKAGES')
unless length $ENV{CABAL_PACKAGE};
=====================================
hlibrary.mk
=====================================
@@ -112,8 +112,6 @@ ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
endif
endif
-DEB_BUILD_DEPENDENCIES = build-arch
-
# We call the shell for most things, so make our variables available to it
export DEB_SETUP_BIN_NAME
export CABAL_PACKAGE
@@ -175,13 +173,20 @@ build-haddock-stamp: configure-ghc-stamp
build/%-doc:: build-haddock-stamp
-# FIXME: For now, we have a single install recipe, which means we have
-# to build both arch and indep (haddock) artifacts, even if we need only
-# one of them. We should split the install recipe into two.
-debian/tmp-inst-%: $(DEB_SETUP_BIN_NAME) check-ghc-stamp build-haddock-stamp
+install-%-base::
perl -d:Confess -MDebian::Debhelper::Buildsystem::Haskell::Recipes=/.*/ \
- -E 'install_recipe($$ARGV[0])' "$@"
- ln --symbolic --force "$@" debian/tmp
+ -E 'install_recipe($$ARGV[0])' "$(patsubst install-%-base,debian/tmp-inst-%,$@)"
+ ln --symbolic --force "$(patsubst install-%-base,debian/tmp-inst-%,$@)" debian/tmp
+
+install-%-arch: $(DEB_SETUP_BIN_NAME) check-ghc-stamp install-%-base
+ :
+
+# FIXME: the install_recipe doesn't work for indep-only builds, so our
+# indep target depends on the arch target for now.
+install-%-indep: $(DEB_SETUP_BIN_NAME) check-ghc-stamp build-haddock-stamp install-%-base
+ :
+
+debian/tmp-inst-%:: $(DEB_SETUP_BIN_NAME) check-ghc-stamp build-haddock-stamp install-%-base
dist-hugs: $(DEB_SETUP_BIN_NAME)
$(DEB_SETUP_BIN_NAME) configure --hugs --prefix=/usr -v2 \
@@ -190,47 +195,47 @@ dist-hugs: $(DEB_SETUP_BIN_NAME)
build/libhugs-$(CABAL_PACKAGE):: dist-hugs
$(DEB_SETUP_BIN_NAME) build --builddir=dist-hugs
-install/libghc-$(CABAL_PACKAGE)-dev:: debian/tmp-inst-ghc
+install/libghc-$(CABAL_PACKAGE)-dev:: install-ghc-arch
dh_haskell_install_ghc_registration --package=$(notdir $@)
- dh_haskell_install_development_libs --package=$(notdir $@) --source-dir="$<"
+ dh_haskell_install_development_libs --package=$(notdir $@) --source-dir="debian/tmp-inst-ghc"
dh_haskell_provides_ghc --package=$(notdir $@)
dh_haskell_depends_cabal --package=$(notdir $@)
- dh_haskell_extra_depends_ghc --package=$(notdir $@)
+ dh_haskell_extra_depends_ghc --package=$(notdir $@) --type=dev
dh_haskell_shlibdeps --package=$(notdir $@)
dh_haskell_blurbs --package=$(notdir $@) --type=dev
-install/libghc-$(CABAL_PACKAGE)-prof:: debian/tmp-inst-ghc
- dh_haskell_install_profiling_libs --package=$(notdir $@) --source-dir="$<"
+install/libghc-$(CABAL_PACKAGE)-prof:: install-ghc-arch
+ dh_haskell_install_profiling_libs --package=$(notdir $@) --source-dir="debian/tmp-inst-ghc"
dh_haskell_provides_ghc --package=$(notdir $@) --config-shipper="libghc-$(CABAL_PACKAGE)-dev"
dh_haskell_depends_cabal --package=$(notdir $@) --config-shipper="libghc-$(CABAL_PACKAGE)-dev"
dh_haskell_blurbs --package=$(notdir $@) --type=prof
-install/libghc-$(CABAL_PACKAGE)-doc:: debian/tmp-inst-ghc
- dh_haskell_install_htmldocs --package=$(notdir $@) --source-dir="$<"
- dh_haskell_install_haddock --package=$(notdir $@) --source-dir="$<"
+install/libghc-$(CABAL_PACKAGE)-doc:: install-ghc-indep
+ dh_haskell_install_htmldocs --package=$(notdir $@) --source-dir="debian/tmp-inst-ghc"
+ dh_haskell_install_haddock --package=$(notdir $@) --source-dir="debian/tmp-inst-ghc"
dh_haskell_depends_haddock --package=$(notdir $@)
dh_haskell_recommends_documentation_references --package=$(notdir $@)
dh_haskell_suggests --package=$(notdir $@)
dh_haskell_blurbs --package=$(notdir $@) --type=doc
-install/libghcjs-$(CABAL_PACKAGE)-dev:: debian/tmp-inst-ghcjs
+install/libghcjs-$(CABAL_PACKAGE)-dev:: install-ghcjs-arch
dh_haskell_install_ghc_registration --package=$(notdir $@)
- dh_haskell_install_development_libs --package=$(notdir $@) --source-dir="$<"
+ dh_haskell_install_development_libs --package=$(notdir $@) --source-dir="debian/tmp-inst-ghcjs"
dh_haskell_provides_ghc --package=$(notdir $@)
dh_haskell_depends_cabal --package=$(notdir $@)
- dh_haskell_extra_depends_ghc --package=$(notdir $@)
+ dh_haskell_extra_depends_ghc --package=$(notdir $@) --type=dev
dh_haskell_shlibdeps --package=$(notdir $@)
dh_haskell_blurbs --package=$(notdir $@) --type=dev
-install/libghcjs-$(CABAL_PACKAGE)-prof:: debian/tmp-inst-ghcjs
- dh_haskell_install_profiling_libs --package=$(notdir $@) --source-dir="$<"
+install/libghcjs-$(CABAL_PACKAGE)-prof:: install-ghcjs-arch
+ dh_haskell_install_profiling_libs --package=$(notdir $@) --source-dir="debian/tmp-inst-ghcjs"
dh_haskell_provides_ghc --package=$(notdir $@) --config-shipper="libghcjs-$(CABAL_PACKAGE)-dev"
dh_haskell_depends_cabal --package=$(notdir $@) --config-shipper="libghc-$(CABAL_PACKAGE)-dev"
dh_haskell_blurbs --package=$(notdir $@) --type=prof
-install/libghcjs-$(CABAL_PACKAGE)-doc:: debian/tmp-inst-ghcjs
- dh_haskell_install_htmldocs --package=$(notdir $@) --source-dir="$<"
- dh_haskell_install_haddock --package=$(notdir $@) --source-dir="$<"
+install/libghcjs-$(CABAL_PACKAGE)-doc:: install-ghcjs-indep
+ dh_haskell_install_htmldocs --package=$(notdir $@) --source-dir="debian/tmp-inst-ghcjs"
+ dh_haskell_install_haddock --package=$(notdir $@) --source-dir="debian/tmp-inst-ghcjs"
dh_haskell_depends_haddock --package=$(notdir $@)
dh_haskell_recommends_documentation_references --package=$(notdir $@)
dh_haskell_suggests --package=$(notdir $@)
View it on GitLab: https://salsa.debian.org/haskell-team/haskell-devscripts/-/compare/da4d004452f061a687d7ddbdf2e6675347bbc1f9...87af94d45d5a9398576a005e7a0d18f1c066b57b
--
View it on GitLab: https://salsa.debian.org/haskell-team/haskell-devscripts/-/compare/da4d004452f061a687d7ddbdf2e6675347bbc1f9...87af94d45d5a9398576a005e7a0d18f1c066b57b
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/20220906/bfda1026/attachment-0001.htm>
More information about the Pkg-haskell-commits
mailing list