git: f2a5e52bc551 - main - lang/erlang-runtime23: reduce diff with lang/erlang-runtime24
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sat, 18 Feb 2023 08:11:40 UTC
The branch main has been updated by olgeni:
URL: https://cgit.FreeBSD.org/ports/commit/?id=f2a5e52bc551c2caa19d69be7ebe647ef2568d72
commit f2a5e52bc551c2caa19d69be7ebe647ef2568d72
Author: Jimmy Olgeni <olgeni@FreeBSD.org>
AuthorDate: 2023-02-17 16:16:14 +0000
Commit: Jimmy Olgeni <olgeni@FreeBSD.org>
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 <bsd.port.post.mk>
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 <bsd.port.pre.mk>
+.if ${COMPILER_TYPE} == clang && ${COMPILER_VERSION} >= 130
+# PR 258494
+CONFIGURE_ARGS+= --disable-pgo
+.endif
+
.if ${OPSYS} == FreeBSD
CFLAGS+= -DMAP_NORESERVE=0
.endif