[commit: ghc] ghc-8.6: Revert "libiserv: Generate cabal file with autoconf" (c2c6f49)

git at git.haskell.org git at git.haskell.org
Thu Nov 22 22:05:06 UTC 2018


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

On branch  : ghc-8.6
Link       : http://ghc.haskell.org/trac/ghc/changeset/c2c6f49845698275c1e83f0c93b9c4b558c7ba08/ghc

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

commit c2c6f49845698275c1e83f0c93b9c4b558c7ba08
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Thu Nov 22 16:59:14 2018 -0500

    Revert "libiserv: Generate cabal file with autoconf"
    
    This reverts commit cbde2726f10b8f4c19483bbb755ad42356098c51.


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

c2c6f49845698275c1e83f0c93b9c4b558c7ba08
 configure.ac                                             | 2 +-
 libraries/libiserv/{libiserv.cabal.in => libiserv.cabal} | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index f305ca9..2556561 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1334,7 +1334,7 @@ checkMake380() {
 checkMake380 make
 checkMake380 gmake
 
-AC_CONFIG_FILES([mk/config.mk mk/install.mk mk/project.mk rts/rts.cabal compiler/ghc.cabal ghc/ghc-bin.cabal utils/runghc/runghc.cabal utils/gen-dll/gen-dll.cabal libraries/ghc-boot/ghc-boot.cabal libraries/ghc-boot-th/ghc-boot-th.cabal libraries/ghci/ghci.cabal libraries/ghc-heap/ghc-heap.cabal libraries/libiserv/libiserv.cabal settings docs/users_guide/ghc_config.py docs/index.html libraries/prologue.txt distrib/configure.ac])
+AC_CONFIG_FILES([mk/config.mk mk/install.mk mk/project.mk rts/rts.cabal compiler/ghc.cabal ghc/ghc-bin.cabal utils/runghc/runghc.cabal utils/gen-dll/gen-dll.cabal libraries/ghc-boot/ghc-boot.cabal libraries/ghc-boot-th/ghc-boot-th.cabal libraries/ghci/ghci.cabal libraries/ghc-heap/ghc-heap.cabal settings docs/users_guide/ghc_config.py docs/index.html libraries/prologue.txt distrib/configure.ac])
 AC_OUTPUT
 [
 if test "$print_make_warning" = "true"; then
diff --git a/libraries/libiserv/libiserv.cabal.in b/libraries/libiserv/libiserv.cabal
similarity index 97%
rename from libraries/libiserv/libiserv.cabal.in
rename to libraries/libiserv/libiserv.cabal
index 84471a2..fc0a022 100644
--- a/libraries/libiserv/libiserv.cabal.in
+++ b/libraries/libiserv/libiserv.cabal
@@ -1,5 +1,5 @@
 Name: libiserv
-Version: @ProjectVersionMunged@
+Version: 8.6.1
 Copyright: XXX
 License: BSD3
 License-File: LICENSE



More information about the ghc-commits mailing list