git: 7d6e05a09ab6 - main - lang/erlang-runtime24: copied from lang/erlang-runtime23 & updated
Dave Cottlehuber
dch at FreeBSD.org
Mon May 31 12:20:36 UTC 2021
The branch main has been updated by dch:
URL: https://cgit.FreeBSD.org/ports/commit/?id=7d6e05a09ab681df86a143f4edc4145f634825e4
commit 7d6e05a09ab681df86a143f4edc4145f634825e4
Author: Dave Cottlehuber <dch at FreeBSD.org>
AuthorDate: 2021-05-31 11:37:14 +0000
Commit: Dave Cottlehuber <dch at FreeBSD.org>
CommitDate: 2021-05-31 12:20:02 +0000
lang/erlang-runtime24: copied from lang/erlang-runtime23 & updated
- merge in SMP, THREADS, KPOLL options
- drop NATIVE & HIPE
- ODBC requires explicit "OFF" toggle now
- minor tweaks to patches
Differential Revision: https://reviews.freebsd.org/D30494
Reviewed By: olgeni
---
lang/Makefile | 1 +
lang/erlang-runtime24/Makefile | 150 +++++++++++++++++++++
lang/erlang-runtime24/distinfo | 5 +
lang/erlang-runtime24/files/patch-Makefile.in | 20 +++
lang/erlang-runtime24/files/patch-configure.src | 40 ++++++
.../files/patch-erts_etc_unix_run__erl.c | 12 ++
.../files/patch-lib_crypto_c__src_Makefile.in | 11 ++
.../files/patch-lib_stdlib_src_calendar.erl | 26 ++++
lang/erlang-runtime24/files/pkg-message.in | 8 ++
lang/erlang-runtime24/pkg-descr | 10 ++
10 files changed, 283 insertions(+)
diff --git a/lang/Makefile b/lang/Makefile
index f23ed4dcf888..b96f54c8a2fe 100644
--- a/lang/Makefile
+++ b/lang/Makefile
@@ -60,6 +60,7 @@
SUBDIR += erlang-runtime21
SUBDIR += erlang-runtime22
SUBDIR += erlang-runtime23
+ SUBDIR += erlang-runtime24
SUBDIR += erlang-wx
SUBDIR += execline
SUBDIR += expect
diff --git a/lang/erlang-runtime24/Makefile b/lang/erlang-runtime24/Makefile
new file mode 100644
index 000000000000..89dd41c4cbee
--- /dev/null
+++ b/lang/erlang-runtime24/Makefile
@@ -0,0 +1,150 @@
+PORTNAME= erlang
+DISTVERSIONPREFIX= OTP-
+DISTVERSION= 24.0.1
+PORTREVISION= 0
+CATEGORIES= lang parallel java
+PKGNAMESUFFIX= -runtime24
+DIST_SUBDIR= erlang
+
+MAINTAINER= erlang at FreeBSD.org
+COMMENT= Functional programming language from Ericsson
+
+LICENSE= APACHE20
+
+BROKEN_sparc64= Fails to build: error: fp_except undeclared
+
+USES= autoreconf:build gmake ncurses perl5
+USE_GITHUB= nodefault
+GH_ACCOUNT= erlang:otp,corba
+GH_PROJECT= otp:otp corba:corba
+GH_TAGNAME= 5.0.2:corba
+USE_PERL5= build
+
+GNU_CONFIGURE= yes
+CONFIGURE_ARGS= --enable-dirty-schedulers \
+ --enable-kernel-poll \
+ --enable-smp-support \
+ --enable-threads
+
+DATADIR= ${PREFIX}/share/${PORTNAME}${PKGNAMESUFFIX}
+SUB_FILES= pkg-message
+SUB_LIST= ERLANG_LIB=${ERLANG_LIB}
+
+WRKSRC= ${WRKSRC_otp}
+
+ERLANG_LIB= ${PORTNAME}${PORTVERSION:C/\..*//}
+
+OPTIONS_DEFINE= CORBA DTRACE JAVA ODBC OPENSSL SCTP SHARING WX
+OPTIONS_DEFAULT= CORBA DTRACE OPENSSL SCTP SHARING
+
+.if !exists(/usr/sbin/dtrace)
+OPTIONS_EXCLUDE+= DTRACE
+.endif
+
+OPTIONS_EXCLUDE_DragonFly= SCTP
+# ld(1) fails to link probes: missing __dtrace_erlang___* symbols
+# see also https://reviews.freebsd.org/D22360
+# WX breaks on aarch64, still working on this in BZ256289
+OPTIONS_EXCLUDE_aarch64= DTRACE WX
+OPTIONS_EXCLUDE_armv6= DTRACE
+OPTIONS_EXCLUDE_armv7= DTRACE
+OPTIONS_EXCLUDE_i386= DTRACE
+OPTIONS_EXCLUDE_riscv64= DTRACE
+
+CORBA_DESC= Enable Corba support
+SCTP_DESC= Enable SCTP support
+SHARING_DESC= Enable term copy-and-share 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.
+
+DTRACE_CONFIGURE_WITH= dynamic-trace=dtrace
+DTRACE_CFLAGS= -fno-omit-frame-pointer
+DTRACE_VARS= STRIP=""
+JAVA_CONFIGURE_WITH= javac
+JAVA_CONFIGURE_ENV= ac_cv_prog_JAVAC="${JAVAC}"
+JAVA_VARS= USE_JAVA=yes
+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}
+SCTP_CONFIGURE_ENABLE= sctp
+SHARING_CONFIGURE_ENABLE= sharing-preserving
+WX_USES= gl
+WX_CONFIGURE_WITH= wx-config=${WX_CONFIG}
+WX_VARS= USE_GL="gl glu" \
+ USE_WX=3.1+ \
+ WX_COMPS="wx"
+
+.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
+
+post-configure-ODBC-off:
+ echo "disabled by port options" > ${WRKSRC}/lib/odbc/SKIP
+
+post-build-CORBA-on:
+ cd ${WRKSRC_corba} \
+ && ${SETENV} OVERRIDE_TARGET=${CONFIGURE_TARGET} ERL_TOP=${WRKSRC_otp} ${MAKE_CMD}
+
+post-install-CORBA-on:
+ cd ${WRKSRC_corba} \
+ && ${SETENV} OVERRIDE_TARGET=${CONFIGURE_TARGET} ERL_TOP=${WRKSRC_otp} \
+ ${MAKE_CMD} release RELEASE_ROOT=${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}
+
+post-install-DTRACE-on:
+ ${MKDIR} ${STAGEDIR}${DATADIR}/dtrace
+ ${INSTALL_DATA} ${WRKSRC}/erts/emulator/beam/*.d \
+ ${WRKSRC}/lib/runtime_tools/c_src/*.d \
+ ${WRKSRC}/lib/runtime_tools/examples/*.d \
+ ${STAGEDIR}${DATADIR}/dtrace
+
+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}/* ${DATADIR_REL}/* -type f -o -type l \
+ | ${SORT} >> ${TMPPLIST}
+
+.include <bsd.port.post.mk>
diff --git a/lang/erlang-runtime24/distinfo b/lang/erlang-runtime24/distinfo
new file mode 100644
index 000000000000..ea1207bce9da
--- /dev/null
+++ b/lang/erlang-runtime24/distinfo
@@ -0,0 +1,5 @@
+TIMESTAMP = 1622108009
+SHA256 (erlang/erlang-otp-OTP-24.0.1_GH0.tar.gz) = 372aac520fa73f6e5556eac56c41bf051c7e1713f9dd34ffb716f428cdcabbe1
+SIZE (erlang/erlang-otp-OTP-24.0.1_GH0.tar.gz) = 58860070
+SHA256 (erlang/erlang-corba-5.0.2_GH0.tar.gz) = d82b3efb0330870ac59a86ed96130b3e2caa7df5304e46b06dd79ad237686703
+SIZE (erlang/erlang-corba-5.0.2_GH0.tar.gz) = 1393602
diff --git a/lang/erlang-runtime24/files/patch-Makefile.in b/lang/erlang-runtime24/files/patch-Makefile.in
new file mode 100644
index 000000000000..699a2ea5767e
--- /dev/null
+++ b/lang/erlang-runtime24/files/patch-Makefile.in
@@ -0,0 +1,20 @@
+--- 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 = /erlang24
+ 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-runtime24/files/patch-configure.src b/lang/erlang-runtime24/files/patch-configure.src
new file mode 100644
index 000000000000..1d4dd2178a43
--- /dev/null
+++ b/lang/erlang-runtime24/files/patch-configure.src
@@ -0,0 +1,40 @@
+--- configure.src.orig 2021-05-27 09:36:50 UTC
++++ configure.src
+@@ -55,7 +55,7 @@ skip_applications=
+ while test $# != 0; do
+ case $1 in
+ -srcdir=* | --srcdir=*)
+- user_srcdir=`expr "$1" : '[^=]*=\(.*\)'`
++ user_srcdir=`expr -- "$1" : '[^=]*=\(.*\)'`
+ if test "$ERL_TOP" != ""; then
+ echo "WARNING: Overriding ERL_TOP with $user_srcdir" 1>&2
+ echo "" 1>&2
+@@ -95,7 +95,7 @@ while test $# != 0; do
+ echo "" 1>&2
+ ;;
+ -cache-file=* | --cache-file=* )
+- static_cache=`expr "$1" : '[^=]*=\(.*\)'`
++ static_cache=`expr -- "$1" : '[^=]*=\(.*\)'`
+ if test "$static_cache" != "/dev/null"; then
+ echo "WARNING: Only using config cache file '$static_cache' as static cache" 1>&2
+ echo "" 1>&2
+@@ -140,8 +140,8 @@ while test $# != 0; do
+ pie_ldflags="-no-pie"
+ ;;
+ CFLAGS=* | LDFLAGS=*)
+- flgs_var=`expr "$1" : '\([^=]*\)=.*'`
+- flgs_val=`expr "$1" : '[^=]*=\(.*\)'`
++ flgs_var=`expr -- "$1" : '\([^=]*\)=.*'`
++ flgs_val=`expr -- "$1" : '[^=]*=\(.*\)'`
+ eval $flgs_var=\$flgs_val
+ ;;
+ --help=r* | -help=r*)
+@@ -151,7 +151,7 @@ while test $# != 0; do
+ *)
+ case $1 in
+ --without-*)
+- skip_app=`expr "$1" : '--without-\(.*\)'`
++ skip_app=`expr -- "$1" : '--without-\(.*\)'`
+ if [ "$skip_app" = "stdlib" ] ||
+ [ "$skip_app" = "kernel" ] ||
+ [ "$skip_app" = "sasl" ] ||
diff --git a/lang/erlang-runtime24/files/patch-erts_etc_unix_run__erl.c b/lang/erlang-runtime24/files/patch-erts_etc_unix_run__erl.c
new file mode 100644
index 000000000000..b76c5127d2a8
--- /dev/null
+++ b/lang/erlang-runtime24/files/patch-erts_etc_unix_run__erl.c
@@ -0,0 +1,12 @@
+--- 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-runtime24/files/patch-lib_crypto_c__src_Makefile.in b/lang/erlang-runtime24/files/patch-lib_crypto_c__src_Makefile.in
new file mode 100644
index 000000000000..8397bcac2200
--- /dev/null
+++ b/lang/erlang-runtime24/files/patch-lib_crypto_c__src_Makefile.in
@@ -0,0 +1,11 @@
+--- lib/crypto/c_src/Makefile.in.orig 2021-05-27 09:40:45 UTC
++++ lib/crypto/c_src/Makefile.in
+@@ -136,7 +136,7 @@ endif
+ endif
+
+ ifeq ($(DYNAMIC_OR_WIN_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-runtime24/files/patch-lib_stdlib_src_calendar.erl b/lang/erlang-runtime24/files/patch-lib_stdlib_src_calendar.erl
new file mode 100644
index 000000000000..34b753d85b27
--- /dev/null
+++ b/lang/erlang-runtime24/files/patch-lib_stdlib_src_calendar.erl
@@ -0,0 +1,26 @@
+--- 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-runtime24/files/pkg-message.in b/lang/erlang-runtime24/files/pkg-message.in
new file mode 100644
index 000000000000..3564b8665b2a
--- /dev/null
+++ b/lang/erlang-runtime24/files/pkg-message.in
@@ -0,0 +1,8 @@
+[
+{ 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-runtime24/pkg-descr b/lang/erlang-runtime24/pkg-descr
new file mode 100644
index 000000000000..bfcf2ba8ac82
--- /dev/null
+++ b/lang/erlang-runtime24/pkg-descr
@@ -0,0 +1,10 @@
+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 24
+to be used during the development of OTP applications.
+
+WWW: https://www.erlang.org/
More information about the dev-commits-ports-all
mailing list