From nobody Sat Feb 18 08:11:40 2023 X-Original-To: dev-commits-ports-main@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 4PJhGj0SRLz3rZq1; Sat, 18 Feb 2023 08:11:41 +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 4PJhGh6kcsz4GX9; Sat, 18 Feb 2023 08:11:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676707901; 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=EikzPhDUb8OiVJ3u/7aC53DL7UGkxIML3hQaRKxYhvM=; b=DWOUfsF49QMlM0tABO7AH6Xd8ggh5g/ek3uDIQ0ani5Ysmh79p+T071JHMCjDrl75obSbc 0DFjZNxjoXTedtBIdQGA3uflTFqacy3OJgPujeFQIZWkRp85mHojC5zOmgKQxnHddjgqce NIOhnfWLX09YvyrecG1SZ1/3tNbpYW0vroEpGhFmybV97veeHwPxwN0x5EhwIAcpQK9kRe WYO4aWWuTHDePT5sVcuyWmra+EqxPaWJXQnmwtvgNMjMOyw9AL/6hm2Ml59C9Cx7brW9CJ PQb45YTc14wogMg0R3ELpxUdYRzs2mmYlOhNcrQ2t2Ij45U7mrctonSZU5T8Gw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676707901; 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=EikzPhDUb8OiVJ3u/7aC53DL7UGkxIML3hQaRKxYhvM=; b=sRxYUT2HuiOcmGq3UIBKc/SZw6+LBysNfRRrJapVhLG67WglWDIIZuO5Xe2ALVfLYvSBoP N59iQUuCxKRh56FTB9kKT1j124nF7Wgc1fzQ89w45/zdZTC6m/PRqVzPVMUs6Ko+srwX2s B00LlsSZ883KcbZrlfkSdfD4y/K+aNQbmnMLHwUN/bM7f/hzvQhaaeTcsObQcKO59ixXY3 P1u690K6DnbouPrKpjOCRzzHCWQSDMdOJA7ErSaUvo5qQjSYgi50V30oEqZ/FlwRVskwEO gTb1Rc5bmT/p02ZWeEBaSpdTXC2R2uFRT1ZRJxkQpdB6mErSSIbiY9uN63oi9A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1676707901; a=rsa-sha256; cv=none; b=UKyfTPp86vf0FA/Jq1YH2uLNhFCHLCwcb1cNi0DI6qq/Th63cuPmPNuY0IkePf5GVkYLjv 6/vzURaW4GUgDakp3uf7Bl1aFBVzPpvtDbw6kiMdrqMH36fOosEyIuJx3woB1UfbEBCRyS rPa/hjSl4enIcb0cZO6RHr8kfklPD9Jmij/IuoEnMopNaOMeeojXY1h1PnkFTz7KH63kFF Vt7uX8UtWXsZeE3ipJp9XM2AwIXEGbswz8WhOSi5CinLlIuN1s50YfBuWxu8OwQ2tK0zxA L3iJcTWk7JXCuxUt1grPcRW/4gWlIDx0o5m0yK+V8S2dkSgECG7H1QhEXTUAaw== 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 4PJhGh5djGzFRY; Sat, 18 Feb 2023 08:11:40 +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 31I8BeGI050799; Sat, 18 Feb 2023 08:11:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31I8BeiW050798; Sat, 18 Feb 2023 08:11:40 GMT (envelope-from git) Date: Sat, 18 Feb 2023 08:11:40 GMT Message-Id: <202302180811.31I8BeiW050798@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jimmy Olgeni Subject: git: f2a5e52bc551 - main - lang/erlang-runtime23: reduce diff with lang/erlang-runtime24 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olgeni X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f2a5e52bc551c2caa19d69be7ebe647ef2568d72 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by olgeni: URL: https://cgit.FreeBSD.org/ports/commit/?id=f2a5e52bc551c2caa19d69be7ebe647ef2568d72 commit f2a5e52bc551c2caa19d69be7ebe647ef2568d72 Author: Jimmy Olgeni AuthorDate: 2023-02-17 16:16:14 +0000 Commit: Jimmy Olgeni CommitDate: 2023-02-18 08:10:44 +0000 lang/erlang-runtime23: reduce diff with lang/erlang-runtime24 --- lang/erlang-runtime23/Makefile | 23 +++++++++++++++-------- lang/erlang-runtime24/Makefile | 5 +++++ 2 files changed, 20 insertions(+), 8 deletions(-) diff --git a/lang/erlang-runtime23/Makefile b/lang/erlang-runtime23/Makefile index 53ea114cd0ec..ee5f6d4643b2 100644 --- a/lang/erlang-runtime23/Makefile +++ b/lang/erlang-runtime23/Makefile @@ -122,17 +122,21 @@ pre-configure-WX-off: post-configure-ODBC-on: ${RM} ${WRKSRC}/lib/odbc/SKIP +post-configure-ODBC-off: + echo "disabled by port options" > ${WRKSRC}/lib/odbc/SKIP + pre-build-NATIVE-on: @cd ${WRKSRC} && ${MAKE_CMD} clean post-build-CORBA-on: - cd ${WRKSRC_corba} \ - && ${SETENV} OVERRIDE_TARGET=${CONFIGURE_TARGET} ERL_TOP=${WRKSRC_otp} ${MAKE_CMD} + 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} + 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 @@ -159,8 +163,11 @@ post-install-WX-off: ${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} + ${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-runtime24/Makefile b/lang/erlang-runtime24/Makefile index e9072df9fdbb..9ded5bcfce49 100644 --- a/lang/erlang-runtime24/Makefile +++ b/lang/erlang-runtime24/Makefile @@ -91,6 +91,11 @@ WX_VARS= USE_GL="gl glu" \ .include +.if ${COMPILER_TYPE} == clang && ${COMPILER_VERSION} >= 130 +# PR 258494 +CONFIGURE_ARGS+= --disable-pgo +.endif + .if ${OPSYS} == FreeBSD CFLAGS+= -DMAP_NORESERVE=0 .endif