Date: Tue, 26 Nov 2024 08:59:47 GMT From: Baptiste Daroussin <bapt@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 0acecea6cfbc - main - devel/muon: fix building in env without git Message-ID: <202411260859.4AQ8xlCm031924@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/ports/commit/?id=0acecea6cfbc882b804fa30b57ddb25fc4b2b23a commit 0acecea6cfbc882b804fa30b57ddb25fc4b2b23a Author: Baptiste Daroussin <bapt@FreeBSD.org> AuthorDate: 2024-11-26 08:59:23 +0000 Commit: Baptiste Daroussin <bapt@FreeBSD.org> CommitDate: 2024-11-26 08:59:44 +0000 devel/muon: fix building in env without git --- devel/muon/Makefile | 10 +++++----- devel/muon/files/patch-tests_project_meson.build | 12 ++++++++++++ 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/devel/muon/Makefile b/devel/muon/Makefile index b4c2c66cf162..d1a7a374992a 100644 --- a/devel/muon/Makefile +++ b/devel/muon/Makefile @@ -25,14 +25,14 @@ USE_CSTD= c99 CFLAGS+= -D__XSI_VISIBLE=1 CONFIGURE_ENV= CC="${CC}" CFLAGS="${CFLAGS}" -post-patch: -# this confuses some of the FreeBSD configure targets - @${RM} -r ${WRKSRC}/tests/project/common - do-configure: @(cd ${WRKSRC} && \ ${SETENV} ${CONFIGURE_ENV} ${SH} bootstrap.sh . && \ - ./muon setup -Dlibcurl=disabled -Dlibarchive=disabled ${BUILD_WRKSRC}) + ${SETENV} ${CONFIGURE_ENV} ./muon setup \ + -Dlibcurl=disabled \ + -Dlibarchive=disabled \ + -Dtracy=disabled \ + ${BUILD_WRKSRC}) do-install: @(${SETENV} ${MAKE_ENV} ${BUILD_WRKSRC}/muon -C ${BUILD_WRKSRC} install) diff --git a/devel/muon/files/patch-tests_project_meson.build b/devel/muon/files/patch-tests_project_meson.build new file mode 100644 index 000000000000..e64500e59d93 --- /dev/null +++ b/devel/muon/files/patch-tests_project_meson.build @@ -0,0 +1,12 @@ +--- tests/project/meson.build.orig 2024-10-07 15:19:19 UTC ++++ tests/project/meson.build +@@ -401,8 +401,8 @@ endif + endif + endif + ++meson_tests_dir = meson.current_source_dir() / 'meson-tests' + if git.found() +- meson_tests_dir = meson.current_source_dir() / 'meson-tests' + meson_tests_sha = '1e565931348f15f3f9b654f46ab4bf5fa009ca4f' + + if not fs.is_dir(meson_tests_dir)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202411260859.4AQ8xlCm031924>