Date: Fri, 27 Aug 2021 17:02:17 GMT From: Yuri Victorovich <yuri@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 2ed037639e9b - main - math/cglm: convert to USES=meson from USES=cmake Message-ID: <202108271702.17RH2HDu008969@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=2ed037639e9b536d23f997772c4bd23394ceb666 commit 2ed037639e9b536d23f997772c4bd23394ceb666 Author: Jan Beich <jbeich@FreeBSD.org> AuthorDate: 2021-08-27 16:58:18 +0000 Commit: Yuri Victorovich <yuri@FreeBSD.org> CommitDate: 2021-08-27 17:02:10 +0000 math/cglm: convert to USES=meson from USES=cmake It wrote a .pc file that was causing games/taisei to not find cglm for some reason. PR: 258065 --- 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..224003824464 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 # was cmake before 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202108271702.17RH2HDu008969>