cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

handle erlang/25 and rebar3, switch default to 25.

Browse Source 
from Volker Schlecht.
This commit is contained in:
sthen 2022-07-31 12:17:26 +00:00
parent f31478d26b
commit 847b58e467
1 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
lang/erlang/erlang.port.mk
View File

@ -5,15 +5,15 @@ CATEGORIES += lang/erlang
USE_GMAKE ?= Yes
# Default Erlang version to use if MODERL_VERSION is not set.
# XXX: Keep in sync with devel/rebar/Makefile
MODERL_DEFAULT_VERSION =21
# XXX: Keep in sync with devel/rebar3/Makefile
MODERL_DEFAULT_VERSION =25
# If the port already has flavors, append ours to it unless the port requires
# a specific version of Erlang.
.if !defined(MODERL_VERSION) && !defined(FLAVORS)
FLAVORS ?= erlang21
FLAVORS ?= erlang25
.else
FLAVORS += erlang21
FLAVORS += erlang25
.endif
FLAVOR?= # empty
@ -29,13 +29,22 @@ _MODERL_FLAVOR ?= # empty
.if ${MODERL_VERSION} == 21
_MODERL_FLAVOR = erlang21
.elif ${MODERL_VERSION} == 25
_MODERL_FLAVOR = erlang25
.else
ERRORS += "Invalid MODERL_VERSION set: ${MODERL_VERSION}."
.endif
# If no configure style is set, then assume "rebar"
.if ${CONFIGURE_STYLE} == ""
.if ${CONFIGURE_STYLE} == "" && ${MODERL_VERSION} == 21
CONFIGURE_STYLE = rebar
.endif
.if ${CONFIGURE_STYLE} == "" && ${MODERL_VERSION} >= 25
CONFIGURE_STYLE = rebar3
.endif
.if ${CONFIGURE_STYLE} == "rebar"
MODERL_BUILD_DEPENDS += devel/rebar
REBAR_BIN ?= ${LOCALBASE}/bin/rebar${MODERL_VERSION}
# Make sure rebar gets called as 'rebar', otherwise escript tries to call the
@ -43,6 +52,14 @@ REBAR_BIN ?= ${LOCALBASE}/bin/rebar${MODERL_VERSION}
_MODERL_LINKS += rebar${MODERL_VERSION} rebar
.endif
.if ${CONFIGURE_STYLE} == "rebar3"
MODERL_BUILD_DEPENDS += devel/rebar3
REBAR_BIN ?= ${LOCALBASE}/bin/rebar3-${MODERL_VERSION}
# Make sure rebar gets called as 'rebar3', otherwise escript tries to call the
# binary name (e.g. rebar3-25) as the script entrypoint.
_MODERL_LINKS += rebar3-${MODERL_VERSION} rebar
.endif
# Append the flavor to all the Erlang dependencies
.for b in ${MODERL_BUILD_DEPENDS}
_MODERL_BDEPS += ${b},${_MODERL_FLAVOR}
@ -113,7 +130,7 @@ pre-configure:
.endif
.endif
.if ${CONFIGURE_STYLE:L} == "rebar"
.if ${CONFIGURE_STYLE:L} == "rebar" || ${CONFIGURE_STYLE:L} == "rebar3"
# Some modules bundle their own rebar escript, force them to use the system
# rebar instead.
# While here, remove the deps{} block from rebar.config, we cannot download