[commit: ghc] master: Rip out perl dependency (b760269)

git at git.haskell.org git at git.haskell.org
Sun Mar 10 14:31:54 UTC 2019


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

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

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

commit b760269c5914e128c07c66bacdbe86168003e82e
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Fri Mar 8 10:24:17 2019 -0500

    Rip out perl dependency
    
    The object splitter was the last major user of perl. There remain a few
    uses in nofib but we can just rely on the system's perl for this since
    it's not critical to the build.


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

b760269c5914e128c07c66bacdbe86168003e82e
 distrib/configure.ac.in         | 10 ----------
 ghc.mk                          |  6 ------
 hadrian/cfg/system.config.in    |  1 -
 hadrian/src/Builder.hs          |  2 --
 hadrian/src/Rules/Nofib.hs      |  3 +--
 mk/config.mk.in                 |  1 -
 mk/get-win32-tarballs.sh        |  1 -
 mk/tree.mk                      |  1 -
 settings.in                     |  1 -
 utils/vagrant/bootstrap-rhel.sh |  2 +-
 10 files changed, 2 insertions(+), 26 deletions(-)

diff --git a/distrib/configure.ac.in b/distrib/configure.ac.in
index dd0eb2e..f9f14d1 100644
--- a/distrib/configure.ac.in
+++ b/distrib/configure.ac.in
@@ -51,16 +51,6 @@ Unregisterised="@Unregisterised@"
 AC_SUBST(Unregisterised)
 
 #
-dnl ** Check Perl installation **
-#
-AC_PATH_PROG(PerlCmd,perl)
-if test -z "$PerlCmd"; then
-   echo "You must install perl before you can continue"
-   echo "Perhaps it is already installed, but not in your PATH?"
-   exit 1
-fi
-
-#
 dnl ** figure out how to do a BSD-ish install **
 #
 AC_PROG_INSTALL
diff --git a/ghc.mk b/ghc.mk
index bc92b87..0eae0fc 100644
--- a/ghc.mk
+++ b/ghc.mk
@@ -815,11 +815,6 @@ install : install_mingw
 install_mingw : $(INPLACE_MINGW)
 	"$(CP)" -Rp $(INPLACE_MINGW) $(prefix)
 
-install : install_perl
-.PHONY: install_perl
-install_perl : $(INPLACE_PERL)
-	"$(CP)" -Rp $(INPLACE_PERL) $(prefix)
-
 endif # Windows_Host
 
 ifneq "$(BINDIST)" "YES"
