Commit b760269c authored by Ben Gamari's avatar Ben Gamari 🐢 Committed by Marge Bot

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.
parent 6b2f0991
...@@ -50,16 +50,6 @@ AC_SUBST(TargetPlatformFull) ...@@ -50,16 +50,6 @@ AC_SUBST(TargetPlatformFull)
Unregisterised="@Unregisterised@" Unregisterised="@Unregisterised@"
AC_SUBST(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 ** dnl ** figure out how to do a BSD-ish install **
# #
......
...@@ -815,11 +815,6 @@ install : install_mingw ...@@ -815,11 +815,6 @@ install : install_mingw
install_mingw : $(INPLACE_MINGW) install_mingw : $(INPLACE_MINGW)
"$(CP)" -Rp $(INPLACE_MINGW) $(prefix) "$(CP)" -Rp $(INPLACE_MINGW) $(prefix)
install : install_perl
.PHONY: install_perl
install_perl : $(INPLACE_PERL)
"$(CP)" -Rp $(INPLACE_PERL) $(prefix)
endif # Windows_Host endif # Windows_Host
ifneq "$(BINDIST)" "YES" ifneq "$(BINDIST)" "YES"
...@@ -1025,7 +1020,6 @@ $(eval $(call bindist-list,.,\ ...@@ -1025,7 +1020,6 @@ $(eval $(call bindist-list,.,\
$(INPLACE_BIN)/mkdirhier \ $(INPLACE_BIN)/mkdirhier \
utils/ghc-cabal/dist-install/build/tmp/ghc-cabal \ utils/ghc-cabal/dist-install/build/tmp/ghc-cabal \
$(BINDIST_WRAPPERS) \ $(BINDIST_WRAPPERS) \
$(BINDIST_PERL_SOURCES) \
$(BINDIST_LIBS) \ $(BINDIST_LIBS) \
$(BINDIST_HI) \ $(BINDIST_HI) \
$(BINDIST_EXTRAS) \ $(BINDIST_EXTRAS) \
......
...@@ -23,7 +23,6 @@ system-ghc = @WithGhc@ ...@@ -23,7 +23,6 @@ system-ghc = @WithGhc@
system-ghc-pkg = @GhcPkgCmd@ system-ghc-pkg = @GhcPkgCmd@
tar = @TarCmd@ tar = @TarCmd@
patch = @PatchCmd@ patch = @PatchCmd@
perl = @PerlCmd@
xelatex = @XELATEX@ xelatex = @XELATEX@
# Python 3 is required to run test driver. # Python 3 is required to run test driver.
......
...@@ -127,7 +127,6 @@ data Builder = Alex ...@@ -127,7 +127,6 @@ data Builder = Alex
| Nm | Nm
| Objdump | Objdump
| Patch | Patch
| Perl
| Python | Python
| Ranlib | Ranlib
| RunTest | RunTest
...@@ -305,7 +304,6 @@ systemBuilderPath builder = case builder of ...@@ -305,7 +304,6 @@ systemBuilderPath builder = case builder of
Nm -> fromKey "nm" Nm -> fromKey "nm"
Objdump -> fromKey "objdump" Objdump -> fromKey "objdump"
Patch -> fromKey "patch" Patch -> fromKey "patch"
Perl -> fromKey "perl"
Python -> fromKey "python" Python -> fromKey "python"
Ranlib -> fromKey "ranlib" Ranlib -> fromKey "ranlib"
RunTest -> fromKey "python" RunTest -> fromKey "python"
......
...@@ -29,7 +29,6 @@ nofibRules = do ...@@ -29,7 +29,6 @@ nofibRules = do
makePath <- builderPath (Make "nofib") makePath <- builderPath (Make "nofib")
top <- topDirectory top <- topDirectory
ghcPath <- builderPath (Ghc CompileHs Stage2) ghcPath <- builderPath (Ghc CompileHs Stage2)
perlPath <- builderPath Perl
-- some makefiles in nofib rely on a $MAKE -- some makefiles in nofib rely on a $MAKE
-- env var being defined -- env var being defined
...@@ -39,7 +38,7 @@ nofibRules = do ...@@ -39,7 +38,7 @@ nofibRules = do
-- subdirectory, passing the path to -- subdirectory, passing the path to
-- the GHC to benchmark and perl to -- the GHC to benchmark and perl to
-- nofib's makefiles. -- 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] ["clean"]
unit $ cmd (Cwd "nofib") [makePath] (nofibArgs ++ ["boot"]) unit $ cmd (Cwd "nofib") [makePath] (nofibArgs ++ ["boot"])
(Exit e, Stdouterr log) <- cmd (Cwd "nofib") [makePath] nofibArgs (Exit e, Stdouterr log) <- cmd (Cwd "nofib") [makePath] nofibArgs
......
...@@ -701,7 +701,6 @@ INSTALL := $(subst .././install-sh,$(TOP)/install-sh,$(INSTALL)) ...@@ -701,7 +701,6 @@ INSTALL := $(subst .././install-sh,$(TOP)/install-sh,$(INSTALL))
LN_S = @LN_S@ LN_S = @LN_S@
MV = mv MV = mv
PERL = @PerlCmd@
PIC = pic PIC = pic
RANLIB_CMD = @RANLIB_CMD@ RANLIB_CMD = @RANLIB_CMD@
REAL_RANLIB_CMD = @REAL_RANLIB_CMD@ REAL_RANLIB_CMD = @REAL_RANLIB_CMD@
......
...@@ -117,7 +117,6 @@ download_tarballs() { ...@@ -117,7 +117,6 @@ download_tarballs() {
if test "$mingw_arch" != "sources"; then if test "$mingw_arch" != "sources"; then
download_mingw "${format_url}-mpc-1.0.3-2-any.pkg.tar.xz" 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_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 else
local format_url="${mingw_base_url}/${mingw_arch}/${package_prefix}" local format_url="${mingw_base_url}/${mingw_arch}/${package_prefix}"
download_mingw "${format_url}-i686-mpc-1.0.3-2.src.tar.gz" download_mingw "${format_url}-i686-mpc-1.0.3-2.src.tar.gz"
......
...@@ -19,7 +19,6 @@ INPLACE_BIN = $(INPLACE)/bin ...@@ -19,7 +19,6 @@ INPLACE_BIN = $(INPLACE)/bin
INPLACE_LIB = $(INPLACE)/lib INPLACE_LIB = $(INPLACE)/lib
INPLACE_TOPDIR = $(INPLACE)/lib INPLACE_TOPDIR = $(INPLACE)/lib
INPLACE_MINGW = $(INPLACE)/mingw INPLACE_MINGW = $(INPLACE)/mingw
INPLACE_PERL = $(INPLACE)/perl
################################################################################ ################################################################################
# #
......
...@@ -19,7 +19,6 @@ ...@@ -19,7 +19,6 @@
("dllwrap command", "@SettingsDllWrapCommand@"), ("dllwrap command", "@SettingsDllWrapCommand@"),
("windres command", "@SettingsWindresCommand@"), ("windres command", "@SettingsWindresCommand@"),
("libtool command", "@SettingsLibtoolCommand@"), ("libtool command", "@SettingsLibtoolCommand@"),
("perl command", "@SettingsPerlCommand@"),
("cross compiling", "@CrossCompiling@"), ("cross compiling", "@CrossCompiling@"),
("target os", "@HaskellTargetOs@"), ("target os", "@HaskellTargetOs@"),
("target arch", "@HaskellTargetArch@"), ("target arch", "@HaskellTargetArch@"),
......
#!/bin/sh #!/bin/sh
yum update -y yum update -y
yum install -y glibc-devel ncurses-devel gmp-devel autoconf automake libtool \ yum install -y glibc-devel ncurses-devel gmp-devel autoconf automake libtool \
gcc make perl python ghc git gcc make python ghc git
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment