From owner-dev-commits-ports-all@freebsd.org Sun Jun 20 11:06:43 2021 Return-Path: Delivered-To: dev-commits-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 3E8B764D789; Sun, 20 Jun 2021 11:06:43 +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 4G78xG6CGvz4qDG; Sun, 20 Jun 2021 11:06:42 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 A107DA82; Sun, 20 Jun 2021 11:06:42 +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 15KB6gWe061750; Sun, 20 Jun 2021 11:06:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 15KB6gFB061747; Sun, 20 Jun 2021 11:06:42 GMT (envelope-from git) Date: Sun, 20 Jun 2021 11:06:42 GMT Message-Id: <202106201106.15KB6gFB061747@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: f20332d14c67 - main - lang/erlang-runtime24: enable WX GUI on arm64 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: f20332d14c677f3715fcc75b1e96797bd1341f22 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 20 Jun 2021 11:06:43 -0000 The branch main has been updated by dch: URL: https://cgit.FreeBSD.org/ports/commit/?id=f20332d14c677f3715fcc75b1e96797bd1341f22 commit f20332d14c677f3715fcc75b1e96797bd1341f22 Author: Dave Cottlehuber AuthorDate: 2021-06-01 06:53:15 +0000 Commit: Dave Cottlehuber CommitDate: 2021-06-20 11:03:30 +0000 lang/erlang-runtime24: enable WX GUI on arm64 - enable now-working WX on all architectures - use LOCALBASE instead of hard-wired paths - enable inline erlang console doc chunks - specify ALL as make target so that doc chunks don't conflict doc chunks are still not injected but we're going in the right direction Differential Revision: https://reviews.freebsd.org/D30623 --- lang/erlang-runtime24/Makefile | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/lang/erlang-runtime24/Makefile b/lang/erlang-runtime24/Makefile index 6f7331445efb..ccd445ab1304 100644 --- a/lang/erlang-runtime24/Makefile +++ b/lang/erlang-runtime24/Makefile @@ -1,7 +1,7 @@ PORTNAME= erlang DISTVERSIONPREFIX= OTP- DISTVERSION= 24.0.2 -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= lang parallel java PKGNAMESUFFIX= -runtime24 DIST_SUBDIR= erlang @@ -25,6 +25,7 @@ CONFIGURE_ARGS= --enable-dirty-schedulers \ --enable-kernel-poll \ --enable-smp-support \ --enable-threads +MAKE_ARGS= all DATADIR= ${PREFIX}/share/${PORTNAME}${PKGNAMESUFFIX} SUB_FILES= pkg-message @@ -34,8 +35,8 @@ 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 +OPTIONS_DEFINE= CHUNKS CORBA DTRACE JAVA ODBC OPENSSL SCTP SHARING WX +OPTIONS_DEFAULT= CHUNKS CORBA DTRACE OPENSSL SCTP SHARING .if !exists(/usr/sbin/dtrace) OPTIONS_EXCLUDE+= DTRACE @@ -44,13 +45,13 @@ OPTIONS_EXCLUDE+= DTRACE 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_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 SCTP_DESC= Enable SCTP support SHARING_DESC= Enable term copy-and-share support @@ -60,6 +61,7 @@ WX_DESC= Enable WX application # probes fixed does not match the number of defined probes (54 != 132, # respectively)" you probably misconfigured DTrace in some way. +CHUNKS_MAKE_ARGS+= docs DOC_TARGETS=chunks DTRACE_CONFIGURE_WITH= dynamic-trace=dtrace DTRACE_CFLAGS= -fno-omit-frame-pointer DTRACE_VARS= STRIP="" @@ -68,8 +70,7 @@ 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 +ODBC_USES= localbase OPENSSL_USES= ssl OPENSSL_CONFIGURE_WITH= ssl=${OPENSSLBASE} SCTP_CONFIGURE_ENABLE= sctp