Date: Sun, 6 Jun 2021 20:37:37 GMT From: Juraj Lutter <otis@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org Subject: git: 878736cb3e3a - 2021Q2 - net/libwebsockets: Fix LWS_BUILD_HASH Message-ID: <202106062037.156KbbWW038876@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch 2021Q2 has been updated by otis: URL: https://cgit.FreeBSD.org/ports/commit/?id=878736cb3e3af51565807895660db9e92de32e11 commit 878736cb3e3af51565807895660db9e92de32e11 Author: Juraj Lutter <otis@FreeBSD.org> AuthorDate: 2021-06-06 20:25:39 +0000 Commit: Juraj Lutter <otis@FreeBSD.org> CommitDate: 2021-06-06 20:37:15 +0000 net/libwebsockets: Fix LWS_BUILD_HASH Pass LWS_BUILD_HASH to cmake instead of patching CMakeLists.txt This fixes ca989f6339de59653820f35a23f6107ee65d2e20 (cherry picked from commit c2f7da2a89ec7bab27dd6b8ab5e2936024a7b3d1) --- net/libwebsockets/Makefile | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/net/libwebsockets/Makefile b/net/libwebsockets/Makefile index a1236c01821b..694eb4b3bc4c 100644 --- a/net/libwebsockets/Makefile +++ b/net/libwebsockets/Makefile @@ -3,6 +3,7 @@ PORTNAME= libwebsockets DISTVERSIONPREFIX= v DISTVERSION= 4.2.0 +PORTREVISION= 1 CATEGORIES= net devel MASTER_SITES= https://libwebsockets.org/git/libwebsockets/snapshot/ @@ -15,6 +16,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE USES= cmake localbase pkgconfig tar:xz USE_LDCONFIG= yes +CMAKE_ARGS= -DLWS_BUILD_HASH:STRING="${BUILDINFO}" CMAKE_ON= CMAKE_DISABLE_FIND_PACKAGE_Git \ LWS_IPV6 LWS_WITH_SSL LWS_WITH_ZLIB \ LWS_WITHOUT_TESTAPPS LWS_WITHOUT_TEST_SERVER \ @@ -78,8 +80,4 @@ LIBUV_CMAKE_BOOL= LWS_WITH_LIBUV BUILDINFO= ${HOSTARCH}-portbld-${OPSYS:tl}-${OSREL:R} -post-patch: - @${REINPLACE_CMD} -e 's|%%BUILDINFO%%|${BUILDINFO}|g' \ - ${PATCH_WRKSRC}/CMakeLists.txt - .include <bsd.port.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202106062037.156KbbWW038876>