hookup erlang 19

This commit is contained in:
jasper 2016-06-30 07:19:23 +00:00
parent 17e8868aa2
commit 4b42a77043
3 changed files with 14 additions and 6 deletions

View File

@ -1,8 +1,9 @@
# $OpenBSD: Makefile,v 1.66 2015/06/26 06:36:34 jasper Exp $
# $OpenBSD: Makefile,v 1.67 2016/06/30 07:19:23 jasper Exp $
SUBDIR =
SUBDIR += 16
SUBDIR += 17
SUBDIR += 18
SUBDIR += 19
.include <bsd.port.subdir.mk>

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile.inc,v 1.11 2016/03/16 20:02:11 naddy Exp $
# $OpenBSD: Makefile.inc,v 1.12 2016/06/30 07:19:23 jasper Exp $
COMMENT ?= real-time, concurrent and distributed functional language
@ -66,7 +66,9 @@ gen-versions: extract
@grep VSN ${WRKSRC}/erts/vsn.mk |awk '/^VSN/ { print "ERTS_VSN\t" $$3 }' | sort
pre-configure:
${SUBST_CMD} ${WRKSRC}/make/install_bin ${WRKSRC}/erts/etc/common/escript.c
${SUBST_CMD} ${WRKSRC}/make/install_bin \
${WRKSRC}/erts/etc/common/escript.c \
${WRKSRC}/lib/wx/configure.in
post-install:
ln -sf ../lib/erlang${MAJ_V}/lib/${EI}/bin/erl_call ${PREFIX}/bin/erl_call${MAJ_V}

View File

@ -1,4 +1,4 @@
# $OpenBSD: erlang.port.mk,v 1.22 2015/11/05 08:22:50 jasper Exp $
# $OpenBSD: erlang.port.mk,v 1.23 2016/06/30 07:19:23 jasper Exp $
#
# Module for Erlang-based ports or modules
@ -13,9 +13,9 @@ MODERL_DEFAULT_VERSION =16
# 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 ?= erlang17 erlang18
FLAVORS ?= erlang17 erlang18 erlang19
.else
FLAVORS += erlang17 erlang18
FLAVORS += erlang17 erlang18 erlang19
.endif
FLAVOR?= # empty
@ -27,6 +27,9 @@ _MODERL_FLAVOR = ${FLAVOR}
.elif ${FLAVOR:Merlang18}
MODERL_VERSION = 18
_MODERL_FLAVOR = ${FLAVOR}
.elif ${FLAVOR:Merlang19}
MODERL_VERSION = 19
_MODERL_FLAVOR = ${FLAVOR}
.else
MODERL_VERSION ?= ${MODERL_DEFAULT_VERSION}
_MODERL_FLAVOR ?= # empty
@ -38,6 +41,8 @@ _MODERL_FLAVOR = erlang16
_MODERL_FLAVOR = erlang17
.elif ${MODERL_VERSION} == 18
_MODERL_FLAVOR = erlang18
.elif ${MODERL_VERSION} == 19
_MODERL_FLAVOR = erlang19
.else
ERRORS += "Invalid MODERL_VERSION set: ${MODERL_VERSION}."
.endif