[Git][haskell-team/DHG_packages][hadrian] 3 commits: ghc: New upstream release (9.4.7)
Ilias Tsitsimpis (@iliastsi)
gitlab at salsa.debian.org
Sun Sep 24 16:37:53 BST 2023
Ilias Tsitsimpis pushed to branch hadrian at Debian Haskell Group / DHG_packages
Commits:
b9b2a1d5 by Ilias Tsitsimpis at 2023-09-23T17:16:48+03:00
ghc: New upstream release (9.4.7)
- - - - -
ccdef147 by Ilias Tsitsimpis at 2023-09-24T15:35:47+03:00
ghc: Add Hadrian bootstrapping plans for GHC 9.4.7
- - - - -
cc3df95a by Ilias Tsitsimpis at 2023-09-24T15:36:03+03:00
ghc: Disable threaded RTS in hadrian
- - - - -
12 changed files:
- p/ghc/debian/changelog
- p/ghc/debian/control
- − p/ghc/debian/patches/fix-bytestring-9.4.6
- − p/ghc/debian/patches/fix-index-html-removal
- − p/ghc/debian/patches/ghc-warnings.mk-CC-Wall.patch
- + p/ghc/debian/patches/hadrian-disable-threaded
- p/ghc/debian/patches/hadrian-plans
- − p/ghc/debian/patches/separate-docs
- p/ghc/debian/patches/series
- + p/ghc/debian/patches/sparc-support
- − p/ghc/debian/patches/use-debian-gen_contents_index
- − p/ghc/debian/patches/use-stage1-binaries-for-install.patch
Changes:
=====================================
p/ghc/debian/changelog
=====================================
@@ -1,6 +1,11 @@
-ghc (9.4.6-2) UNRELEASED; urgency=medium
+ghc (9.4.7-1~exp1) UNRELEASED; urgency=medium
+ * New upstream release
* Declare compliance with Debian policy 4.6.2
+ * Use the Hadrian build system (Closes: #1051493)
+ * Pass '-optcggc-min-expand=10' when building for hppa (Closes: #1050879)
+ * Add patch to restore minimal build support for sparc and
+ sparc64 (Closes: #1052142)
-- Ilias Tsitsimpis <iliastsi at debian.org> Sun, 27 Aug 2023 12:33:23 +0300
=====================================
p/ghc/debian/control
=====================================
@@ -14,6 +14,7 @@ Build-Depends:
pkg-config,
ghc:native (>= 9.0),
hadrian:native (>= 9.4) <!pkg.ghc.nohadrian>,
+ hadrian:native (<< 9.5) <!pkg.ghc.nohadrian>,
llvm-15 [armel armhf],
libgmp-dev,
libffi-dev,
=====================================
p/ghc/debian/patches/fix-bytestring-9.4.6 deleted
=====================================
@@ -1,28 +0,0 @@
-From 2bdeb7b0e7dd100fce9e1f4d1ecf1cd6b5b9702c Mon Sep 17 00:00:00 2001
-From: Matthew Craven <clyring at gmail.com>
-Date: Tue, 8 Aug 2023 14:25:03 -0400
-Subject: [PATCH] Use a more specific include than Rts.h (#607)
-
-The Rts.h include seems to cause build problems.
-See also:
- https://gitlab.haskell.org/ghc/ghc/-/issues/23789
- https://github.com/haskell/bytestring/issues/606
-
-(cherry picked from commit e8a9b522063a203424eac3357873e4a8f2a09965)
----
- cbits/is-valid-utf8.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-Index: b/libraries/bytestring/cbits/is-valid-utf8.c
-===================================================================
---- a/libraries/bytestring/cbits/is-valid-utf8.c
-+++ b/libraries/bytestring/cbits/is-valid-utf8.c
-@@ -50,7 +50,7 @@ SUCH DAMAGE.
- #endif
-
- #include <MachDeps.h>
--#include "Rts.h"
-+#include "ghcplatform.h"
-
- #ifdef WORDS_BIGENDIAN
- #define to_little_endian(x) __builtin_bswap64(x)
=====================================
p/ghc/debian/patches/fix-index-html-removal deleted
=====================================
@@ -1,18 +0,0 @@
-Description: Do not remove docs/index.html
- Commit 9ddda31cd3a208411c642d8c081207718782f80c changed ./configure
- which now doesn't generate the docs/index.html file, but forgot to
- modify the 'distclean' rule to not remove this file.
-Author: Ilias Tsitsimpis <iliastsi at debian.org>
-
-Index: b/ghc.mk
-===================================================================
---- a/ghc.mk
-+++ b/ghc.mk
-@@ -1460,7 +1460,6 @@ distclean : clean
- $(call removeFiles,docs/users_guide/ug-book.xml)
- $(call removeFiles,docs/users_guide/ug-ent.xml)
- $(call removeFiles,docs/users_guide/ghc_config.py)
-- $(call removeFiles,docs/index.html)
- $(call removeFiles,libraries/prologue.txt)
- $(call removeFiles,distrib/configure.ac)
- $(call removeFiles,ch01.html ch02.html index.html)
=====================================
p/ghc/debian/patches/ghc-warnings.mk-CC-Wall.patch deleted
=====================================
@@ -1,12 +0,0 @@
---- ghc-8.4.3/mk/warnings.mk~ 2018-02-04 02:30:11.000000000 +0900
-+++ ghc-8.4.3/mk/warnings.mk 2018-09-29 14:33:37.607884921 +0900
-@@ -1,6 +1,6 @@
- # See Note [Order of warning flags].
--SRC_CC_OPTS += -Wall $(WERROR)
-+#SRC_CC_OPTS += -Wall $(WERROR)
- SRC_HC_OPTS += -Wall
- # Don't add -Werror to SRC_HC_OPTS_STAGE0 (or SRC_HC_OPTS), because otherwise
- # validate may unnecessarily fail when booting with an older compiler.
- # It would be better to only exclude certain warnings from becoming errors
-
-Diff finished. Sat Sep 29 14:35:43 2018
=====================================
p/ghc/debian/patches/hadrian-disable-threaded
=====================================
@@ -0,0 +1,28 @@
+Index: b/hadrian/hadrian.cabal
+===================================================================
+--- a/hadrian/hadrian.cabal
++++ b/hadrian/hadrian.cabal
+@@ -18,7 +18,7 @@ source-repository head
+ -- To accommodate #16873
+ flag threaded
+ manual: True
+- default: True
++ default: False
+ description: Build with the threaded runtime for improved
+ performance. Users with bootstrap compilers
+ which don't support the threaded runtime should
+@@ -167,14 +167,6 @@ executable hadrian
+ -rtsopts
+ -fno-ignore-asserts
+
+- if flag(threaded)
+- ghc-options:
+- -- * -I0: Disable idle GC to avoid redundant GCs while
+- -- waiting for external processes
+- -- * -qg: Don't use parallel GC as the synchronization
+- -- time tends to eat any benefit.
+- "-with-rtsopts=-I0 -qg"
+- -threaded
+
+ if flag(selftest)
+ other-modules: Rules.Selftest
=====================================
p/ghc/debian/patches/hadrian-plans
=====================================
@@ -18,3 +18,17 @@ Index: b/hadrian/bootstrap/plan-bootstrap-9_4_6.json
@@ -0,0 +1 @@
+{"builtin":[{"package":"rts","version":"1.0.2"},{"package":"ghc-prim","version":"0.9.1"},{"package":"ghc-bignum","version":"1.3"},{"package":"base","version":"4.17.2.0"},{"package":"array","version":"0.5.4.0"},{"package":"deepseq","version":"1.4.8.0"},{"package":"ghc-boot-th","version":"9.4.6"},{"package":"pretty","version":"1.1.3.6"},{"package":"template-haskell","version":"2.19.0.0"},{"package":"bytestring","version":"0.11.5.1"},{"package":"containers","version":"0.6.7"},{"package":"binary","version":"0.8.9.1"},{"package":"filepath","version":"1.4.2.2"},{"package":"time","version":"1.12.2"},{"package":"unix","version":"2.7.3"},{"package":"directory","version":"1.3.7.1"},{"package":"transformers","version":"0.5.6.2"},{"package":"mtl","version":"2.2.2"},{"package":"text","version":"2.0.2"},{"package":"parsec","version":"3.1.16.1"},{"package":"process","version":"1.6.17.0"}],"dependencies":[{"cabal_sha256":"ff97c442b0c679c1c9876acd15f73ac4f602b973c45bde42b43ec28265ee48f4","flags":["-bundled-binary-generic"],"package":"Cabal","revision":0,"source":"hackage","src_sha256":"2fa1fe88d4a8e8ffbeb45baed5526b1267a2130026c846251ac95c656364ab77","version":"3.6.3.0"},{"cabal_sha256":"db25c2e17967aa6b6046ab8b1b96ba3f344ca59a62b60fb6113d51ea305a3d8e","flags":["-optimised-mixer"],"package":"splitmix","revision":2,"source":"hackage","src_sha256":"6d065402394e7a9117093dbb4530a21342c9b1e2ec509516c8a8d0ffed98ecaa","version":"0.1.0.4"},{"cabal_sha256":"dea1f11e5569332dc6c8efaad1cb301016a5587b6754943a49f9de08ae0e56d9","flags":[],"package":"random","revision":0,"source":"hackage","src_sha256":"3e1272f7ed6a4d7bd1712b90143ec326fee9b225789222379fea20a9c90c9b76","version":"1.2.1.1"},{"cabal_sha256":"4ce29211223d5e6620ebceba34a3ca9ccf1c10c0cf387d48aea45599222ee5aa","flags":["-old-random","+templatehaskell"],"package":"QuickCheck","revision":0,"source":"hackage","src_sha256":"d87b6c85696b601175274361fa62217894401e401e150c3c5d4013ac53cd36f3","version":"2.14.2"},{"cabal_sha256":"a692159828c2cd278eaec317b3a7e9fb6d7b787c8a19f086004d15d9fa1fd72c","flags":["-llvm"],"package":"clock","revision":0,"source":"hackage","src_sha256":"845ce5db4c98cefd517323e005f87effceff886987305e421c4ef616dc0505d1","version":"0.8.3"},{"cabal_sha256":"3ac58d7341976173d1052e7b2837d119212d9afcf911735667c7f1ab67aec25f","flags":[],"package":"extra","revision":0,"source":"hackage","src_sha256":"e571a9ec1d8865f0fbb0e0ba1eb575f783b0365c80db19b54a93600bae43b03c","version":"1.7.12"},{"cabal_sha256":"372c1733d83b90045eb29da9f010fed79bfef8771ce65eb126a1d83ecc54a9a2","flags":[],"package":"filepattern","revision":0,"source":"hackage","src_sha256":"cc445d439ea2f65cac7604d3578aa2c3a62e5a91dc989f4ce5b3390db9e59636","version":"0.1.3"},{"cabal_sha256":"50b2f002c68fe67730ee7a3cd8607486197dd99b084255005ad51ecd6970a41b","flags":["+containers","+integer-gmp","-random-initial-seed"],"package":"hashable","revision":0,"source":"hackage","src_sha256":"e1b305c280e66ad827edeaedd6933b9fc4174f626882877eab2a08344e665e87","version":"1.4.1.0"},{"cabal_sha256":"66b19fcd813b0e4db3e0bac541bd46606c3b13d3d081d9f9666f4be0f5ff14b8","flags":[],"package":"heaps","revision":0,"source":"hackage","src_sha256":"89329df8b95ae99ef272e41e7a2d0fe2f1bb7eacfcc34bc01664414b33067cfd","version":"0.4"},{"cabal_sha256":"f75cb4fa53c88c65794becdd48eb0d3b2b8abd89a3d5c19e87af91f5225c15e4","flags":[],"package":"js-dgtable","revision":0,"source":"hackage","src_sha256":"e28dd65bee8083b17210134e22e01c6349dc33c3b7bd17705973cd014e9f20ac","version":"0.5.2"},{"cabal_sha256":"4c1c447a9a2fba0adba6d30678302a30c32b9dfde9e7aa9e9156483e1545096d","flags":[],"package":"js-flot","revision":0,"source":"hackage","src_sha256":"1ba2f2a6b8d85da76c41f526c98903cbb107f8642e506c072c1e7e3c20fe5e7a","version":"0.8.3"},{"cabal_sha256":"59ab6c79159549ef94b584abce8e6d3b336014c2cce1337b59a8f637e2856df5","flags":[],"package":"js-jquery","revision":0,"source":"hackage","src_sha256":"e0e0681f0da1130ede4e03a051630ea439c458cb97216cdb01771ebdbe44069b","version":"3.3.1"},{"cabal_sha256":"c2f0ed97b3dce97f2f43b239c3be8b136e4368f1eb7b61322ee9ac98f604622b","flags":[],"package":"primitive","revision":1,"source":"hackage","src_sha256":"5b2d6dc2812eb2f6a115f05fcbe3e723d3aeff7894b012c617e075130581add5","version":"0.7.4.0"},{"cabal_sha256":"9ad8972c2e913c37b1d4f0e1261517fd7a1b8c8a58077e057be69837e3dbaa00","flags":["-debug"],"package":"unordered-containers","revision":2,"source":"hackage","src_sha256":"1b27bec5e0d522b27a6029ebf4c4a6d40acbc083c787008e32fb55c4b1d128d2","version":"0.2.19.1"},{"cabal_sha256":"79416292186feeaf1f60e49ac5a1ffae9bf1b120e040a74bf0e81ca7f1d31d3f","flags":[],"package":"utf8-string","revision":0,"source":"hackage","src_sha256":"ee48deada7600370728c4156cb002441de770d0121ae33a68139a9ed9c19b09a","version":"1.0.2"},{"cabal_sha256":"3cb5814cce210b9756fa9246ff1b2a1e1b86be46fdc4c5e2baacdc5bf83ce5c3","flags":["-cloud","-embed-files","-portable"],"package":"shake","revision":1,"source":"hackage","src_sha256":"352a56af12f70b50d564dcb61131555577281957ee196f1702a3723c0a3699d1","version":"0.19.7"},{"cabal_sha256":null,"flags":["+selftest","+threaded"],"package":"hadrian","revision":null,"source":"local","src_sha256":null,"version":"0.1.0.0"}]}
\ No newline at end of file
+Index: b/hadrian/bootstrap/plan-9_4_7.json
+===================================================================
+--- /dev/null
++++ b/hadrian/bootstrap/plan-9_4_7.json
+@@ -0,0 +1 @@
++{"cabal-version":"3.4.1.0","cabal-lib-version":"3.4.1.0","compiler-id":"ghc-9.4.7","os":"linux","arch":"x86_64","install-plan":[{"type":"pre-existing","id":"Cabal-3.8.1.0","pkg-name":"Cabal","pkg-version":"3.8.1.0","depends":["Cabal-syntax-3.8.1.0","array-0.5.4.0","base-4.17.2.0","bytestring-0.11.5.2","containers-0.6.7","deepseq-1.4.8.0","directory-1.3.7.1","filepath-1.4.2.2","mtl-2.2.2","parsec-3.1.16.1","pretty-1.1.3.6","process-1.6.17.0","text-2.0.2","time-1.12.2","transformers-0.5.6.2","unix-2.7.3"]},{"type":"pre-existing","id":"Cabal-syntax-3.8.1.0","pkg-name":"Cabal-syntax","pkg-version":"3.8.1.0","depends":["array-0.5.4.0","base-4.17.2.0","binary-0.8.9.1","bytestring-0.11.5.2","containers-0.6.7","deepseq-1.4.8.0","directory-1.3.7.1","filepath-1.4.2.2","mtl-2.2.2","parsec-3.1.16.1","pretty-1.1.3.6","text-2.0.2","time-1.12.2","transformers-0.5.6.2","unix-2.7.3"]},{"type":"configured","id":"QuickCheck-2.14.2-2c61a471e54e8db3e854373ee6ce25d6617b5d3aea54773093a75ea5673a6a3d","pkg-name":"QuickCheck","pkg-version":"2.14.2","flags":{"old-random":false,"templatehaskell":true},"style":"global","pkg-src":{"type":"repo-tar","repo":{"type":"secure-repo","uri":"http://hackage.haskell.org/"}},"pkg-cabal-sha256":"4ce29211223d5e6620ebceba34a3ca9ccf1c10c0cf387d48aea45599222ee5aa","pkg-src-sha256":"d87b6c85696b601175274361fa62217894401e401e150c3c5d4013ac53cd36f3","depends":["base-4.17.2.0","containers-0.6.7","deepseq-1.4.8.0","random-1.2.1.1-133900be89374336b8ef3d0d416d09cc1f8d0db494e6d253066d8b628ffa2c90","splitmix-0.1.0.4-c9bdc990d84f70c85edf41640dfcb7a846636c0902cf0042545d76a4b66ef88d","template-haskell-2.19.0.0","transformers-0.5.6.2"],"exe-depends":[],"component-name":"lib"},{"type":"pre-existing","id":"array-0.5.4.0","pkg-name":"array","pkg-version":"0.5.4.0","depends":["base-4.17.2.0"]},{"type":"pre-existing","id":"base-4.17.2.0","pkg-name":"base","pkg-version":"4.17.2.0","depends":["ghc-bignum-1.3","ghc-prim-0.9.1","rts-1.0.2"]},{"type":"pre-existing","id":"binary-0.8.9.1","pkg-name":"binary","pkg-version":"0.8.9.1","depends":["array-0.5.4.0","base-4.17.2.0","bytestring-0.11.5.2","containers-0.6.7"]},{"type":"pre-existing","id":"bytestring-0.11.5.2","pkg-name":"bytestring","pkg-version":"0.11.5.2","depends":["base-4.17.2.0","deepseq-1.4.8.0","ghc-prim-0.9.1","template-haskell-2.19.0.0"]},{"type":"configured","id":"clock-0.8.3-60680da922574f4dcc2cb81381cef985fd703365e4dd6815dcdfb1c9ea0a5173","pkg-name":"clock","pkg-version":"0.8.3","flags":{"llvm":false},"style":"global","pkg-src":{"type":"repo-tar","repo":{"type":"secure-repo","uri":"http://hackage.haskell.org/"}},"pkg-cabal-sha256":"a692159828c2cd278eaec317b3a7e9fb6d7b787c8a19f086004d15d9fa1fd72c","pkg-src-sha256":"845ce5db4c98cefd517323e005f87effceff886987305e421c4ef616dc0505d1","depends":["base-4.17.2.0"],"exe-depends":[],"component-name":"lib"},{"type":"pre-existing","id":"containers-0.6.7","pkg-name":"containers","pkg-version":"0.6.7","depends":["array-0.5.4.0","base-4.17.2.0","deepseq-1.4.8.0","template-haskell-2.19.0.0"]},{"type":"pre-existing","id":"deepseq-1.4.8.0","pkg-name":"deepseq","pkg-version":"1.4.8.0","depends":["array-0.5.4.0","base-4.17.2.0","ghc-prim-0.9.1"]},{"type":"pre-existing","id":"directory-1.3.7.1","pkg-name":"directory","pkg-version":"1.3.7.1","depends":["base-4.17.2.0","filepath-1.4.2.2","time-1.12.2","unix-2.7.3"]},{"type":"configured","id":"extra-1.7.12-29a3609566f3846fb68ff3c4e447f6e5305dbdffb532dcd11a61ce8302bdb76d","pkg-name":"extra","pkg-version":"1.7.12","flags":{},"style":"global","pkg-src":{"type":"repo-tar","repo":{"type":"secure-repo","uri":"http://hackage.haskell.org/"}},"pkg-cabal-sha256":"3ac58d7341976173d1052e7b2837d119212d9afcf911735667c7f1ab67aec25f","pkg-src-sha256":"e571a9ec1d8865f0fbb0e0ba1eb575f783b0365c80db19b54a93600bae43b03c","depends":["base-4.17.2.0","clock-0.8.3-60680da922574f4dcc2cb81381cef985fd703365e4dd6815dcdfb1c9ea0a5173","directory-1.3.7.1","filepath-1.4.2.2","process-1.6.17.0","time-1.12.2","unix-2.7.3"],"exe-depends":[],"component-name":"lib"},{"type":"pre-existing","id":"filepath-1.4.2.2","pkg-name":"filepath","pkg-version":"1.4.2.2","depends":["base-4.17.2.0"]},{"type":"configured","id":"filepattern-0.1.3-ec2af416cdbcc708bf283cc354256aa16116517da64efbc13da67e5cf8934991","pkg-name":"filepattern","pkg-version":"0.1.3","flags":{},"style":"global","pkg-src":{"type":"repo-tar","repo":{"type":"secure-repo","uri":"http://hackage.haskell.org/"}},"pkg-cabal-sha256":"372c1733d83b90045eb29da9f010fed79bfef8771ce65eb126a1d83ecc54a9a2","pkg-src-sha256":"cc445d439ea2f65cac7604d3578aa2c3a62e5a91dc989f4ce5b3390db9e59636","depends":["base-4.17.2.0","directory-1.3.7.1","extra-1.7.12-29a3609566f3846fb68ff3c4e447f6e5305dbdffb532dcd11a61ce8302bdb76d","filepath-1.4.2.2"],"exe-depends":[],"component-name":"lib"},{"type":"pre-existing","id":"ghc-bignum-1.3","pkg-name":"ghc-bignum","pkg-version":"1.3","depends":["ghc-prim-0.9.1"]},{"type":"pre-existing","id":"ghc-boot-th-9.4.7","pkg-name":"ghc-boot-th","pkg-version":"9.4.7","depends":["base-4.17.2.0"]},{"type":"pre-existing","id":"ghc-prim-0.9.1","pkg-name":"ghc-prim","pkg-version":"0.9.1","depends":["rts-1.0.2"]},{"type":"configured","id":"hadrian-0.1.0.0-inplace-hadrian","pkg-name":"hadrian","pkg-version":"0.1.0.0","flags":{"selftest":true,"threaded":true},"style":"local","pkg-src":{"type":"local","path":"/build/ghc-9.4.7/hadrian/."},"dist-dir":"/build/ghc-9.4.7/hadrian/dist-newstyle/build/x86_64-linux/ghc-9.4.7/hadrian-0.1.0.0/x/hadrian","depends":["Cabal-3.8.1.0","QuickCheck-2.14.2-2c61a471e54e8db3e854373ee6ce25d6617b5d3aea54773093a75ea5673a6a3d","base-4.17.2.0","bytestring-0.11.5.2","containers-0.6.7","directory-1.3.7.1","extra-1.7.12-29a3609566f3846fb68ff3c4e447f6e5305dbdffb532dcd11a61ce8302bdb76d","filepath-1.4.2.2","mtl-2.2.2","parsec-3.1.16.1","shake-0.19.7-606795c3537efa6a043c6eab8fc06ef2a0f357406a3d612ae27318bf2ad51f3b","text-2.0.2","transformers-0.5.6.2","unordered-containers-0.2.19.1-6cd6b29e7b2b508810255877ba7ad5157aa89b8c4afaa42c0d48f65dcc6c622c"],"exe-depends":[],"component-name":"exe:hadrian","bin-file":"/build/ghc-9.4.7/hadrian/dist-newstyle/build/x86_64-linux/ghc-9.4.7/hadrian-0.1.0.0/x/hadrian/build/hadrian/hadrian"},{"type":"configured","id":"hashable-1.4.1.0-e1a0a62b24990d9b67068e289933c09acf3bab75fa165ef2a2e7fd1c68b53368","pkg-name":"hashable","pkg-version":"1.4.1.0","flags":{"containers":true,"integer-gmp":true,"random-initial-seed":false},"style":"global","pkg-src":{"type":"repo-tar","repo":{"type":"secure-repo","uri":"http://hackage.haskell.org/"}},"pkg-cabal-sha256":"50b2f002c68fe67730ee7a3cd8607486197dd99b084255005ad51ecd6970a41b","pkg-src-sha256":"e1b305c280e66ad827edeaedd6933b9fc4174f626882877eab2a08344e665e87","depends":["base-4.17.2.0","bytestring-0.11.5.2","containers-0.6.7","deepseq-1.4.8.0","ghc-bignum-1.3","ghc-prim-0.9.1","text-2.0.2"],"exe-depends":[],"component-name":"lib"},{"type":"configured","id":"heaps-0.4-9a77df4e3db3d50a3637137af4f3f2c10095c04ac23988b3e9c72116053f5c6b","pkg-name":"heaps","pkg-version":"0.4","flags":{},"style":"global","pkg-src":{"type":"repo-tar","repo":{"type":"secure-repo","uri":"http://hackage.haskell.org/"}},"pkg-cabal-sha256":"66b19fcd813b0e4db3e0bac541bd46606c3b13d3d081d9f9666f4be0f5ff14b8","pkg-src-sha256":"89329df8b95ae99ef272e41e7a2d0fe2f1bb7eacfcc34bc01664414b33067cfd","depends":["base-4.17.2.0"],"exe-depends":[],"component-name":"lib"},{"type":"configured","id":"js-dgtable-0.5.2-094ee8872eb10913dc0a4350523def131afcebe1cf1a50cc5c29f687abc622c9","pkg-name":"js-dgtable","pkg-version":"0.5.2","flags":{},"style":"global","pkg-src":{"type":"repo-tar","repo":{"type":"secure-repo","uri":"http://hackage.haskell.org/"}},"pkg-cabal-sha256":"f75cb4fa53c88c65794becdd48eb0d3b2b8abd89a3d5c19e87af91f5225c15e4","pkg-src-sha256":"e28dd65bee8083b17210134e22e01c6349dc33c3b7bd17705973cd014e9f20ac","depends":["base-4.17.2.0"],"exe-depends":[],"component-name":"lib"},{"type":"configured","id":"js-flot-0.8.3-fbfb60e628ed902edbd1d03606b546b320963590fbaf653dbe7b3df0086c4c2c","pkg-name":"js-flot","pkg-version":"0.8.3","flags":{},"style":"global","pkg-src":{"type":"repo-tar","repo":{"type":"secure-repo","uri":"http://hackage.haskell.org/"}},"pkg-cabal-sha256":"4c1c447a9a2fba0adba6d30678302a30c32b9dfde9e7aa9e9156483e1545096d","pkg-src-sha256":"1ba2f2a6b8d85da76c41f526c98903cbb107f8642e506c072c1e7e3c20fe5e7a","depends":["base-4.17.2.0"],"exe-depends":[],"component-name":"lib"},{"type":"configured","id":"js-jquery-3.3.1-0dd26cbd63adfa57d02a6ab830dac2a6776b4c32af37950f31f0810ef850e5ab","pkg-name":"js-jquery","pkg-version":"3.3.1","flags":{},"style":"global","pkg-src":{"type":"repo-tar","repo":{"type":"secure-repo","uri":"http://hackage.haskell.org/"}},"pkg-cabal-sha256":"59ab6c79159549ef94b584abce8e6d3b336014c2cce1337b59a8f637e2856df5","pkg-src-sha256":"e0e0681f0da1130ede4e03a051630ea439c458cb97216cdb01771ebdbe44069b","depends":["base-4.17.2.0"],"exe-depends":[],"component-name":"lib"},{"type":"pre-existing","id":"mtl-2.2.2","pkg-name":"mtl","pkg-version":"2.2.2","depends":["base-4.17.2.0","transformers-0.5.6.2"]},{"type":"pre-existing","id":"parsec-3.1.16.1","pkg-name":"parsec","pkg-version":"3.1.16.1","depends":["base-4.17.2.0","bytestring-0.11.5.2","mtl-2.2.2","text-2.0.2"]},{"type":"pre-existing","id":"pretty-1.1.3.6","pkg-name":"pretty","pkg-version":"1.1.3.6","depends":["base-4.17.2.0","deepseq-1.4.8.0","ghc-prim-0.9.1"]},{"type":"configured","id":"primitive-0.7.4.0-1bfcae07bbe7a4c30cf0212d7cff521f3f15d455031c5e55a5f87a2712756619","pkg-name":"primitive","pkg-version":"0.7.4.0","flags":{},"style":"global","pkg-src":{"type":"repo-tar","repo":{"type":"secure-repo","uri":"http://hackage.haskell.org/"}},"pkg-cabal-sha256":"89b88a3e08493b7727fa4089b0692bfbdf7e1e666ef54635f458644eb8358764","pkg-src-sha256":"5b2d6dc2812eb2f6a115f05fcbe3e723d3aeff7894b012c617e075130581add5","depends":["base-4.17.2.0","deepseq-1.4.8.0","template-haskell-2.19.0.0","transformers-0.5.6.2"],"exe-depends":[],"component-name":"lib"},{"type":"pre-existing","id":"process-1.6.17.0","pkg-name":"process","pkg-version":"1.6.17.0","depends":["base-4.17.2.0","deepseq-1.4.8.0","directory-1.3.7.1","filepath-1.4.2.2","unix-2.7.3"]},{"type":"configured","id":"random-1.2.1.1-133900be89374336b8ef3d0d416d09cc1f8d0db494e6d253066d8b628ffa2c90","pkg-name":"random","pkg-version":"1.2.1.1","flags":{},"style":"global","pkg-src":{"type":"repo-tar","repo":{"type":"secure-repo","uri":"http://hackage.haskell.org/"}},"pkg-cabal-sha256":"dea1f11e5569332dc6c8efaad1cb301016a5587b6754943a49f9de08ae0e56d9","pkg-src-sha256":"3e1272f7ed6a4d7bd1712b90143ec326fee9b225789222379fea20a9c90c9b76","depends":["base-4.17.2.0","bytestring-0.11.5.2","deepseq-1.4.8.0","mtl-2.2.2","splitmix-0.1.0.4-c9bdc990d84f70c85edf41640dfcb7a846636c0902cf0042545d76a4b66ef88d"],"exe-depends":[],"component-name":"lib"},{"type":"pre-existing","id":"rts-1.0.2","pkg-name":"rts","pkg-version":"1.0.2","depends":[]},{"type":"configured","id":"shake-0.19.7-606795c3537efa6a043c6eab8fc06ef2a0f357406a3d612ae27318bf2ad51f3b","pkg-name":"shake","pkg-version":"0.19.7","flags":{"cloud":false,"embed-files":false,"portable":false},"style":"global","pkg-src":{"type":"repo-tar","repo":{"type":"secure-repo","uri":"http://hackage.haskell.org/"}},"pkg-cabal-sha256":"4a0bf8b7d3b44448a0c0c506374b7388f65e88b17c10400def1ba06e37b2dc00","pkg-src-sha256":"352a56af12f70b50d564dcb61131555577281957ee196f1702a3723c0a3699d1","depends":["base-4.17.2.0","binary-0.8.9.1","bytestring-0.11.5.2","deepseq-1.4.8.0","directory-1.3.7.1","extra-1.7.12-29a3609566f3846fb68ff3c4e447f6e5305dbdffb532dcd11a61ce8302bdb76d","filepath-1.4.2.2","filepattern-0.1.3-ec2af416cdbcc708bf283cc354256aa16116517da64efbc13da67e5cf8934991","hashable-1.4.1.0-e1a0a62b24990d9b67068e289933c09acf3bab75fa165ef2a2e7fd1c68b53368","heaps-0.4-9a77df4e3db3d50a3637137af4f3f2c10095c04ac23988b3e9c72116053f5c6b","js-dgtable-0.5.2-094ee8872eb10913dc0a4350523def131afcebe1cf1a50cc5c29f687abc622c9","js-flot-0.8.3-fbfb60e628ed902edbd1d03606b546b320963590fbaf653dbe7b3df0086c4c2c","js-jquery-3.3.1-0dd26cbd63adfa57d02a6ab830dac2a6776b4c32af37950f31f0810ef850e5ab","primitive-0.7.4.0-1bfcae07bbe7a4c30cf0212d7cff521f3f15d455031c5e55a5f87a2712756619","process-1.6.17.0","random-1.2.1.1-133900be89374336b8ef3d0d416d09cc1f8d0db494e6d253066d8b628ffa2c90","time-1.12.2","transformers-0.5.6.2","unix-2.7.3","unordered-containers-0.2.19.1-6cd6b29e7b2b508810255877ba7ad5157aa89b8c4afaa42c0d48f65dcc6c622c","utf8-string-1.0.2-345983e5c7a6c6cf03fc29fd6e582ef4fae34f87a1835d6facaefcb954a9cb22"],"exe-depends":[],"component-name":"lib"},{"type":"configured","id":"shake-0.19.7-e-shake-37919e6f6dea6a5cad2e8153414902e084fc9388aa18562ca1c7dc395c35fbff","pkg-name":"shake","pkg-version":"0.19.7","flags":{"cloud":false,"embed-files":false,"portable":false},"style":"global","pkg-src":{"type":"repo-tar","repo":{"type":"secure-repo","uri":"http://hackage.haskell.org/"}},"pkg-cabal-sha256":"4a0bf8b7d3b44448a0c0c506374b7388f65e88b17c10400def1ba06e37b2dc00","pkg-src-sha256":"352a56af12f70b50d564dcb61131555577281957ee196f1702a3723c0a3699d1","depends":["base-4.17.2.0","binary-0.8.9.1","bytestring-0.11.5.2","deepseq-1.4.8.0","directory-1.3.7.1","extra-1.7.12-29a3609566f3846fb68ff3c4e447f6e5305dbdffb532dcd11a61ce8302bdb76d","filepath-1.4.2.2","filepattern-0.1.3-ec2af416cdbcc708bf283cc354256aa16116517da64efbc13da67e5cf8934991","hashable-1.4.1.0-e1a0a62b24990d9b67068e289933c09acf3bab75fa165ef2a2e7fd1c68b53368","heaps-0.4-9a77df4e3db3d50a3637137af4f3f2c10095c04ac23988b3e9c72116053f5c6b","js-dgtable-0.5.2-094ee8872eb10913dc0a4350523def131afcebe1cf1a50cc5c29f687abc622c9","js-flot-0.8.3-fbfb60e628ed902edbd1d03606b546b320963590fbaf653dbe7b3df0086c4c2c","js-jquery-3.3.1-0dd26cbd63adfa57d02a6ab830dac2a6776b4c32af37950f31f0810ef850e5ab","primitive-0.7.4.0-1bfcae07bbe7a4c30cf0212d7cff521f3f15d455031c5e55a5f87a2712756619","process-1.6.17.0","random-1.2.1.1-133900be89374336b8ef3d0d416d09cc1f8d0db494e6d253066d8b628ffa2c90","time-1.12.2","transformers-0.5.6.2","unix-2.7.3","unordered-containers-0.2.19.1-6cd6b29e7b2b508810255877ba7ad5157aa89b8c4afaa42c0d48f65dcc6c622c","utf8-string-1.0.2-345983e5c7a6c6cf03fc29fd6e582ef4fae34f87a1835d6facaefcb954a9cb22"],"exe-depends":[],"component-name":"exe:shake","bin-file":"/home/iliastsi/.cabal/store/ghc-9.4.7/shake-0.19.7-e-shake-37919e6f6dea6a5cad2e8153414902e084fc9388aa18562ca1c7dc395c35fbff/bin/shake"},{"type":"configured","id":"splitmix-0.1.0.4-c9bdc990d84f70c85edf41640dfcb7a846636c0902cf0042545d76a4b66ef88d","pkg-name":"splitmix","pkg-version":"0.1.0.4","flags":{"optimised-mixer":false},"style":"global","pkg-src":{"type":"repo-tar","repo":{"type":"secure-repo","uri":"http://hackage.haskell.org/"}},"pkg-cabal-sha256":"804e2574bc7e32d08cbab91e47ee6287b4df7d50851d73f9e778f94a9a7814c7","pkg-src-sha256":"6d065402394e7a9117093dbb4530a21342c9b1e2ec509516c8a8d0ffed98ecaa","depends":["base-4.17.2.0","deepseq-1.4.8.0"],"exe-depends":[],"component-name":"lib"},{"type":"pre-existing","id":"template-haskell-2.19.0.0","pkg-name":"template-haskell","pkg-version":"2.19.0.0","depends":["base-4.17.2.0","ghc-boot-th-9.4.7","ghc-prim-0.9.1","pretty-1.1.3.6"]},{"type":"pre-existing","id":"text-2.0.2","pkg-name":"text","pkg-version":"2.0.2","depends":["array-0.5.4.0","base-4.17.2.0","binary-0.8.9.1","bytestring-0.11.5.2","deepseq-1.4.8.0","ghc-prim-0.9.1","template-haskell-2.19.0.0"]},{"type":"pre-existing","id":"time-1.12.2","pkg-name":"time","pkg-version":"1.12.2","depends":["base-4.17.2.0","deepseq-1.4.8.0"]},{"type":"pre-existing","id":"transformers-0.5.6.2","pkg-name":"transformers","pkg-version":"0.5.6.2","depends":["base-4.17.2.0"]},{"type":"pre-existing","id":"unix-2.7.3","pkg-name":"unix","pkg-version":"2.7.3","depends":["base-4.17.2.0","bytestring-0.11.5.2","time-1.12.2"]},{"type":"configured","id":"unordered-containers-0.2.19.1-6cd6b29e7b2b508810255877ba7ad5157aa89b8c4afaa42c0d48f65dcc6c622c","pkg-name":"unordered-containers","pkg-version":"0.2.19.1","flags":{"debug":false},"style":"global","pkg-src":{"type":"repo-tar","repo":{"type":"secure-repo","uri":"http://hackage.haskell.org/"}},"pkg-cabal-sha256":"db11042bb0356c0adea277d0794743829125b4c99455af6af2bd5f7bd5e88a39","pkg-src-sha256":"1b27bec5e0d522b27a6029ebf4c4a6d40acbc083c787008e32fb55c4b1d128d2","depends":["base-4.17.2.0","deepseq-1.4.8.0","hashable-1.4.1.0-e1a0a62b24990d9b67068e289933c09acf3bab75fa165ef2a2e7fd1c68b53368","template-haskell-2.19.0.0"],"exe-depends":[],"component-name":"lib"},{"type":"configured","id":"utf8-string-1.0.2-345983e5c7a6c6cf03fc29fd6e582ef4fae34f87a1835d6facaefcb954a9cb22","pkg-name":"utf8-string","pkg-version":"1.0.2","flags":{},"style":"global","pkg-src":{"type":"repo-tar","repo":{"type":"secure-repo","uri":"http://hackage.haskell.org/"}},"pkg-cabal-sha256":"79416292186feeaf1f60e49ac5a1ffae9bf1b120e040a74bf0e81ca7f1d31d3f","pkg-src-sha256":"ee48deada7600370728c4156cb002441de770d0121ae33a68139a9ed9c19b09a","depends":["base-4.17.2.0","bytestring-0.11.5.2"],"exe-depends":[],"component-name":"lib"}]}
+\ No newline at end of file
+Index: b/hadrian/bootstrap/plan-bootstrap-9_4_7.json
+===================================================================
+--- /dev/null
++++ b/hadrian/bootstrap/plan-bootstrap-9_4_7.json
+@@ -0,0 +1 @@
++{"builtin":[{"package":"rts","version":"1.0.2"},{"package":"ghc-prim","version":"0.9.1"},{"package":"ghc-bignum","version":"1.3"},{"package":"base","version":"4.17.2.0"},{"package":"array","version":"0.5.4.0"},{"package":"deepseq","version":"1.4.8.0"},{"package":"ghc-boot-th","version":"9.4.7"},{"package":"pretty","version":"1.1.3.6"},{"package":"template-haskell","version":"2.19.0.0"},{"package":"bytestring","version":"0.11.5.2"},{"package":"containers","version":"0.6.7"},{"package":"binary","version":"0.8.9.1"},{"package":"filepath","version":"1.4.2.2"},{"package":"time","version":"1.12.2"},{"package":"unix","version":"2.7.3"},{"package":"directory","version":"1.3.7.1"},{"package":"transformers","version":"0.5.6.2"},{"package":"mtl","version":"2.2.2"},{"package":"text","version":"2.0.2"},{"package":"parsec","version":"3.1.16.1"},{"package":"Cabal-syntax","version":"3.8.1.0"},{"package":"process","version":"1.6.17.0"},{"package":"Cabal","version":"3.8.1.0"}],"dependencies":[{"cabal_sha256":"db25c2e17967aa6b6046ab8b1b96ba3f344ca59a62b60fb6113d51ea305a3d8e","flags":["-optimised-mixer"],"package":"splitmix","revision":2,"source":"hackage","src_sha256":"6d065402394e7a9117093dbb4530a21342c9b1e2ec509516c8a8d0ffed98ecaa","version":"0.1.0.4"},{"cabal_sha256":"dea1f11e5569332dc6c8efaad1cb301016a5587b6754943a49f9de08ae0e56d9","flags":[],"package":"random","revision":0,"source":"hackage","src_sha256":"3e1272f7ed6a4d7bd1712b90143ec326fee9b225789222379fea20a9c90c9b76","version":"1.2.1.1"},{"cabal_sha256":"4ce29211223d5e6620ebceba34a3ca9ccf1c10c0cf387d48aea45599222ee5aa","flags":["-old-random","+templatehaskell"],"package":"QuickCheck","revision":0,"source":"hackage","src_sha256":"d87b6c85696b601175274361fa62217894401e401e150c3c5d4013ac53cd36f3","version":"2.14.2"},{"cabal_sha256":"a692159828c2cd278eaec317b3a7e9fb6d7b787c8a19f086004d15d9fa1fd72c","flags":["-llvm"],"package":"clock","revision":0,"source":"hackage","src_sha256":"845ce5db4c98cefd517323e005f87effceff886987305e421c4ef616dc0505d1","version":"0.8.3"},{"cabal_sha256":"3ac58d7341976173d1052e7b2837d119212d9afcf911735667c7f1ab67aec25f","flags":[],"package":"extra","revision":0,"source":"hackage","src_sha256":"e571a9ec1d8865f0fbb0e0ba1eb575f783b0365c80db19b54a93600bae43b03c","version":"1.7.12"},{"cabal_sha256":"372c1733d83b90045eb29da9f010fed79bfef8771ce65eb126a1d83ecc54a9a2","flags":[],"package":"filepattern","revision":0,"source":"hackage","src_sha256":"cc445d439ea2f65cac7604d3578aa2c3a62e5a91dc989f4ce5b3390db9e59636","version":"0.1.3"},{"cabal_sha256":"50b2f002c68fe67730ee7a3cd8607486197dd99b084255005ad51ecd6970a41b","flags":["+containers","+integer-gmp","-random-initial-seed"],"package":"hashable","revision":0,"source":"hackage","src_sha256":"e1b305c280e66ad827edeaedd6933b9fc4174f626882877eab2a08344e665e87","version":"1.4.1.0"},{"cabal_sha256":"66b19fcd813b0e4db3e0bac541bd46606c3b13d3d081d9f9666f4be0f5ff14b8","flags":[],"package":"heaps","revision":0,"source":"hackage","src_sha256":"89329df8b95ae99ef272e41e7a2d0fe2f1bb7eacfcc34bc01664414b33067cfd","version":"0.4"},{"cabal_sha256":"f75cb4fa53c88c65794becdd48eb0d3b2b8abd89a3d5c19e87af91f5225c15e4","flags":[],"package":"js-dgtable","revision":0,"source":"hackage","src_sha256":"e28dd65bee8083b17210134e22e01c6349dc33c3b7bd17705973cd014e9f20ac","version":"0.5.2"},{"cabal_sha256":"4c1c447a9a2fba0adba6d30678302a30c32b9dfde9e7aa9e9156483e1545096d","flags":[],"package":"js-flot","revision":0,"source":"hackage","src_sha256":"1ba2f2a6b8d85da76c41f526c98903cbb107f8642e506c072c1e7e3c20fe5e7a","version":"0.8.3"},{"cabal_sha256":"59ab6c79159549ef94b584abce8e6d3b336014c2cce1337b59a8f637e2856df5","flags":[],"package":"js-jquery","revision":0,"source":"hackage","src_sha256":"e0e0681f0da1130ede4e03a051630ea439c458cb97216cdb01771ebdbe44069b","version":"3.3.1"},{"cabal_sha256":"c2f0ed97b3dce97f2f43b239c3be8b136e4368f1eb7b61322ee9ac98f604622b","flags":[],"package":"primitive","revision":1,"source":"hackage","src_sha256":"5b2d6dc2812eb2f6a115f05fcbe3e723d3aeff7894b012c617e075130581add5","version":"0.7.4.0"},{"cabal_sha256":"9ad8972c2e913c37b1d4f0e1261517fd7a1b8c8a58077e057be69837e3dbaa00","flags":["-debug"],"package":"unordered-containers","revision":2,"source":"hackage","src_sha256":"1b27bec5e0d522b27a6029ebf4c4a6d40acbc083c787008e32fb55c4b1d128d2","version":"0.2.19.1"},{"cabal_sha256":"79416292186feeaf1f60e49ac5a1ffae9bf1b120e040a74bf0e81ca7f1d31d3f","flags":[],"package":"utf8-string","revision":0,"source":"hackage","src_sha256":"ee48deada7600370728c4156cb002441de770d0121ae33a68139a9ed9c19b09a","version":"1.0.2"},{"cabal_sha256":"3cb5814cce210b9756fa9246ff1b2a1e1b86be46fdc4c5e2baacdc5bf83ce5c3","flags":["-cloud","-embed-files","-portable"],"package":"shake","revision":1,"source":"hackage","src_sha256":"352a56af12f70b50d564dcb61131555577281957ee196f1702a3723c0a3699d1","version":"0.19.7"},{"cabal_sha256":null,"flags":["+selftest","+threaded"],"package":"hadrian","revision":null,"source":"local","src_sha256":null,"version":"0.1.0.0"}]}
+\ No newline at end of file
=====================================
p/ghc/debian/patches/separate-docs deleted
=====================================
@@ -1,61 +0,0 @@
-Index: b/ghc.mk
-===================================================================
---- a/ghc.mk
-+++ b/ghc.mk
-@@ -869,7 +869,7 @@ endif
- ifeq "$(HADDOCK_DOCS)" "YES"
- libraries/dist-haddock/index.html: $(haddock_INPLACE) $(ALL_HADDOCK_FILES)
- ifeq "$(phase)" "final"
--$(eval $(call all-target,library_doc_index,libraries/dist-haddock/index.html))
-+docs: libraries/dist-haddock/index.html
- endif
- INSTALL_LIBRARY_DOCS += libraries/dist-haddock/*
- endif
-@@ -919,9 +919,9 @@ libraries/ghc-prim/dist-install/build/au
-
- install: install_libs install_packages install_libexecs \
- install_bins install_libexec_scripts
--ifeq "$(HADDOCK_DOCS)" "YES"
--install: install_docs
--endif
-+# ifeq "$(HADDOCK_DOCS)" "YES"
-+# install: install_docs
-+# endif
-
- define installLibsTo
- # $1 = libraries to install
-Index: b/rules/haddock.mk
-===================================================================
---- a/rules/haddock.mk
-+++ b/rules/haddock.mk
-@@ -34,7 +34,7 @@ endif
- haddock: html_$1
-
- ifeq "$$(HADDOCK_DOCS)" "YES"
--$(call all-target,$1_$2_haddock,html_$1)
-+docs: html_$1
- endif
-
- .PHONY: html_$1
-Index: b/rules/sphinx.mk
-===================================================================
---- a/rules/sphinx.mk
-+++ b/rules/sphinx.mk
-@@ -30,7 +30,7 @@ $(call all-target,$1,)
- .PHONY: html_$1
- ifeq "$$(phase)" "final"
- ifeq "$$(BUILD_SPHINX_HTML)" "YES"
--$(call all-target,$1,html_$1)
-+docs: html_$1
- INSTALL_HTML_DOC_DIRS += $1/build-html/$2
- endif
- endif
-@@ -47,7 +47,7 @@ endif
- .PHONY: pdf_$1
- ifeq "$$(phase)" "final"
- ifeq "$$(BUILD_SPHINX_PDF)" "YES"
--$(call all-target,$1,pdf_$1)
-+docs: pdf_$1
- INSTALL_DOCS += $1/$2.pdf
- endif
- endif
=====================================
p/ghc/debian/patches/series
=====================================
@@ -8,7 +8,6 @@ haddock-remove-googleapis-fonts
build-fix-hs-constants.patch
fix-llvm-armel
use-unbundled-sphinx-rtd-theme
-fix-bytestring-9.4.6
newer-llvm
hadrian-plans
hadrian-haddock-opts
@@ -17,3 +16,5 @@ hadrian-iserv
allow-setting-llvm-program
fix-cross-compilation
hadrian-no-pkg-recache
+sparc-support
+hadrian-disable-threaded
=====================================
p/ghc/debian/patches/sparc-support
=====================================
@@ -0,0 +1,30 @@
+Index: b/m4/ghc_convert_cpu.m4
+===================================================================
+--- a/m4/ghc_convert_cpu.m4
++++ b/m4/ghc_convert_cpu.m4
+@@ -68,6 +68,12 @@ case "$1" in
+ sh4)
+ $2="sh4"
+ ;;
++ sparc64*)
++ $2="sparc64"
++ ;;
++ sparc*)
++ $2="sparc"
++ ;;
+ vax)
+ $2="vax"
+ ;;
+Index: b/m4/fptools_set_haskell_platform_vars.m4
+===================================================================
+--- a/m4/fptools_set_haskell_platform_vars.m4
++++ b/m4/fptools_set_haskell_platform_vars.m4
+@@ -42,7 +42,7 @@ AC_DEFUN([FPTOOLS_SET_HASKELL_PLATFORM_V
+ riscv64)
+ test -z "[$]2" || eval "[$]2=ArchRISCV64"
+ ;;
+- hppa|hppa1_1|ia64|m68k|nios2|riscv32|rs6000|s390|sh4|vax)
++ hppa|hppa1_1|ia64|m68k|nios2|riscv32|rs6000|s390|sh4|sparc|sparc64|vax)
+ test -z "[$]2" || eval "[$]2=ArchUnknown"
+ ;;
+ *)
=====================================
p/ghc/debian/patches/use-debian-gen_contents_index deleted
=====================================
@@ -1,34 +0,0 @@
-Index: b/ghc.mk
-===================================================================
---- a/ghc.mk
-+++ b/ghc.mk
-@@ -868,7 +868,6 @@ endif
- # Build the Haddock contents and index
- ifeq "$(HADDOCK_DOCS)" "YES"
- libraries/dist-haddock/index.html: $(haddock_INPLACE) $(ALL_HADDOCK_FILES)
-- cd libraries && sh gen_contents_index --intree
- ifeq "$(phase)" "final"
- $(eval $(call all-target,library_doc_index,libraries/dist-haddock/index.html))
- endif
-@@ -1008,12 +1007,8 @@ endif
- $(INSTALL_DIR) "$(DESTDIR)$(docdir)/html"
- $(INSTALL_DOC) $(INSTALL_OPTS) docs/index.html "$(DESTDIR)$(docdir)/html"
- ifneq "$(INSTALL_LIBRARY_DOCS)" ""
-- $(INSTALL_DIR) "$(DESTDIR)$(docdir)/html/libraries"
-- for i in $(INSTALL_LIBRARY_DOCS); do \
-- $(INSTALL_DOC) $(INSTALL_OPTS) $$i "$(DESTDIR)$(docdir)/html/libraries/"; \
-- done
-+ mkdir -p $(DESTDIR)$(docdir)/html/libraries/
- $(INSTALL_DATA) $(INSTALL_OPTS) libraries/prologue.txt "$(DESTDIR)$(docdir)/html/libraries/"
-- $(INSTALL_SCRIPT) $(INSTALL_OPTS) libraries/gen_contents_index "$(DESTDIR)$(docdir)/html/libraries/"
- endif
- ifneq "$(INSTALL_HTML_DOC_DIRS)" ""
- for i in $(INSTALL_HTML_DOC_DIRS); do \
-@@ -1138,7 +1133,6 @@ $(eval $(call bindist-list,.,\
- mk/project.mk \
- mk/install.mk.in \
- bindist.mk \
-- libraries/gen_contents_index \
- libraries/prologue.txt \
- ))
- endif
=====================================
p/ghc/debian/patches/use-stage1-binaries-for-install.patch deleted
=====================================
@@ -1,28 +0,0 @@
-Description: Use the stage1 binaries for install
- In order to be able to perform a cross-build, we need to use
- the stage1 binaries during installation. Both ghc and ghc-pkg
- are run during the install target and therefore must be able
- to run on the build machine.
- .
-Author: John Paul Adrian Glaubitz <glaubitz at physik.fu-berlin.de>
-Last-Update: 2017-01-29
-
-Index: b/ghc.mk
-===================================================================
---- a/ghc.mk
-+++ b/ghc.mk
-@@ -1032,8 +1032,12 @@ else # CrossCompiling
- # Install packages in the right order, so that ghc-pkg doesn't complain.
- # Also, install ghc-pkg first.
- ifeq "$(Windows_Host)" "NO"
--INSTALLED_GHC_REAL=$(DESTDIR)$(ghclibexecdir)/bin/ghc
--INSTALLED_GHC_PKG_REAL=$(DESTDIR)$(ghclibexecdir)/bin/ghc-pkg
-+# Use the inplace/stage1 versions for installation,
-+# since the installed versions are built for the target
-+#INSTALLED_GHC_REAL=$(DESTDIR)$(ghclibexecdir)/bin/ghc
-+#INSTALLED_GHC_PKG_REAL=$(DESTDIR)$(ghclibexecdir)/bin/ghc-pkg
-+INSTALLED_GHC_REAL=$(CURDIR)/inplace/bin/ghc-stage1
-+INSTALLED_GHC_PKG_REAL=$(CURDIR)/utils/ghc-pkg/dist/build/tmp/ghc-pkg
- else
- INSTALLED_GHC_REAL=$(DESTDIR)$(bindir)/ghc.exe
- INSTALLED_GHC_PKG_REAL=$(DESTDIR)$(bindir)/ghc-pkg.exe
View it on GitLab: https://salsa.debian.org/haskell-team/DHG_packages/-/compare/2cd638389f9e686cd708175780576ca925f6c117...cc3df95a78614864f430295b8f2bb6362aa7f0c2
--
View it on GitLab: https://salsa.debian.org/haskell-team/DHG_packages/-/compare/2cd638389f9e686cd708175780576ca925f6c117...cc3df95a78614864f430295b8f2bb6362aa7f0c2
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/20230924/39aa2a8a/attachment-0001.htm>
More information about the Pkg-haskell-commits
mailing list