git: 9856844d0dcb - main - lang/erlang-runtime20: remove
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Mon, 04 Oct 2021 19:51:01 UTC
The branch main has been updated by dch:
URL: https://cgit.FreeBSD.org/ports/commit/?id=9856844d0dcbcf4254e73d2505ade5351d702310
commit 9856844d0dcbcf4254e73d2505ade5351d702310
Author: Dave Cottlehuber <dch@FreeBSD.org>
AuthorDate: 2021-10-04 08:42:47 +0000
Commit: Dave Cottlehuber <dch@FreeBSD.org>
CommitDate: 2021-10-04 19:50:26 +0000
lang/erlang-runtime20: remove
version is unsupported upstream
Approved by: erlang (with hat)
---
MOVED | 1 +
lang/Makefile | 1 -
lang/erlang-runtime20/Makefile | 142 ---------------------
lang/erlang-runtime20/distinfo | 3 -
lang/erlang-runtime20/files/patch-Makefile.in | 20 ---
.../files/patch-erts_emulator_beam_erl__alloc.c | 11 --
.../files/patch-erts_emulator_beam_erl__alloc.h | 11 --
.../files/patch-erts_emulator_beam_global.h | 13 --
.../files/patch-erts_etc_unix_run__erl.c | 12 --
.../files/patch-lib_crypto_c__src_Makefile.in | 11 --
.../files/patch-lib_crypto_priv_Makefile | 11 --
.../files/patch-lib_hipe_llvm_hipe__llvm__main.erl | 11 --
.../files/patch-lib_stdlib_src_calendar.erl | 26 ----
lang/erlang-runtime20/files/pkg-message.in | 8 --
lang/erlang-runtime20/pkg-descr | 10 --
15 files changed, 1 insertion(+), 290 deletions(-)
diff --git a/MOVED b/MOVED
index 5b26ef9844cc..b02254793e0f 100644
--- a/MOVED
+++ b/MOVED
@@ -16500,3 +16500,4 @@ mail/postfix35|mail/postfix|2021-09-30|Has expired: It is only here until FreeBS
graphics/drm-fbsd11.2-kmod||2021-09-30|Removed, only useful on EOL FreeBSD 11.4
devel/qca-legacy|devel/qca|2021-09-30|Removed, only useful on EOL FreeBSD 11.4
www/py-pyjwt|www/py-pyjwt1|2021-10-02|Renamed to prepare for the addition of v2.x to the tree
+lang/erlang-runtime20|lang/erlang-runtime22|2021-10-01|Has expired: no longer supported upstream, use lang/erlang >=22
diff --git a/lang/Makefile b/lang/Makefile
index a52e2b79ea38..138f46ae4aab 100644
--- a/lang/Makefile
+++ b/lang/Makefile
@@ -57,7 +57,6 @@
SUBDIR += erlang-java
SUBDIR += erlang-man
SUBDIR += erlang-riak
- SUBDIR += erlang-runtime20
SUBDIR += erlang-runtime21
SUBDIR += erlang-runtime22
SUBDIR += erlang-runtime23
diff --git a/lang/erlang-runtime20/Makefile b/lang/erlang-runtime20/Makefile
deleted file mode 100644
index c54be06caaeb..000000000000
--- a/lang/erlang-runtime20/Makefile
+++ /dev/null
@@ -1,142 +0,0 @@
-# Created by: ruslan@shevchenko.kiev.ua
-
-PORTNAME= erlang
-DISTVERSIONPREFIX= OTP-
-DISTVERSION= 20.3.8.26
-PORTREVISION= 5
-CATEGORIES= lang parallel java
-PKGNAMESUFFIX= -runtime20
-DIST_SUBDIR= erlang
-
-MAINTAINER= erlang@FreeBSD.org
-COMMENT= Functional programming language from Ericsson
-
-LICENSE= APACHE20
-
-BROKEN_sparc64= Fails to build: error: fp_except undeclared
-
-USES= autoreconf:build cpe gmake ncurses perl5
-USE_GITHUB= yes
-GH_PROJECT= otp
-USE_PERL5= build
-
-CPE_VENDOR= erlang
-CPE_PRODUCT= erlang/otp
-
-GNU_CONFIGURE= yes
-CONFIGURE_ARGS= --enable-smp-support
-
-MAKE_JOBS_UNSAFE= yes
-
-SUB_FILES= pkg-message
-SUB_LIST= ERLANG_LIB=${ERLANG_LIB}
-
-ERLANG_LIB= ${PORTNAME}${PORTVERSION:C/\..*//}
-
-OPTIONS_DEFINE= DIRTY DTRACE HIPE JAVA KQUEUE NATIVE ODBC OPENSSL SCTP \
- THREADS WX
-OPTIONS_DEFAULT= DIRTY DTRACE HIPE KQUEUE OPENSSL SCTP THREADS
-
-.if !exists(/usr/sbin/dtrace)
-OPTIONS_EXCLUDE+= DTRACE
-.endif
-
-OPTIONS_EXCLUDE_DragonFly= HIPE NATIVE SCTP
-# ld(1) fails to link probes: missing __dtrace_erlang___* symbols
-OPTIONS_EXCLUDE_aarch64= DTRACE
-OPTIONS_EXCLUDE_armv6= DTRACE
-OPTIONS_EXCLUDE_armv7= DTRACE
-OPTIONS_EXCLUDE_i386= DTRACE HIPE NATIVE
-OPTIONS_EXCLUDE_powerpc64= HIPE
-OPTIONS_EXCLUDE_powerpc64le= HIPE
-OPTIONS_EXCLUDE_riscv64= DTRACE
-
-DIRTY_DESC= Enable Dirty schedulers
-HIPE_DESC= Build native HiPE compiler
-KQUEUE_DESC= Enable Kernel Poll (kqueue) support
-NATIVE_DESC= Enable native libraries
-SCTP_DESC= Enable SCTP support
-WX_DESC= Enable WX application
-
-# If you run Erlang and get a message resembling "WARNING: number of
-# probes fixed does not match the number of defined probes (54 != 132,
-# respectively)" you probably misconfigured DTrace in some way.
-
-DIRTY_CONFIGURE_ENABLE= dirty-schedulers
-DTRACE_CONFIGURE_WITH= dynamic-trace=dtrace
-DTRACE_CFLAGS= -fno-omit-frame-pointer
-DTRACE_VARS= STRIP=""
-HIPE_CONFIGURE_ENABLE= hipe
-JAVA_CONFIGURE_WITH= javac
-JAVA_CONFIGURE_ENV= ac_cv_prog_JAVAC="${JAVAC}"
-JAVA_VARS= USE_JAVA=yes
-KQUEUE_CONFIGURE_ENABLE= kernel-poll
-NATIVE_IMPLIES= HIPE
-NATIVE_CONFIGURE_ENABLE= native-libs
-ODBC_LIB_DEPENDS= libodbc.so:databases/unixODBC
-ODBC_CONFIGURE_WITH= odbc
-ODBC_CFLAGS= -I/usr/local/include
-ODBC_LDFLAGS= -L/usr/local/lib
-OPENSSL_USES= ssl
-OPENSSL_CONFIGURE_WITH= ssl=${OPENSSLBASE}
-OPENSSL_VARS= BROKEN_SSL=openssl
-SCTP_CONFIGURE_ENABLE= sctp
-THREADS_CONFIGURE_ENABLE= threads
-WX_USES= gl
-WX_CONFIGURE_WITH= wx-config=${WX_CONFIG}
-WX_VARS= USE_GL="gl glu" \
- USE_WX=2.8+ \
- WX_COMPS="wx contrib"
-
-.include <bsd.port.pre.mk>
-
-.if ${OPSYS} == FreeBSD
-CFLAGS+= -DMAP_NORESERVE=0
-.endif
-
-.if ${ARCH} == i386
-MAKE_ARGS+= ARCH=x86
-.endif
-
-.if ${ARCH} == armv6 || ${ARCH} == armv7
-MAKE_ARGS+= ARCH=arm
-.endif
-
-pre-configure:
- @cd ${WRKSRC} && ./otp_build autoconf
-
-pre-configure-WX-off:
- echo "disabled by port options" > ${WRKSRC}/lib/debugger/SKIP
- echo "disabled by port options" > ${WRKSRC}/lib/et/SKIP
- echo "disabled by port options" > ${WRKSRC}/lib/observer/SKIP
- echo "disabled by port options" > ${WRKSRC}/lib/wx/SKIP
-
-post-configure-ODBC-on:
- ${RM} ${WRKSRC}/lib/odbc/SKIP
-
-pre-build-NATIVE-on:
- @cd ${WRKSRC} && ${MAKE_CMD} clean
-
-post-install-JAVA-off:
- ${RM} -r ${STAGEDIR}${PREFIX}/lib/erlang/lib/jinterface-*
-
-post-install-ODBC-off:
- ${RM} -r ${STAGEDIR}${PREFIX}/lib/erlang/lib/odbc-*
-
-post-install-OPENSSL-off:
- ${RM} -r ${STAGEDIR}${PREFIX}/lib/erlang/lib/crypto-*
- ${RM} -r ${STAGEDIR}${PREFIX}/lib/erlang/lib/ssh-*
- ${RM} -r ${STAGEDIR}${PREFIX}/lib/erlang/lib/ssl-*
-
-post-install-WX-off:
- ${RM} -r ${STAGEDIR}${PREFIX}/lib/erlang/lib/debugger-*
- ${RM} -r ${STAGEDIR}${PREFIX}/lib/erlang/lib/et-*
- ${RM} -r ${STAGEDIR}${PREFIX}/lib/erlang/lib/observer-*
- ${RM} -r ${STAGEDIR}${PREFIX}/lib/erlang/lib/wx-*
-
-post-stage:
- ${FIND} ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/* -type d -empty -delete
- @cd ${STAGEDIR}${PREFIX}; ${FIND} lib/${ERLANG_LIB}/* -type f -o -type l \
- | ${SORT} >> ${TMPPLIST}
-
-.include <bsd.port.post.mk>
diff --git a/lang/erlang-runtime20/distinfo b/lang/erlang-runtime20/distinfo
deleted file mode 100644
index 0ba7bb41a577..000000000000
--- a/lang/erlang-runtime20/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1582882280
-SHA256 (erlang/erlang-otp-OTP-20.3.8.26_GH0.tar.gz) = dce78b60938a48b887317e5222cff946fd4af36666153ab2f0f022aa91755813
-SIZE (erlang/erlang-otp-OTP-20.3.8.26_GH0.tar.gz) = 53557845
diff --git a/lang/erlang-runtime20/files/patch-Makefile.in b/lang/erlang-runtime20/files/patch-Makefile.in
deleted file mode 100644
index 16b0bc258d12..000000000000
--- a/lang/erlang-runtime20/files/patch-Makefile.in
+++ /dev/null
@@ -1,20 +0,0 @@
---- Makefile.in.orig 2015-06-23 18:56:21 UTC
-+++ Makefile.in
-@@ -60,7 +60,7 @@ bindir = @bindir@
- libdir = @libdir@
-
- # Where Erlang/OTP is located
--libdir_suffix = /erlang
-+libdir_suffix = /erlang20
- erlang_libdir = $(libdir)$(libdir_suffix)
- erlang_bindir = $(erlang_libdir)/bin
-
-@@ -1013,7 +1013,7 @@ $(TEST_DIRS):
- #
- # Order is important here, don't change it!
- #
--INST_DEP += install.dirs install.emulator install.libs install.Install install.otp_version install.bin
-+INST_DEP += install.dirs install.emulator install.libs install.Install install.otp_version
-
- install: $(INST_DEP)
-
diff --git a/lang/erlang-runtime20/files/patch-erts_emulator_beam_erl__alloc.c b/lang/erlang-runtime20/files/patch-erts_emulator_beam_erl__alloc.c
deleted file mode 100644
index b464b57ca736..000000000000
--- a/lang/erlang-runtime20/files/patch-erts_emulator_beam_erl__alloc.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- erts/emulator/beam/erl_alloc.c.orig 2018-03-13 20:11:05 UTC
-+++ erts/emulator/beam/erl_alloc.c
-@@ -122,7 +122,7 @@ typedef union {
- char align_afa[ERTS_ALC_CACHE_LINE_ALIGN_SIZE(sizeof(AFAllctr_t))];
- AOFFAllctr_t aoffa;
- char align_aoffa[ERTS_ALC_CACHE_LINE_ALIGN_SIZE(sizeof(AOFFAllctr_t))];
--} ErtsAllocatorState_t;
-+} ErtsAllocatorState_t erts_align_attribute(ERTS_CACHE_LINE_SIZE);
-
- static ErtsAllocatorState_t std_alloc_state;
- static ErtsAllocatorState_t ll_alloc_state;
diff --git a/lang/erlang-runtime20/files/patch-erts_emulator_beam_erl__alloc.h b/lang/erlang-runtime20/files/patch-erts_emulator_beam_erl__alloc.h
deleted file mode 100644
index 23a6b86b9ef7..000000000000
--- a/lang/erlang-runtime20/files/patch-erts_emulator_beam_erl__alloc.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- erts/emulator/beam/erl_alloc.h.orig 2020-08-28 21:30:14 UTC
-+++ erts/emulator/beam/erl_alloc.h
-@@ -146,7 +146,7 @@ typedef struct ErtsAllocatorWrapper_t_ {
- void (*unlock)(void);
- struct ErtsAllocatorWrapper_t_* next;
- }ErtsAllocatorWrapper_t;
--ErtsAllocatorWrapper_t *erts_allctr_wrappers;
-+extern ErtsAllocatorWrapper_t *erts_allctr_wrappers;
- extern int erts_allctr_wrapper_prelocked;
- extern erts_tsd_key_t erts_allctr_prelock_tsd_key;
- void erts_allctr_wrapper_prelock_init(ErtsAllocatorWrapper_t* wrapper);
diff --git a/lang/erlang-runtime20/files/patch-erts_emulator_beam_global.h b/lang/erlang-runtime20/files/patch-erts_emulator_beam_global.h
deleted file mode 100644
index 1f7dbc8f1806..000000000000
--- a/lang/erlang-runtime20/files/patch-erts_emulator_beam_global.h
+++ /dev/null
@@ -1,13 +0,0 @@
---- erts/emulator/beam/global.h.orig 2020-08-28 21:32:51 UTC
-+++ erts/emulator/beam/global.h
-@@ -959,8 +959,8 @@ void erts_update_ranges(BeamInstr* code, Uint size);
- void erts_remove_from_ranges(BeamInstr* code);
- UWord erts_ranges_sz(void);
- void erts_lookup_function_info(FunctionInfo* fi, BeamInstr* pc, int full_info);
--ErtsLiteralArea** erts_dump_lit_areas;
--Uint erts_dump_num_lit_areas;
-+extern ErtsLiteralArea** erts_dump_lit_areas;
-+extern Uint erts_dump_num_lit_areas;
-
- /* break.c */
- void init_break_handler(void);
diff --git a/lang/erlang-runtime20/files/patch-erts_etc_unix_run__erl.c b/lang/erlang-runtime20/files/patch-erts_etc_unix_run__erl.c
deleted file mode 100644
index b76c5127d2a8..000000000000
--- a/lang/erlang-runtime20/files/patch-erts_etc_unix_run__erl.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- erts/etc/unix/run_erl.c.orig 2015-03-31 12:32:52 UTC
-+++ erts/etc/unix/run_erl.c
-@@ -73,9 +73,6 @@
- #ifdef HAVE_UTMP_H
- # include <utmp.h>
- #endif
--#ifdef HAVE_UTIL_H
--# include <util.h>
--#endif
- #ifdef HAVE_SYS_IOCTL_H
- # include <sys/ioctl.h>
- #endif
diff --git a/lang/erlang-runtime20/files/patch-lib_crypto_c__src_Makefile.in b/lang/erlang-runtime20/files/patch-lib_crypto_c__src_Makefile.in
deleted file mode 100644
index 65e1b759ad66..000000000000
--- a/lang/erlang-runtime20/files/patch-lib_crypto_c__src_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- lib/crypto/c_src/Makefile.in.orig 2016-03-14 20:11:15 UTC
-+++ lib/crypto/c_src/Makefile.in
-@@ -90,7 +90,7 @@ endif
- DYNAMIC_CRYPTO_LIB=@SSL_DYNAMIC_ONLY@
-
- ifeq ($(DYNAMIC_CRYPTO_LIB),yes)
--SSL_DED_LD_RUNTIME_LIBRARY_PATH = @SSL_DED_LD_RUNTIME_LIBRARY_PATH@
-+SSL_DED_LD_RUNTIME_LIBRARY_PATH =
- CRYPTO_LINK_LIB=$(SSL_DED_LD_RUNTIME_LIBRARY_PATH) -L$(SSL_LIBDIR) -l$(SSL_CRYPTO_LIBNAME)
- EXTRA_FLAGS = -DHAVE_DYNAMIC_CRYPTO_LIB
- else
diff --git a/lang/erlang-runtime20/files/patch-lib_crypto_priv_Makefile b/lang/erlang-runtime20/files/patch-lib_crypto_priv_Makefile
deleted file mode 100644
index 26f2c38e360d..000000000000
--- a/lang/erlang-runtime20/files/patch-lib_crypto_priv_Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- lib/crypto/priv/Makefile.orig 2016-03-14 20:11:15 UTC
-+++ lib/crypto/priv/Makefile
-@@ -61,7 +61,7 @@ OBJS = $(OBJDIR)/crypto.o
- # ----------------------------------------------------
-
- $(SO_NIFLIB): $(OBJS)
-- $(SO_LD) $(SO_LDFLAGS) -L$(SO_SSL_LIBDIR) -Wl,-R$(SO_SSL_LIBDIR) \
-+ $(SO_LD) $(SO_LDFLAGS) -L$(SO_SSL_LIBDIR) \
- -o $@ $^ -lcrypto
-
- $(DLL_NIFLIB): $(OBJS)
diff --git a/lang/erlang-runtime20/files/patch-lib_hipe_llvm_hipe__llvm__main.erl b/lang/erlang-runtime20/files/patch-lib_hipe_llvm_hipe__llvm__main.erl
deleted file mode 100644
index 633d84504d99..000000000000
--- a/lang/erlang-runtime20/files/patch-lib_hipe_llvm_hipe__llvm__main.erl
+++ /dev/null
@@ -1,11 +0,0 @@
---- lib/hipe/llvm/hipe_llvm_main.erl.orig 2015-06-27 20:52:09 UTC
-+++ lib/hipe/llvm/hipe_llvm_main.erl
-@@ -474,7 +474,7 @@ unique_folder(FunName, Arity, Options) -
- true -> %% Store folder in current directory
- DirName;
- false -> %% Temporarily store folder in tempfs (/dev/shm/)
-- "/dev/shm/" ++ DirName
-+ "/tmp/" ++ DirName
- end,
- %% Make sure it does not exist
- case dir_exists(Dir) of
diff --git a/lang/erlang-runtime20/files/patch-lib_stdlib_src_calendar.erl b/lang/erlang-runtime20/files/patch-lib_stdlib_src_calendar.erl
deleted file mode 100644
index 34b753d85b27..000000000000
--- a/lang/erlang-runtime20/files/patch-lib_stdlib_src_calendar.erl
+++ /dev/null
@@ -1,26 +0,0 @@
---- lib/stdlib/src/calendar.erl.orig 2015-03-31 12:32:52 UTC
-+++ lib/stdlib/src/calendar.erl
-@@ -279,11 +279,19 @@ local_time_to_universal_time(DateTime, I
- DateTime1 :: datetime1970(),
- DateTime :: datetime1970().
- local_time_to_universal_time_dst(DateTime) ->
-- UtDst = erlang:localtime_to_universaltime(DateTime, true),
-- Ut = erlang:localtime_to_universaltime(DateTime, false),
- %% Reverse check the universal times
-- LtDst = erlang:universaltime_to_localtime(UtDst),
-- Lt = erlang:universaltime_to_localtime(Ut),
-+ {UtDst, LtDst} =
-+ try
-+ UtDst0 = erlang:localtime_to_universaltime(DateTime, true),
-+ {UtDst0, erlang:universaltime_to_localtime(UtDst0)}
-+ catch error:badarg -> {error, error}
-+ end,
-+ {Ut, Lt} =
-+ try
-+ Ut0 = erlang:localtime_to_universaltime(DateTime, false),
-+ {Ut0, erlang:universaltime_to_localtime(Ut0)}
-+ catch error:badarg -> {error, error}
-+ end,
- %% Return the valid universal times
- case {LtDst,Lt} of
- {DateTime,DateTime} when UtDst =/= Ut ->
diff --git a/lang/erlang-runtime20/files/pkg-message.in b/lang/erlang-runtime20/files/pkg-message.in
deleted file mode 100644
index 3564b8665b2a..000000000000
--- a/lang/erlang-runtime20/files/pkg-message.in
+++ /dev/null
@@ -1,8 +0,0 @@
-[
-{ type: install
- message: <<EOM
-To use this runtime port for development or testing, just prepend
-its binary path ("%%LOCALBASE%%/lib/%%ERLANG_LIB%%/bin") to your PATH variable.
-EOM
-}
-]
diff --git a/lang/erlang-runtime20/pkg-descr b/lang/erlang-runtime20/pkg-descr
deleted file mode 100644
index 89b0e4b7ad13..000000000000
--- a/lang/erlang-runtime20/pkg-descr
+++ /dev/null
@@ -1,10 +0,0 @@
-Erlang is a programming language used to build massively scalable soft
-real-time systems with requirements on high availability. Some of its
-uses are in telecoms, banking, e-commerce, computer telephony and
-instant messaging. Erlang's runtime system has built-in support for
-concurrency, distribution and fault tolerance.
-
-This port contains a standalone runtime environment of Erlang 20
-to be used during the development of OTP applications.
-
-WWW: https://www.erlang.org/