lang/erlang versions 20 and 21

classic Classic list List threaded Threaded
3 messages Options
Reply | Threaded
Open this post in threaded view
|

lang/erlang versions 20 and 21

William Orr-2
Hey,

This diff adds erlang major versions 20 and 21. Tested by building
elixir and running the test suite.

Given that erlang 16 is no longer supported, it may be a good idea
to remove that, however I haven't included that change in my diff.

The 20 and 21 dirs are included in the tarball.

Please CC me, since I'm not subscribed to ports@

Index: Makefile
===================================================================
RCS file: /cvs/ports/lang/erlang/Makefile,v
retrieving revision 1.67
diff -u -p -r1.67 Makefile
--- Makefile 30 Jun 2016 07:19:23 -0000 1.67
+++ Makefile 15 Sep 2018 23:35:00 -0000
@@ -5,5 +5,7 @@
     SUBDIR += 17
     SUBDIR += 18
     SUBDIR += 19
+    SUBDIR += 20
+    SUBDIR += 21
 
 .include <bsd.port.subdir.mk>
Index: erlang.port.mk
===================================================================
RCS file: /cvs/ports/lang/erlang/erlang.port.mk,v
retrieving revision 1.23
diff -u -p -r1.23 erlang.port.mk
--- erlang.port.mk 30 Jun 2016 07:19:23 -0000 1.23
+++ erlang.port.mk 15 Sep 2018 23:35:00 -0000
@@ -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 erlang19
+FLAVORS ?= erlang17 erlang18 erlang19 erlang20 erlang21
 .else
-FLAVORS += erlang17 erlang18 erlang19
+FLAVORS += erlang17 erlang18 erlang19 erlang20 erlang21
 .endif
 
 FLAVOR?= # empty
@@ -30,6 +30,12 @@ _MODERL_FLAVOR = ${FLAVOR}
 .elif ${FLAVOR:Merlang19}
 MODERL_VERSION = 19
 _MODERL_FLAVOR = ${FLAVOR}
+.elif ${FLAVOR:Merlang20}
+MODERL_VERSION = 20
+_MODERL_FLAVOR = ${FLAVOR}
+.elif ${FLAVOR:Merlang21}
+MODERL_VERSION = 21
+_MODERL_FLAVOR = ${FLAVOR}
 .else
 MODERL_VERSION ?= ${MODERL_DEFAULT_VERSION}
 _MODERL_FLAVOR ?= # empty
@@ -43,6 +49,10 @@ _MODERL_FLAVOR = erlang17
 _MODERL_FLAVOR = erlang18
 .elif ${MODERL_VERSION} == 19
 _MODERL_FLAVOR = erlang19
+.elif ${MODERL_VERSION} == 20
+_MODERL_FLAVOR = erlang20
+.elif ${MODERL_VERSION} == 21
+_MODERL_FLAVOR = erlang21
 .else
 ERRORS += "Invalid MODERL_VERSION set: ${MODERL_VERSION}."
 .endif



erlang2021.tar.gz (85K) Download Attachment
Reply | Threaded
Open this post in threaded view
|

Re: lang/erlang versions 20 and 21

Klemens Nanni-2
On Sat, Sep 15, 2018 at 05:19:40PM -0700, William Orr wrote:
> This diff adds erlang major versions 20 and 21. Tested by building
> elixir and running the test suite.
How did you do so when the respective devel/rebar flavours are missing?

kn:/usr/ports/lang/elixir:4362$ make MODERL_VERSION=21 test
===>  Checking files for elixir-1.7.3
`/var/distfiles/elixir-1.7.3.tar.gz' is up to date.
>> (SHA256) elixir-1.7.3.tar.gz: OK
Invalid FLAVOR set: erlang21 (in devel/rebar)
Fatal: Unknown flavor: erlang21 (in devel/rebar)
   (Possible flavors are: erlang16 erlang17 erlang18 erlang19 ). (in devel/rebar)
*** Error 1 in /usr/ports/devel/rebar (/usr/ports/infrastructure/mk/bsd.port.mk:3528 '.BEGIN': @exit 1)
Problem with dependency devel/rebar,erlang21
*** Error 1 in . (/usr/ports/infrastructure/mk/bsd.port.mk:2107 '/tmp/pobj/elixir-1.7.3/.dep-devel-rebar,erlang21')
*** Error 1 in . (/usr/ports/infrastructure/mk/bsd.port.mk:2498 '/tmp/pobj/elixir-1.7.3/.extract_done')
*** Error 1 in /usr/ports/lang/elixir (/usr/ports/infrastructure/mk/bsd.port.mk:2419 'test')


That said, we need to port https://github.com/erlang/rebar3 as our
rebar-2.6.2 is deprecated.

> Given that erlang 16 is no longer supported, it may be a good idea
> to remove that, however I haven't included that change in my diff.
I agree, but that's a job for after the 6.4 release.  Since 16 is the
default version in our tree, which should be next?  Either ways, this
should go through a bulk build.

> The 20 and 21 dirs are included in the tarball.
Both build fine on sparc64.

Reply | Threaded
Open this post in threaded view
|

Re: lang/erlang versions 20 and 21

William Orr-2

Klemens Nanni writes:

> On Sat, Sep 15, 2018 at 05:19:40PM -0700, William Orr wrote:
>> This diff adds erlang major versions 20 and 21. Tested by building
>> elixir and running the test suite.
> How did you do so when the respective devel/rebar flavours are missing?
>
> kn:/usr/ports/lang/elixir:4362$ make MODERL_VERSION=21 test
> ===>  Checking files for elixir-1.7.3
> `/var/distfiles/elixir-1.7.3.tar.gz' is up to date.
>>> (SHA256) elixir-1.7.3.tar.gz: OK
> Invalid FLAVOR set: erlang21 (in devel/rebar)
> Fatal: Unknown flavor: erlang21 (in devel/rebar)
>    (Possible flavors are: erlang16 erlang17 erlang18 erlang19 ). (in devel/rebar)
> *** Error 1 in /usr/ports/devel/rebar (/usr/ports/infrastructure/mk/bsd.port.mk:3528 '.BEGIN': @exit 1)
> Problem with dependency devel/rebar,erlang21
> *** Error 1 in . (/usr/ports/infrastructure/mk/bsd.port.mk:2107 '/tmp/pobj/elixir-1.7.3/.dep-devel-rebar,erlang21')
> *** Error 1 in . (/usr/ports/infrastructure/mk/bsd.port.mk:2498 '/tmp/pobj/elixir-1.7.3/.extract_done')
> *** Error 1 in /usr/ports/lang/elixir (/usr/ports/infrastructure/mk/bsd.port.mk:2419 'test')

Sorry, I should've been clear. I have a checkout of elixir on my machine,
and I was building HEAD and running their test suite that way. [1]

>
>
> That said, we need to port https://github.com/erlang/rebar3 as our
> rebar-2.6.2 is deprecated.
>
>> Given that erlang 16 is no longer supported, it may be a good idea
>> to remove that, however I haven't included that change in my diff.
> I agree, but that's a job for after the 6.4 release.  Since 16 is the
> default version in our tree, which should be next?

I don't really have an answer for this, unfortunately.

> Either ways, this
> should go through a bulk build.
>
>> The 20 and 21 dirs are included in the tarball.
> Both build fine on sparc64.

[1] https://paste.pound-python.org/show/Jf6YHj92SWwb2kyFX7m8/