From nobody Tue Apr 19 08:07:14 2022 X-Original-To: dev-commits-ports-all@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 E128811D3C25; Tue, 19 Apr 2022 08:07:14 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4KjGcL60gzz4VZS; Tue, 19 Apr 2022 08:07:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650355634; 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=+PcbD1MAUFHZVe6lUFRjn5s99WwHTJxxX1ddEDelkhQ=; b=m2nloeABQNTJigYy8R5VQC64qAPF4BGP4FQHo5kNIsUfvaA+iuh2wD5YbpUk/KsNN7i2qi /Wwny6KQnfBpouiqPbq/4Lv4YwmcKqFcBIwJlk/EZSyVjCFoekmS+5qq+5df84nbMCyuSh 5JfNA59Wfv3xgYbIIpgc3BkY4BiB3jdBaLFW2chy548p8/LldomP+Q2pVwbC6Xkh/g7qOP eF89N6oeFbPeFMOXKD3IEsZAeYH2jCXwEdszPrVznJLzMbCj01BE9CpEAnaIoujcxts42p zA2ZCrPmSGPivGeVCGGT/AtB9zR3uWdUgsmw4dmfVDY8oS4EJvLmFMeoF/DtaA== 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 AE56B238B7; Tue, 19 Apr 2022 08:07:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 23J87EHc041638; Tue, 19 Apr 2022 08:07:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23J87EcY041637; Tue, 19 Apr 2022 08:07:14 GMT (envelope-from git) Date: Tue, 19 Apr 2022 08:07:14 GMT Message-Id: <202204190807.23J87EcY041637@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Guido Falsi Subject: git: 0524bb607cfc - main - net/unison: Try to fix build failure due to race condition in Makefile List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: madpilot X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0524bb607cfcc51b670796ab3232f690fd6ae9de Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650355634; 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=+PcbD1MAUFHZVe6lUFRjn5s99WwHTJxxX1ddEDelkhQ=; b=Ojy5e0+Z1urrIzZlivGeBbMfczBfUvNii6Fe+P7nGKtu4szpcXZB0XMKqw7cWQD0KbSt9u Kq5vw25WXvzphSwaJRM+3LRazVYArgerL9YSFbrUK6IDfBhotxgnuYOIcxpWeSjzm6pVhu lvrbKCOzuPm1ga2W5kikoGArMvr6nH34ETVthVYleYzgiH59jZkQtq+587mnjTS+KVEOof VqRKHc1fp4cjvlFQtJobvlz2O+WJdMOndSiH0M3QKepOWb8jCS2rVigdWmLYx/oH8IIwdl W73HjP4JuyergBfVPtUtWV3cKRL+IBqdKOhNf7CjZFBM63KlHQn0XRnKUPTNoQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1650355634; a=rsa-sha256; cv=none; b=tqj0HNCr5y9nnDFw7G+e4VkfOSbWfgYgBfUaYIi63q9h8Yx7f9oIvcFPAzU2eUq2668VVK xZs0x+XFe6sXrc/JYnHCK3pvwzady6n9WllXcpt2SEEtCiorOSeAGJVA74WHD0n8mGb8Kx Ecgw1RARAyKHUqCzZ6R6ph6iZ25mqqR0uQsxyPZEQMMDbzRj+yFpM6Q72hrIKWLo5HgxK3 jTBQbDa/VPoS3RYK0gHLrMlj0MTRGpczTKJss+UzueWiyOQL2euNm26WEu07+DKJH0hxQU gtq2nzykz4Kj8H48/Raxr7yZ9dSp5iCgctuV44JJ+pim7QNZCd/mDyPX7TzKHg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by madpilot: URL: https://cgit.FreeBSD.org/ports/commit/?id=0524bb607cfcc51b670796ab3232f690fd6ae9de commit 0524bb607cfcc51b670796ab3232f690fd6ae9de Author: Guido Falsi AuthorDate: 2022-04-19 08:04:45 +0000 Commit: Guido Falsi CommitDate: 2022-04-19 08:04:45 +0000 net/unison: Try to fix build failure due to race condition in Makefile PR: 263067 MFH: 2022Q2 --- net/unison/files/patch-Makefile.OCaml | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/net/unison/files/patch-Makefile.OCaml b/net/unison/files/patch-Makefile.OCaml index 45859e189c5a..503906115d6e 100644 --- a/net/unison/files/patch-Makefile.OCaml +++ b/net/unison/files/patch-Makefile.OCaml @@ -1,6 +1,6 @@ ---- Makefile.OCaml.orig 2021-06-23 14:30:30 UTC +--- Makefile.OCaml.orig 2022-03-12 16:24:03 UTC +++ Makefile.OCaml -@@ -34,7 +34,11 @@ ifeq ($(shell uname),OpenBSD) +@@ -31,7 +31,11 @@ ifeq ($(shell uname),NetBSD) else ifeq ($(shell uname),NetBSD) OSARCH=NetBSD @@ -12,7 +12,7 @@ ifeq ($(shell uname),Linux) OSARCH=Linux endif -@@ -290,6 +294,11 @@ ifeq ($(OSARCH),Linux) +@@ -315,6 +319,11 @@ endif INCLFLAGS+=-I fsmonitor -I fsmonitor/linux endif @@ -24,7 +24,18 @@ ifeq ($(OSARCH),solaris) -include fsmonitor/solaris/Makefile src/fsmonitor/solaris/Makefile INCLFLAGS+=-I fsmonitor -I fsmonitor/solaris -@@ -432,7 +441,7 @@ fswatch.cmi : ubase/prefs.cmi +@@ -442,6 +451,10 @@ win32rc/unison.res.lib: win32rc/unison.rc win32rc/U.ic + -$(RM) $@ + ocamllex $< + ++compat%.cmi: compat%.mli ++ @echo "$(CAMLC): $< ---> $@" ++ $(CAMLC) $(CAMLFLAGS) $(COMPATCAMLFLAGS) -c $(CWD)/$< ++ + %.cmi : %.mli + @echo "$(CAMLC): $< ---> $@" + $(CAMLC) $(CAMLFLAGS) $(COMPATCAMLFLAGS) -c $(CWD)/$< +@@ -466,7 +479,7 @@ compat%.cmx: compat%.ml %.o %.obj: %.c @echo "$(CAMLC): $< ---> $@"