From nobody Tue Nov 26 08:59:47 2024 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XyGjb2vDTz5f8hm; Tue, 26 Nov 2024 08:59:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XyGjb2Gnmz4hHl; Tue, 26 Nov 2024 08:59:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1732611587; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rCLu6CdM5d18uNI4CNomW+uZUXDaOCu01yYW6S9GsEM=; b=f93b30e2KOqddN6YQFN1Sxbtwum1LgwRsTwq5olq5J+WEYm5Mfpleet7O4ALUZwO3TPtna LoblpuaNP99FSKUgYSFh2Q52S2dOkE7WpLOqiLjKg/zPT1UJAB2g8zwfsVy1NjlBbeAYbm ri43VHn/zcJe+q5KMixLyXlU4phM/BIrG01GqUdkKh65WHwrgRSjYAROv47Zqw6e8FeNaM R9eObCcEhPyDWtDqvRDY9nsX4RrRCXid0g4/860qVD2U2SLlbMntDqihd9x+a0Qi6m1gvl Xe8AhD0W4wM2clqsMSdj/mqkCNOekKPDC6xvsUAuOArBdaoFit8tst/yaWgpcw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1732611587; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rCLu6CdM5d18uNI4CNomW+uZUXDaOCu01yYW6S9GsEM=; b=tr/u4HLlIKzS1fE37bJGP8607PY01U5OyI/cPTN/ACIYdhA03XSk3tWosKPCN0APnRRcT3 Z6IDmam0NRVbEmhBX/EzVMVbcgBhVqoWLQJZPsT22wg7C6YA+bwAmGistpG7hnaX6WkVBO 49XmwQOH1mjGPIAqYzam8JlJufOqNBh9pjhmO9lDiEoKwSYSVNw+AOYJoUKu7UBKNKYTLq LuzgFYImRYQVyBSk3Yg4q/wTI9p16tREmjpkevBmX4wP7gljY7alS7ozj1qNi4vnrY/QE6 IYUl4TzyqZPalADXi/IqhwrxQhfannoANcjM6Pjnn4QrZlqw+hKMsPq3hJC6qA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1732611587; a=rsa-sha256; cv=none; b=d7jdbJ15MkRkVEa0hVGcMC1P1nf4Yw+Y2++00MjHBveJHDpp/s56xFaSeJ42RdMnRBhfth 6smp9gG17dCpXCfLKrITNlgDm1vtJ0yWUHZ1+6W55qfiuhsRrcHLqAgnrhDBqhGOvVx71x lUROGDsqV9VAo8J0UHYRvUTZ2q08iZU+GCZ7ewiBO121uA+/cBraok4pi0ZsPBpbatieq+ HmvtoZ8GyZdaNNRUZwCgLs8IbacS1h1pAwVPno2bwX/q4DIWOire9RifQwZ7tda7yuYVhB h6KfoIRJqxUu/AyuTNtxrQxUXE0Sz1euw+1kXdaZyKPmTmVAcL15k5PIxG5Kqg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XyGjb1sXMzHcV; Tue, 26 Nov 2024 08:59:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4AQ8xlPR031927; Tue, 26 Nov 2024 08:59:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4AQ8xlCm031924; Tue, 26 Nov 2024 08:59:47 GMT (envelope-from git) Date: Tue, 26 Nov 2024 08:59:47 GMT Message-Id: <202411260859.4AQ8xlCm031924@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Baptiste Daroussin Subject: git: 0acecea6cfbc - main - devel/muon: fix building in env without git List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0acecea6cfbc882b804fa30b57ddb25fc4b2b23a Auto-Submitted: auto-generated The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/ports/commit/?id=0acecea6cfbc882b804fa30b57ddb25fc4b2b23a commit 0acecea6cfbc882b804fa30b57ddb25fc4b2b23a Author: Baptiste Daroussin AuthorDate: 2024-11-26 08:59:23 +0000 Commit: Baptiste Daroussin 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)