[commit: ghc] master: Update `binary` submodule to final 0.7.2.3 release (b037981)

git at git.haskell.org git at git.haskell.org
Sun Dec 14 18:48:55 UTC 2014


Repository : ssh://git@git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/b0379819e46796047c1574a6abccf186afd27afa/ghc

>---------------------------------------------------------------

commit b0379819e46796047c1574a6abccf186afd27afa
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Sun Dec 14 18:59:00 2014 +0100

    Update `binary` submodule to final 0.7.2.3 release
    
    This also introduces a "bootstrap" `cabal_macros.h` header to provide
    the `MIN_VERSION_base()` macro during Cabal bootstrapping which as it is
    now used by `binary`.


>---------------------------------------------------------------

b0379819e46796047c1574a6abccf186afd27afa
 libraries/binary                    |  2 +-
 utils/ghc-cabal/cabal_macros_boot.h | 21 +++++++++++++++++++++
 utils/ghc-cabal/ghc.mk              |  1 +
 3 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/libraries/binary b/libraries/binary
index 03adb0a..a3edce4 160000
--- a/libraries/binary
+++ b/libraries/binary
@@ -1 +1 @@
-Subproject commit 03adb0aa2c17ce044586e3a30edc13e5cc83f69e
+Subproject commit a3edce4b95b82388997929424ce98b1d7a75350d
diff --git a/utils/ghc-cabal/cabal_macros_boot.h b/utils/ghc-cabal/cabal_macros_boot.h
new file mode 100644
index 0000000..41cddb1
--- /dev/null
+++ b/utils/ghc-cabal/cabal_macros_boot.h
@@ -0,0 +1,21 @@
+/* defines a few MIN_VERSION_...() macros used by some of the bootstrap packages */
+
+#if __GLASGOW_HASKELL__ >= 709
+/* package base-4.8.0.0 */
+# define MIN_VERSION_base(major1,major2,minor) (\
+  (major1) <  4 || \
+  (major1) == 4 && (major2) <  8 || \
+  (major1) == 4 && (major2) == 8 && (minor) <= 0)
+#elif __GLASGOW_HASKELL__ >= 707
+/* package base-4.7.0 */
+# define MIN_VERSION_base(major1,major2,minor) (\
+  (major1) <  4 || \
+  (major1) == 4 && (major2) <  7 || \
+  (major1) == 4 && (major2) == 7 && (minor) <= 0)
+#elif __GLASGOW_HASKELL__ >= 705
+/* package base-4.6.0 */
+# define MIN_VERSION_base(major1,major2,minor) (\
+  (major1) <  4 || \
+  (major1) == 4 && (major2) <  6 || \
+  (major1) == 4 && (major2) == 6 && (minor) <= 0)
+#endif
diff --git a/utils/ghc-cabal/ghc.mk b/utils/ghc-cabal/ghc.mk
index b8d54ab..3ac864f 100644
--- a/utils/ghc-cabal/ghc.mk
+++ b/utils/ghc-cabal/ghc.mk
@@ -39,6 +39,7 @@ $(ghc-cabal_DIST_BINARY): utils/ghc-cabal/Main.hs $(TOUCH_DEP) | $$(dir $$@)/. b
 	       -Wall -fno-warn-unused-imports -fno-warn-warnings-deprecations \
 	       -DCABAL_VERSION=$(CABAL_VERSION) \
 	       -DBOOTSTRAPPING \
+	       -optP-include -optPutils/ghc-cabal/cabal_macros_boot.h \
 	       -odir  bootstrapping \
 	       -hidir bootstrapping \
 	       -ilibraries/Cabal/Cabal \



More information about the ghc-commits mailing list