From nobody Sat Feb 18 08:11:41 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 4PJhGk2sBzz3rZvw; Sat, 18 Feb 2023 08:11:42 +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 4PJhGk0h4wz4GPb; Sat, 18 Feb 2023 08:11:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676707902; 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=MU7DSABvmLdoJcJOlme1z7WSUn6c7jK5f71lzs0HQ1A=; b=CA97b+UJyllPIzAHoL9BjkjQ7+TzFRCn7fbexifLkhyEqkl7f1vNu/+B3u3cOE2u7j4Pea LnL8Cb80/auZs2EwutnVoQP2k5rU/CD7BBjbCTV4vQ4IX9iR12xTHjfmQ1JEW2fByJnbkZ mtWOPAZwtsq7bRHPNB0hEv6kHxPNuXjQOUGywQI7D9AioPIWqxRvrhrHXrtwjIFTQwqfAD o/57+BBcmLM7Wnprqzri1z+NqmVk78i0xKlMTr+3Ob+WOnhf0dl5HQmMRegxDjgk74qw/+ 1DcpVxh8nH9HXVjjBWcaCUxJVw4H5FVM9Gbpav2R/6lq6CshU0zRDJ0d+z56sw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676707902; 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=MU7DSABvmLdoJcJOlme1z7WSUn6c7jK5f71lzs0HQ1A=; b=TlPShYDbaLvHuRAAdOyd6PDRWqOdfGUcZ71SdAbFQspEG4WNpRhThido4fxp1NEdfS/KFF fa5cS+j+7f39n27PVZ1gYPuqzpk22QK+jMMnIr4HFUqZ7Q/NazgFJhl6YmstZvUsDG86D4 RQ9/erxmPI+CYaXiOcixkS0Xbw77L3/Ejfhhy6bQyuzAjaI2kI35htMZtmFpD9zqshiCb6 QxujAyjHYUVPjFv4bAzFA42M5uht5wu1WAfTg77PztWvegGk44CG8xevIXaaZSea/Zo9/c PvLX8jVDMe3flMvxKbykYqxg0XkPJwTFXUZBG/fOZ1sUhe72FTe0Lvaa61TE4A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1676707902; a=rsa-sha256; cv=none; b=HSvXHi6KX/RfhgqUDGiy+88pMWFAm0fNGAfCi7Nwl1ZLKkPQdCyOTAaX2earv0bHnTxMOW kVKYbgJJQxj8bcVKeD2l0v509MdLgFkCn3Hhl/JC5GBnOTrFK7LUaDU63uLfJ0C998NxHx HRmAd2uy+bNYOrVc5h5YVjCB+l5h6t+6jCHaib3y+g2xnyXEVjetJHJJjH3cHlaJo9AXEV FOBQNOQIFVxdi1bc3fYmwpxbcA33Y8XH95SnY+bHbhvBtjzDz7Lop3dvIuHg3snWVX9C8y wJsPsiB+59kYf9OE9SjMnwidKI5bYLHiFgczO5DFNIJYAj1auzpOl2t6TcU4Sg== 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 4PJhGj6cdnzFsF; Sat, 18 Feb 2023 08:11:41 +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 31I8BfiS050819; Sat, 18 Feb 2023 08:11:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31I8BfkU050818; Sat, 18 Feb 2023 08:11:41 GMT (envelope-from git) Date: Sat, 18 Feb 2023 08:11:41 GMT Message-Id: <202302180811.31I8BfkU050818@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: fd99978770f5 - main - lang/erlang-runtime22: reduce diff with lang/erlang-runtime23 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: fd99978770f54fc0627a18f26918e938ab3753dc Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by olgeni: URL: https://cgit.FreeBSD.org/ports/commit/?id=fd99978770f54fc0627a18f26918e938ab3753dc commit fd99978770f54fc0627a18f26918e938ab3753dc Author: Jimmy Olgeni AuthorDate: 2023-02-17 16:17:35 +0000 Commit: Jimmy Olgeni CommitDate: 2023-02-18 08:10:45 +0000 lang/erlang-runtime22: reduce diff with lang/erlang-runtime23 --- lang/erlang-runtime22/Makefile | 30 +++++++++++++++++++++--------- 1 file changed, 21 insertions(+), 9 deletions(-) diff --git a/lang/erlang-runtime22/Makefile b/lang/erlang-runtime22/Makefile index d623f0c35a84..0331ccd7a2dd 100644 --- a/lang/erlang-runtime22/Makefile +++ b/lang/erlang-runtime22/Makefile @@ -15,7 +15,7 @@ LICENSE= APACHE20 BROKEN_sparc64= Fails to build: error: fp_except undeclared -USES= autoreconf:build cpe gmake ncurses perl5 +USES= autoreconf:build compiler cpe gmake ncurses perl5 USE_GITHUB= nodefault GH_ACCOUNT= erlang:otp,corba GH_PROJECT= otp:otp corba:corba @@ -94,6 +94,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 @@ -118,17 +123,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 @@ -155,8 +164,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