Unplug unused lang/erlang/19 (avoids -fno-common)

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
2 messages Options
Reply | Threaded
Open this post in threaded view
|

Unplug unused lang/erlang/19 (avoids -fno-common)

Greg Steuck-5
I tested that benchmarks/tsung still works as a proxy for
all-things-erlang21. This is to be followed by erlang/19 directory
removal.

OK?

Subject: [PATCH] Unplug unused lang/erlang/19

Removed support from elrang.port.mk leaving the multi-version
structure in place for future use.
---
 lang/erlang/Makefile       |  1 -
 lang/erlang/erlang.port.mk | 13 ++++---------
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git lang/erlang/Makefile lang/erlang/Makefile
index 36278c0aed4..d39ce7af68f 100644
--- lang/erlang/Makefile
+++ lang/erlang/Makefile
@@ -1,7 +1,6 @@
 # $OpenBSD: Makefile,v 1.71 2020/03/16 16:07:45 jasper Exp $
 
     SUBDIR =
-    SUBDIR += 19
     SUBDIR += 21
 
 .include <bsd.port.subdir.mk>
diff --git lang/erlang/erlang.port.mk lang/erlang/erlang.port.mk
index 9536e0506b1..9b2e2f671ee 100644
--- lang/erlang/erlang.port.mk
+++ lang/erlang/erlang.port.mk
@@ -13,18 +13,15 @@ MODERL_DEFAULT_VERSION =21
 # 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 ?= erlang19 erlang21
+FLAVORS ?= erlang21
 .else
-FLAVORS += erlang19 erlang21
+FLAVORS += erlang21
 .endif
 
 FLAVOR?= # empty
 
 # When no flavor is explicitly set, assume MODERL_DEFAULT_VERSION
-.if ${FLAVOR:Merlang19}
-MODERL_VERSION = 19
-_MODERL_FLAVOR = ${FLAVOR}
-.elif ${FLAVOR:Merlang21}
+.if ${FLAVOR:Merlang21}
 MODERL_VERSION = 21
 _MODERL_FLAVOR = ${FLAVOR}
 .else
@@ -32,9 +29,7 @@ MODERL_VERSION ?= ${MODERL_DEFAULT_VERSION}
 _MODERL_FLAVOR ?= # empty
 .endif
 
-.if ${MODERL_VERSION} == 19
-_MODERL_FLAVOR = erlang19
-.elif ${MODERL_VERSION} == 21
+.if ${MODERL_VERSION} == 21
 _MODERL_FLAVOR = erlang21
 .else
 ERRORS += "Invalid MODERL_VERSION set: ${MODERL_VERSION}."
--
2.30.1

Reply | Threaded
Open this post in threaded view
|

Re: Unplug unused lang/erlang/19 (avoids -fno-common)

Christian Weisgerber
Greg Steuck:

> I tested that benchmarks/tsung still works as a proxy for
> all-things-erlang21. This is to be followed by erlang/19 directory
> removal.

devel/rebar and devel/rebar3 still have erlang19 flavors.

--
Christian "naddy" Weisgerber                          [hidden email]