On Wed, Feb 17, 2021 at 09:10:23PM -0800, Greg Steuck wrote:
> I built both packages with no options to test they still are OK.
>
> Subject: [PATCH] Remove erlang19 flavor from devel/rebar{,3}
There's no reason for rebar to hold up the removal of erlang 19,
and this is trivial to revert if someone revives it.
ok jmatthew@
>
> The goal is to erlang19 broken by -fno-common.
> ---
> devel/rebar/Makefile | 4 ++--
> devel/rebar3/Makefile | 4 ++--
> 2 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git devel/rebar/Makefile devel/rebar/Makefile
> index e1c5a109dff..98294bc0422 100644
> --- devel/rebar/Makefile
> +++ devel/rebar/Makefile
> @@ -17,10 +17,10 @@ PERMIT_PACKAGE= Yes
>
> # This port cannot use the erlang module for the module depends on this port.
> # Keep in sync with erlang.port.mk
> -FLAVORS = erlang19 erlang21
> +FLAVORS = erlang21
> FLAVOR ?= erlang21
>
> -.if ${FLAVOR:Merlang19 || ${FLAVOR:Merlang21}}
> +.if ${FLAVOR:Merlang21}}
> _EV = ${FLAVOR:C/.*([0-9][0-9]+\$)/\1/}
> RUN_DEPENDS = lang/erlang/${_EV}
> ERL_VERSION = ${_EV}
> diff --git devel/rebar3/Makefile devel/rebar3/Makefile
> index 617fa161316..0f8638b6e12 100644
> --- devel/rebar3/Makefile
> +++ devel/rebar3/Makefile
> @@ -12,7 +12,7 @@ MAINTAINER = Jonathan Matthew
> <jmatt...@openbsd.org>
> # APLv2
> PERMIT_PACKAGE= Yes
>
> -FLAVORS = erlang19 erlang21
> +FLAVORS = erlang21
> FLAVOR ?= erlang21
>
> MASTER_SITES = https://github.com/erlang/rebar3/archive/
> @@ -20,7 +20,7 @@ MASTER_SITES1 = https://repo.hex.pm/tarballs/
>
> WRKDIST = ${WRKDIR}/rebar3-${V}
>
> -.if ${FLAVOR:Merlang19} || ${FLAVOR:Merlang21}
> +.if ${FLAVOR:Merlang21}
> _EV = ${FLAVOR:C/.*([0-9][0-9]+\$)/\1/}
> RUN_DEPENDS = lang/erlang/${_EV}
> ERL_VERSION = ${_EV}
> --
> 2.30.1
>