@@ -1025,7 +1020,6 @@ $(eval $(call bindist-list,.,\
     $(INPLACE_BIN)/mkdirhier \
     utils/ghc-cabal/dist-install/build/tmp/ghc-cabal \
     $(BINDIST_WRAPPERS) \
-    $(BINDIST_PERL_SOURCES) \
     $(BINDIST_LIBS) \
     $(BINDIST_HI) \
     $(BINDIST_EXTRAS) \
diff --git a/hadrian/cfg/system.config.in b/hadrian/cfg/system.config.in
index affeeaa..e3c612e 100644
--- a/hadrian/cfg/system.config.in
+++ b/hadrian/cfg/system.config.in
@@ -23,7 +23,6 @@ system-ghc     = @WithGhc@
 system-ghc-pkg = @GhcPkgCmd@
 tar            = @TarCmd@
 patch          = @PatchCmd@
-perl           = @PerlCmd@
 xelatex        = @XELATEX@
 
 # Python 3 is required to run test driver.
diff --git a/hadrian/src/Builder.hs b/hadrian/src/Builder.hs
index 6c14eb4..6d334d8 100644
--- a/hadrian/src/Builder.hs
+++ b/hadrian/src/Builder.hs
@@ -127,7 +127,6 @@ data Builder = Alex
              | Nm
              | Objdump
              | Patch
-             | Perl
              | Python
              | Ranlib
              | RunTest
@@ -305,7 +304,6 @@ systemBuilderPath builder = case builder of
     Nm              -> fromKey "nm"
     Objdump         -> fromKey "objdump"
     Patch           -> fromKey "patch"
-    Perl            -> fromKey "perl"
     Python          -> fromKey "python"
     Ranlib          -> fromKey "ranlib"
     RunTest         -> fromKey "python"
diff --git a/hadrian/src/Rules/Nofib.hs b/hadrian/src/Rules/Nofib.hs
index 0950605..016f7e7 100644
--- a/hadrian/src/Rules/Nofib.hs
+++ b/hadrian/src/Rules/Nofib.hs
@@ -29,7 +29,6 @@ nofibRules = do
         makePath <- builderPath (Make "nofib")
         top      <- topDirectory
         ghcPath  <- builderPath (Ghc CompileHs Stage2)
-        perlPath <- builderPath Perl
 
         -- some makefiles in nofib rely on a $MAKE
         -- env var being defined
@@ -39,7 +38,7 @@ nofibRules = do
         -- subdirectory, passing the path to
         -- the GHC to benchmark and perl to
         -- nofib's makefiles.
-        let nofibArgs = ["WithNofibHc=" ++ (top -/- ghcPath), "PERL=" ++ perlPath]
+        let nofibArgs = ["WithNofibHc=" ++ (top -/- ghcPath)]
         unit $ cmd (Cwd "nofib") [makePath] ["clean"]
         unit $ cmd (Cwd "nofib") [makePath] (nofibArgs ++ ["boot"])
         (Exit e, Stdouterr log) <- cmd (Cwd "nofib") [makePath] nofibArgs
diff --git a/mk/config.mk.in b/mk/config.mk.in
index 55fb808..22a3d39 100644
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -701,7 +701,6 @@ INSTALL			:= $(subst .././install-sh,$(TOP)/install-sh,$(INSTALL))
 
 LN_S			= @LN_S@
 MV			= mv
-PERL 			= @PerlCmd@
 PIC			= pic
 RANLIB_CMD = @RANLIB_CMD@
 REAL_RANLIB_CMD = @REAL_RANLIB_CMD@
diff --git a/mk/get-win32-tarballs.sh b/mk/get-win32-tarballs.sh
index 32f2705..fd47232 100755
--- a/mk/get-win32-tarballs.sh
+++ b/mk/get-win32-tarballs.sh
@@ -117,7 +117,6 @@ download_tarballs() {
     if test "$mingw_arch" != "sources"; then
         download_mingw "${format_url}-mpc-1.0.3-2-any.pkg.tar.xz"
         download_mingw "${format_url}-gcc-libs-7.2.0-1-any.pkg.tar.xz"
-        download_file "https://downloads.haskell.org/~ghc/mingw/ghc-perl-1.tar.gz" "ghc-tarballs/perl/ghc-perl-1.tar.gz" "Windows Perl binary distributions" "" ""
     else
         local format_url="${mingw_base_url}/${mingw_arch}/${package_prefix}"
         download_mingw "${format_url}-i686-mpc-1.0.3-2.src.tar.gz"
diff --git a/mk/tree.mk b/mk/tree.mk
index b333e64..5a61a4a 100644
--- a/mk/tree.mk
+++ b/mk/tree.mk
@@ -19,7 +19,6 @@ INPLACE_BIN             = $(INPLACE)/bin
 INPLACE_LIB             = $(INPLACE)/lib
 INPLACE_TOPDIR          = $(INPLACE)/lib
 INPLACE_MINGW           = $(INPLACE)/mingw
-INPLACE_PERL            = $(INPLACE)/perl
 
 ################################################################################
 #
diff --git a/settings.in b/settings.in
index 30bfe70..6037d53 100644
--- a/settings.in
+++ b/settings.in
@@ -19,7 +19,6 @@
  ("dllwrap command", "@SettingsDllWrapCommand@"),
  ("windres command", "@SettingsWindresCommand@"),
  ("libtool command", "@SettingsLibtoolCommand@"),
- ("perl command", "@SettingsPerlCommand@"),
  ("cross compiling", "@CrossCompiling@"),
  ("target os", "@HaskellTargetOs@"),
  ("target arch", "@HaskellTargetArch@"),
diff --git a/utils/vagrant/bootstrap-rhel.sh b/utils/vagrant/bootstrap-rhel.sh
index 52cc5fc..eb28f07 100755
--- a/utils/vagrant/bootstrap-rhel.sh
+++ b/utils/vagrant/bootstrap-rhel.sh
@@ -1,4 +1,4 @@
 #!/bin/sh
 yum update -y
 yum install -y glibc-devel ncurses-devel gmp-devel autoconf automake libtool \
- gcc make perl python ghc git
+ gcc make python ghc git



More information about the ghc-commits mailing list