Attachment 227456 Details for Bug 258065 – v2

[patch] v2

bug258065.diff (text/plain), 1.80 KB, created by Jan Beich on 2021-08-26 17:45:16 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jan Beich

Created: 2021-08-26 17:45:16 UTC

Size: 1.80 KB

patch

obsolete

>From e3306ab77f769224b9517d2a6c2ea3a5577f3b6f Mon Sep 17 00:00:00 2001
>From: Jan Beich <jbeich@FreeBSD.org>
>Date: Thu, 26 Aug 2021 17:04:48 +0000
>Subject: [PATCH] math/cglm: convert to USES=meson
>
>PR:		258065
>Approved by:	yuri (maintainer)
>---
> math/cglm/Makefile  | 14 ++++++++------
> math/cglm/pkg-plist |  2 --
> 2 files changed, 8 insertions(+), 8 deletions(-)
>
>diff --git a/math/cglm/Makefile b/math/cglm/Makefile
>index 0ce9c0b6e527..82a5f2f53d43 100644
>--- a/math/cglm/Makefile
>+++ b/math/cglm/Makefile
>@@ -1,6 +1,7 @@
> PORTNAME=	cglm
> DISTVERSIONPREFIX=	v
> DISTVERSION=	0.8.4
>+PORTREVISION=	1
> CATEGORIES=	math
> 
> MAINTAINER=	yuri@FreeBSD.org
>@@ -9,16 +10,17 @@ COMMENT=	Highly optimized graphics math (glm) for C
> LICENSE=	MIT
> LICENSE_FILE=	${WRKSRC}/LICENSE
> 
>-USES=		cmake compiler:c11
>+USES=		compiler:c11 meson
> USE_LDCONFIG=	yes
> 
> USE_GITHUB=	yes
> GH_ACCOUNT=	recp
> 
>-do-test:
>-	@cd ${BUILD_WRKSRC} && \
>-		${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} -DCGLM_USE_TEST:BOOL=ON ${CMAKE_SOURCE_PATH} && \
>-		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET} && \
>-		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} test
>+pre-test:
>+	@if [ ! -e ${WRKDIR}/.meson_build_testing ]; then \
>+		${RM} ${CONFIGURE_COOKIE} ${BUILD_COOKIE}; \
>+		${MAKE} -C${.CURDIR} build MESON_ARGS="`make -V MESON_ARGS` --reconfigure -Dbuild_tests=true"; \
>+		${TOUCH} ${WRKDIR}/.meson_build_testing; \
>+	fi
> 
> .include <bsd.port.mk>
>diff --git a/math/cglm/pkg-plist b/math/cglm/pkg-plist
>index 2e97dea5d9d6..4b63839768f7 100644
>--- a/math/cglm/pkg-plist
>+++ b/math/cglm/pkg-plist
>@@ -133,8 +133,6 @@ include/cglm/vec3.h
> include/cglm/vec4-ext.h
> include/cglm/vec4.h
> include/cglm/version.h
>-lib/cmake/cglm/cglmConfig-%%CMAKE_BUILD_TYPE%%.cmake
>-lib/cmake/cglm/cglmConfig.cmake
> lib/libcglm.so
> lib/libcglm.so.0
> lib/libcglm.so.0.8.4

Actions: View | Diff

Attachments on bug 258065: 227454 | 227456