From c46bf7d56bcab3d5ed76dd2957f20b302a138e9b Mon Sep 17 00:00:00 2001 From: Badlop Date: Mon, 8 Mar 2021 14:52:49 +0100 Subject: [PATCH] Remove support for HiPE, it was experimental and Erlang/OTP 24 removes it --- configure.ac | 9 --------- rebar.config | 3 --- vars.config.in | 1 - 3 files changed, 13 deletions(-) diff --git a/configure.ac b/configure.ac index faeb67145..4dd19c122 100644 --- a/configure.ac +++ b/configure.ac @@ -127,14 +127,6 @@ if test "$ENABLEGROUP" != ""; then AC_SUBST([INSTALLGROUP], [$ENABLEGROUP]) fi -AC_ARG_ENABLE(hipe, -[AC_HELP_STRING([--enable-hipe], [compile natively with HiPE, not recommended (default: no)])], -[case "${enableval}" in - yes) hipe=true ;; - no) hipe=false ;; - *) AC_MSG_ERROR(bad value ${enableval} for --enable-hipe) ;; -esac],[hipe=false]) - AC_ARG_ENABLE(latest_deps, [AC_HELP_STRING([--enable-latest-deps], [makes rebar use latest commits for dependencies instead of tagged versions (default: no)])], [case "${enableval}" in @@ -295,7 +287,6 @@ for backend in odbc mysql pgsql sqlite redis mssql; do fi done -AC_SUBST(hipe) AC_SUBST(roster_gateway_workaround) AC_SUBST(new_sql_schema) AC_SUBST(full_xml) diff --git a/rebar.config b/rebar.config index 8c89a3651..26e228bc2 100644 --- a/rebar.config +++ b/rebar.config @@ -104,7 +104,6 @@ {if_var_false, debug, no_debug_info}, {if_var_true, debug, debug_info}, {if_var_true, elixir, {d, 'ELIXIR_ENABLED'}}, - {if_var_true, hipe, native}, {if_var_true, new_sql_schema, {d, 'NEW_SQL_SCHEMA'}}, {if_var_true, roster_gateway_workaround, {d, 'ROSTER_GATWAY_WORKAROUND'}}, {if_var_true, sip, {d, 'SIP'}}, @@ -115,8 +114,6 @@ {if_var_true, tools, tools}, {if_var_true, elixir, include}]}]}. -{deps_erl_opts, [{if_var_true, hipe, native}]}. - {if_rebar3, {plugins, [rebar3_hex, {provider_asn1, "0.2.0"}]}}. {if_rebar3, {project_plugins, [configure_deps]}}. {if_not_rebar3, {plugins, [ diff --git a/vars.config.in b/vars.config.in index 49cabf528..880f7133a 100644 --- a/vars.config.in +++ b/vars.config.in @@ -23,7 +23,6 @@ {full_xml, @full_xml@}. {db_type, @db_type@}. {debug, @debug@}. -{hipe, @hipe@}. {new_sql_schema, @new_sql_schema@}. %% Ad-hoc directories with source files