From nobody Fri May 19 10:00:39 2023 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QN2Qv6W6pz4BlKj; Fri, 19 May 2023 10:00:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QN2Qv65Cyz4Nk9; Fri, 19 May 2023 10:00:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684490439; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IWkOhdwzxowwsx+jgD7hp9lrxndVHKMurXtr+PWDr/I=; b=R8lUcpKHlATLms9qfveQr6m3EdG+HoEYhk5Do+V/y7VqeHeBKugfw9B6+9+NM6EB1iV3PR /6vblH+tRZO0VIgH+DpmMk+gn4axuQoDB2AYWjT/WCKQ+fpcRTN4XSHPOiN7ha0Li+MMQD 4KbDKFpfjyG6D4WT/4ZBjo5glPc9+7dnCOt9gP8ZWxBoz37xPW3Yjjr1mh80+cl9sMqXr+ T5X6rAGMr61Gv/6+RMYSVOhG7u2yQCWLgm4sxDPQFgIfyBmffmJpVUaa+JaDt/Ge6x72GH 5gVZO8Tio4jkRf5LrDgANOSKBQ8c0R+GOLwJvNXomoD8QgqRXVDh6A6zqD5wog== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684490439; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IWkOhdwzxowwsx+jgD7hp9lrxndVHKMurXtr+PWDr/I=; b=Go34BVIT5s9zzZ1rAXNq1er5iYpXL5neoHGEN69FJqpNkYFtH7OjNqZcR4Yxm//stKbbfX 71NNSr+xMSmO6E/IW4NjoToYSTtdTCU6AP/DyKgD2s0bSRt56Z/AiPIJ7DeT0kPjL1852u /By3Ka9MSmGwQ/7A/JSFOgOcIcIW6Pb4jDOv8qqljMJiXp5fhiocwybDcaUsUl5z38ABrF d5NLfsvyMKI/InfUVFrQ3z5OzDPn55OsXlA76zzCCyPbxcq+7hd9mFUVej6Emb+r5lXDVm mpxpsz8Xn/2C+NTKUstNvlN9UE4z0tJb51Ktm5r37JV9zwsXNEHwzQw0ffkzPA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1684490439; a=rsa-sha256; cv=none; b=ZW/3HckaTanJXVFPKsnGBaS/GrGYhHN1vWKPii0ebUyvvCGRiT/JABiFlatAvgzqIPJkGE I+fKCjyg+u5jXZydHNmOqsd6R53fbWQH1ilLAkqfUCRcNQJ7ZtqyFc24cEPzjvaPjlXkbA VyuLugYGMmQQbTEJVeXNHq9mUGrH+3HVM6VBrrV3FZXAJwxny3zn/O8F09IAT5QcthsyZk Zw6wfRViW3F48fxreWi6t5kXmiPIQ50BKA+QS08i7LJlXI3dhJTvQNyUrseVrfYbnZfSlj 2ft7qYwgr2OuN0Z7Y/mJKCH+iuTtQF5AyGYDNknObeCr4Yr82qy4HxQN68VeaQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QN2Qv5945zN8h; Fri, 19 May 2023 10:00:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 34JA0dh1093498; Fri, 19 May 2023 10:00:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34JA0dSQ093497; Fri, 19 May 2023 10:00:39 GMT (envelope-from git) Date: Fri, 19 May 2023 10:00:39 GMT Message-Id: <202305191000.34JA0dSQ093497@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dave Cottlehuber Subject: git: 73d4e6734cbf - main - lang/erlang-runtime26: new port derived from erlang-runtime25 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dch X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 73d4e6734cbf36f8f0b1182cc9bb73a9a08e44f1 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dch: URL: https://cgit.FreeBSD.org/ports/commit/?id=73d4e6734cbf36f8f0b1182cc9bb73a9a08e44f1 commit 73d4e6734cbf36f8f0b1182cc9bb73a9a08e44f1 Author: Dave Cottlehuber AuthorDate: 2023-05-19 10:00:33 +0000 Commit: Dave Cottlehuber CommitDate: 2023-05-19 10:00:33 +0000 lang/erlang-runtime26: new port derived from erlang-runtime25 OTP-26 is the annual major release from Ericsson's Erlang/OTP team. - https://www.erlang.org/news/164 - https://erlang.org/download/otp_src_26.0.readme Reviewed by: dumbbell Sponsored by: VMware, Inc. Sponsored by: SkunkWerks, GmbH Differential Revision: https://reviews.freebsd.org/D40126 --- lang/Makefile | 1 + lang/erlang-runtime26/Makefile | 166 +++++++++++++++++++++ lang/erlang-runtime26/distinfo | 5 + lang/erlang-runtime26/files/patch-Makefile.in | 20 +++ .../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-runtime26/files/pkg-message.in | 8 + lang/erlang-runtime26/pkg-descr | 8 + 9 files changed, 257 insertions(+) diff --git a/lang/Makefile b/lang/Makefile index 1d0386841793..5fee1416606c 100644 --- a/lang/Makefile +++ b/lang/Makefile @@ -59,6 +59,7 @@ SUBDIR += erlang-runtime23 SUBDIR += erlang-runtime24 SUBDIR += erlang-runtime25 + SUBDIR += erlang-runtime26 SUBDIR += erlang-wx SUBDIR += execline SUBDIR += expect diff --git a/lang/erlang-runtime26/Makefile b/lang/erlang-runtime26/Makefile new file mode 100644 index 000000000000..e82621b3d033 --- /dev/null +++ b/lang/erlang-runtime26/Makefile @@ -0,0 +1,166 @@ +PORTNAME= erlang +DISTVERSIONPREFIX= OTP- +DISTVERSION= 26.0 +PORTREVISION= 0 +CATEGORIES= lang parallel java +PKGNAMESUFFIX= -runtime26 +DIST_SUBDIR= erlang + +MAINTAINER= erlang@FreeBSD.org +COMMENT= Functional programming language from Ericsson +WWW= https://www.erlang.org/ + +LICENSE= APACHE20 + +BROKEN_sparc64= Fails to build: error: fp_except undeclared + +USES= compiler cpe gmake ncurses perl5 +CPE_VENDOR= erlang +CPE_PRODUCT= erlang/otp +USE_GITHUB= nodefault +GH_ACCOUNT= erlang:otp,corba +GH_PROJECT= otp:otp corba:corba +GH_TAGNAME= 5.1:corba +USE_PERL5= build + +GNU_CONFIGURE= yes +CONFIGURE_ARGS= --enable-dirty-schedulers \ + --enable-kernel-poll \ + --enable-smp-support \ + --enable-threads +MAKE_ARGS= all + +_ERLANG_LIB= ${PORTNAME}${PORTVERSION:C/\..*//} + +DATADIR= ${PREFIX}/share/${PORTNAME}${PKGNAMESUFFIX} +SUB_FILES= pkg-message +SUB_LIST= _ERLANG_LIB=${_ERLANG_LIB} + +WRKSRC= ${WRKSRC_otp} + +OPTIONS_DEFINE= CHUNKS CORBA DTRACE JAVA KQUEUE ODBC OPENSSL SCTP \ + SHARING WX +OPTIONS_DEFAULT= CORBA DTRACE KQUEUE 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 +OPTIONS_EXCLUDE_aarch64= DTRACE +OPTIONS_EXCLUDE_armv6= DTRACE +OPTIONS_EXCLUDE_armv7= DTRACE +OPTIONS_EXCLUDE_i386= DTRACE +OPTIONS_EXCLUDE_riscv64= DTRACE + +CHUNKS_DESC= Enable in-line documentation in Erlang console +CORBA_DESC= Enable Corba support +KQUEUE_DESC= Enable Kernel Poll (kqueue) 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. + +CHUNKS_MAKE_ARGS+= DOC_TARGETS=chunks \ + docs +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 +KQUEUE_CONFIGURE_ENABLE= kernel-poll +ODBC_LIB_DEPENDS= libodbc.so:databases/unixODBC +ODBC_USES= localbase +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.2+ \ + WX_COMPS="wx" + +.include + +.if ${COMPILER_TYPE} == clang && ${COMPILER_VERSION} >= 130 +# PR 258494 +CONFIGURE_ARGS+= --disable-pgo +.endif + +.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-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 diff --git a/lang/erlang-runtime26/distinfo b/lang/erlang-runtime26/distinfo new file mode 100644 index 000000000000..d64261d30c74 --- /dev/null +++ b/lang/erlang-runtime26/distinfo @@ -0,0 +1,5 @@ +TIMESTAMP = 1684233152 +SHA256 (erlang/erlang-otp-OTP-26.0_GH0.tar.gz) = 29a50b17cb4bc326f01e4cbb2badb6a31ec586525f7c2f29166a0c6229b53f24 +SIZE (erlang/erlang-otp-OTP-26.0_GH0.tar.gz) = 61355457 +SHA256 (erlang/erlang-corba-5.1_GH0.tar.gz) = 03497d71098c474b330794dd523ef19ef20a47c0e2d441009d6cf929455c468f +SIZE (erlang/erlang-corba-5.1_GH0.tar.gz) = 1392861 diff --git a/lang/erlang-runtime26/files/patch-Makefile.in b/lang/erlang-runtime26/files/patch-Makefile.in new file mode 100644 index 000000000000..bf067367931e --- /dev/null +++ b/lang/erlang-runtime26/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 = /erlang26 + 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-runtime26/files/patch-erts_etc_unix_run__erl.c b/lang/erlang-runtime26/files/patch-erts_etc_unix_run__erl.c new file mode 100644 index 000000000000..b76c5127d2a8 --- /dev/null +++ b/lang/erlang-runtime26/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 + #endif +-#ifdef HAVE_UTIL_H +-# include +-#endif + #ifdef HAVE_SYS_IOCTL_H + # include + #endif diff --git a/lang/erlang-runtime26/files/patch-lib_crypto_c__src_Makefile.in b/lang/erlang-runtime26/files/patch-lib_crypto_c__src_Makefile.in new file mode 100644 index 000000000000..8397bcac2200 --- /dev/null +++ b/lang/erlang-runtime26/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-runtime26/files/patch-lib_stdlib_src_calendar.erl b/lang/erlang-runtime26/files/patch-lib_stdlib_src_calendar.erl new file mode 100644 index 000000000000..34b753d85b27 --- /dev/null +++ b/lang/erlang-runtime26/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-runtime26/files/pkg-message.in b/lang/erlang-runtime26/files/pkg-message.in new file mode 100644 index 000000000000..bc656f93e1a6 --- /dev/null +++ b/lang/erlang-runtime26/files/pkg-message.in @@ -0,0 +1,8 @@ +[ +{ type: install + message: <