From 901bc2208a115e0f8313b3aa9abc76fd05509aaa Mon Sep 17 00:00:00 2001
From: Ben Gamari <ben@smart-cactus.org>
Date: Tue, 27 Oct 2020 10:34:59 -0400
Subject: [PATCH] Bump time submodule to 1.11.1
Also bumps directory, Cabal, hpc, time, and unix submodules.
Closes #18847.
---
compiler/ghc.cabal.in | 2 +-
ghc/ghc-bin.cabal.in | 2 +-
libraries/Cabal | 2 +-
libraries/directory | 2 +-
libraries/hpc | 2 +-
libraries/time | 2 +-
libraries/unix | 2 +-
utils/ghc-cabal/Main.hs | 4 +++-
utils/ghc-cabal/ghc.mk | 18 +++++++++---------
9 files changed, 19 insertions(+), 17 deletions(-)
diff --git a/compiler/ghc.cabal.in b/compiler/ghc.cabal.in
index faeb4f6520bc..1195fa6cbce9 100644
--- a/compiler/ghc.cabal.in
+++ b/compiler/ghc.cabal.in
@@ -63,7 +63,7 @@ Library
process >= 1 && < 1.7,
bytestring >= 0.9 && < 0.11,
binary == 0.8.*,
- time >= 1.4 && < 1.10,
+ time >= 1.4 && < 1.12,
containers >= 0.6.2.1 && < 0.7,
array >= 0.1 && < 0.6,
filepath >= 1 && < 1.5,
diff --git a/ghc/ghc-bin.cabal.in b/ghc/ghc-bin.cabal.in
index 5884984474e7..2e42221d4724 100644
--- a/ghc/ghc-bin.cabal.in
+++ b/ghc/ghc-bin.cabal.in
@@ -63,7 +63,7 @@ Executable ghc
ghci == @ProjectVersionMunged@,
haskeline == 0.8.*,
exceptions == 0.10.*,
- time >= 1.8 && < 1.10
+ time >= 1.8 && < 1.12
CPP-Options: -DHAVE_INTERNAL_INTERPRETER
Other-Modules:
GHCi.Leak
diff --git a/libraries/Cabal b/libraries/Cabal
index 5aea8a4b8463..d30b8f3ec0b0 160000
--- a/libraries/Cabal
+++ b/libraries/Cabal
@@ -1 +1 @@
-Subproject commit 5aea8a4b8463e1ae95272e190a1022764164294f
+Subproject commit d30b8f3ec0b0873b9d2eb245afdd53fabacdb884
diff --git a/libraries/directory b/libraries/directory
index cecf363bc070..0633b48b0100 160000
--- a/libraries/directory
+++ b/libraries/directory
@@ -1 +1 @@
-Subproject commit cecf363bc07004ad314e0297ce34ddba05031c0e
+Subproject commit 0633b48b010093f64f98ee494265436e96456aed
diff --git a/libraries/hpc b/libraries/hpc
index fecf0496a65c..59e6ba02f3fa 160000
--- a/libraries/hpc
+++ b/libraries/hpc
@@ -1 +1 @@
-Subproject commit fecf0496a65c4be275d613eb0632fecd5a123b69
+Subproject commit 59e6ba02f3fa5c8f4901b4ce21777c4a9beb14b6
diff --git a/libraries/time b/libraries/time
index 5319bed3b14c..c25d6a76702b 160000
--- a/libraries/time
+++ b/libraries/time
@@ -1 +1 @@
-Subproject commit 5319bed3b14c21de5410ead88ec8aaa838d7339c
+Subproject commit c25d6a76702b454426e149fb590da5cb69f3bd0a
diff --git a/libraries/unix b/libraries/unix
index 8abd63ea234d..e07982377506 160000
--- a/libraries/unix
+++ b/libraries/unix
@@ -1 +1 @@
-Subproject commit 8abd63ea234de02d2b3cb08b5098cd06c1a728f6
+Subproject commit e079823775066bcab56b22842be6cce6e060fb9f
diff --git a/utils/ghc-cabal/Main.hs b/utils/ghc-cabal/Main.hs
index 92587971e737..78efc133f11f 100644
--- a/utils/ghc-cabal/Main.hs
+++ b/utils/ghc-cabal/Main.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE CPP #-}
{-# OPTIONS_GHC -fno-warn-warnings-deprecations #-}
{-# OPTIONS_GHC -Wno-incomplete-uni-patterns #-}
@@ -28,6 +29,7 @@ import Distribution.Verbosity
import qualified Distribution.InstalledPackageInfo as Installed
import qualified Distribution.Simple.PackageIndex as PackageIndex
import Distribution.Utils.ShortText (fromShortText)
+import Distribution.Utils.Path (getSymbolicPath)
import Control.Exception (bracket)
import Control.Monad
@@ -433,7 +435,7 @@ generate directory distdir config_args
variablePrefix ++ "_MODULES = " ++ unwords mods,
variablePrefix ++ "_HIDDEN_MODULES = " ++ unwords otherMods,
variablePrefix ++ "_SYNOPSIS =" ++ (unwords $ lines $ fromShortText $ synopsis pd),
- variablePrefix ++ "_HS_SRC_DIRS = " ++ unwords (hsSourceDirs bi),
+ variablePrefix ++ "_HS_SRC_DIRS = " ++ unwords (map getSymbolicPath $ hsSourceDirs bi),
variablePrefix ++ "_DEPS = " ++ unwords deps,
variablePrefix ++ "_DEP_IPIDS = " ++ unwords dep_ipids,
variablePrefix ++ "_DEP_NAMES = " ++ unwords depNames,
diff --git a/utils/ghc-cabal/ghc.mk b/utils/ghc-cabal/ghc.mk
index a964e55070ad..145fc8fca503 100644
--- a/utils/ghc-cabal/ghc.mk
+++ b/utils/ghc-cabal/ghc.mk
@@ -38,20 +38,20 @@ $(ghc-cabal_INPLACE) : $(ghc-cabal_DIST_BINARY) | $$(dir $$@)/.
"$(CP)" $< $@
# Minor hack, since we can't reuse the `hs-suffix-rules-srcdir` macro
-ifneq ($(wildcard libraries/Cabal/Cabal/Distribution/Fields/Lexer.x),)
+ifneq ($(wildcard libraries/Cabal/Cabal/src/Distribution/Fields/Lexer.x),)
# Lexer.x exists so we have to call Alex ourselves
-CABAL_LEXER_DEP := bootstrapping/Cabal/Distribution/Fields/Lexer.hs
+CABAL_LEXER_DEP := bootstrapping/Cabal/src/Distribution/Fields/Lexer.hs
-bootstrapping/Cabal/Distribution/Fields/Lexer.hs: libraries/Cabal/Cabal/Distribution/Fields/Lexer.x
- mkdir -p bootstrapping/Cabal/Distribution/Fields
+bootstrapping/Cabal/src/Distribution/Fields/Lexer.hs: libraries/Cabal/Cabal/src/Distribution/Fields/Lexer.x
+ mkdir -p bootstrapping/Cabal/src/Distribution/Fields
$(call cmd,ALEX) $< -o $@
else
-CABAL_LEXER_DEP := libraries/Cabal/Cabal/Distribution/Fields/Lexer.hs
+CABAL_LEXER_DEP := libraries/Cabal/Cabal/src/Distribution/Fields/Lexer.hs
endif
-$(ghc-cabal_DIST_BINARY): $(wildcard libraries/Cabal/Cabal/Distribution/*/*/*.hs)
-$(ghc-cabal_DIST_BINARY): $(wildcard libraries/Cabal/Cabal/Distribution/*/*.hs)
-$(ghc-cabal_DIST_BINARY): $(wildcard libraries/Cabal/Cabal/Distribution/*.hs)
+$(ghc-cabal_DIST_BINARY): $(wildcard libraries/Cabal/Cabal/src/Distribution/*/*/*.hs)
+$(ghc-cabal_DIST_BINARY): $(wildcard libraries/Cabal/Cabal/src/Distribution/*/*.hs)
+$(ghc-cabal_DIST_BINARY): $(wildcard libraries/Cabal/Cabal/src/Distribution/*.hs)
# N.B. Compile with -O0 since this is not a performance-critical executable
# and the Cabal takes nearly twice as long to build with -O1. See #16817.
@@ -70,7 +70,7 @@ $(ghc-cabal_DIST_BINARY): $(CABAL_LEXER_DEP) utils/ghc-cabal/Main.hs $(TOUCH_DEP
-odir bootstrapping \
-hidir bootstrapping \
$(CABAL_LEXER_DEP) \
- -ilibraries/Cabal/Cabal \
+ -ilibraries/Cabal/Cabal/src \
-ilibraries/binary/src \
-ilibraries/filepath \
-ilibraries/hpc \
--
GitLab