From nobody Tue Apr 19 08:35:05 2022 X-Original-To: dev-commits-ports-branches@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 9772711DACD0; Tue, 19 Apr 2022 08:35:05 +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 4KjHDT3rWVz4bpB; Tue, 19 Apr 2022 08:35:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650357305; 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=nDkGHAoDJBTRo59tZFywqM4cjNDiqtuhpe28ZsLCwfE=; b=Z0g6IrDYL9xwWFgyUglHJkIBUuFiCM17bNltKAcP6tOc1IzSm4MSDOJlRF3LlYGBlR+kYv 4FP39cYBYkuO9v+H+Q7n/qYjUICM3BfVDXXQ7HHFETdhbL5zHSOZtNWVfiJTTgOxxQokmD XKIMFWWXIBYrLfBZ31A1Lh9qGFbSQ9p2ikHKAeJE680h5I83Jz/H6bPSNhhiEULFHrvX7A sN5RZYHdYnfoDm2JNX1/6CmagkGWw/deEYQHMaEaRorIO5UXJ0NuFkv9hERfvJTJK2/4EI b8z1zFYRAVGOLJGp+KkmvU9i6oM2p0njoI2M7PGdKVCape+JX4Uv6aRE14Bq5w== 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 6487C24016; Tue, 19 Apr 2022 08:35:05 +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 23J8Z5If082773; Tue, 19 Apr 2022 08:35:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23J8Z58x082772; Tue, 19 Apr 2022 08:35:05 GMT (envelope-from git) Date: Tue, 19 Apr 2022 08:35:05 GMT Message-Id: <202204190835.23J8Z58x082772@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Guido Falsi Subject: git: c9d13b150bf2 - 2022Q2 - net/unison: Try to fix build failure due to race condition in Makefile List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@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/2022Q2 X-Git-Reftype: branch X-Git-Commit: c9d13b150bf209302fbc8f6308ca89411f4d3a44 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650357305; 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=nDkGHAoDJBTRo59tZFywqM4cjNDiqtuhpe28ZsLCwfE=; b=m6UfCAUnu65c/0XwowR8pivq8NnBIv4cz9O4o29kmeHQ/CwAjZmNH1DgSmP4WN0H5kvawT Y26lhdcH7U1YxZ0m32B2ifImB0NDcGLSYBYBctznS0VJpBwPSTwTgXlVnGJmvRt3kPi9Lz RRs4UXqrqq3dwkDjp0fi/gEWBsfNZPM/1+NMeFyjrEZhdbP8RSd5Cgg2N9mt9W8wFSAx6Z a5O915np004vjkdHmw3dnN6LDkzfqr/clIM45a06/7bchnXlHJWfWdrOOkWmtHVaQRED+l 5vNBQcAcJjoOpev8PrKVEzqwwhubGRLMMc+Nk0QqBeT3M1JI9lt/W6V1e18qvw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1650357305; a=rsa-sha256; cv=none; b=imwOjw3G2vfJMvhoQ8JvUsNsmVjfXFXe/x9FMDg4OSdzjNq1uCMG2coQTWxvhZh+rA6lWl AOI/vd1eIZXTPbzsaTKBkYGnaeue3zvWs8u1zbaaknrQI8/P81+jxRWshbkB6zzIe21sd/ Q6KhVlO6ztDBCWGwetaqlik1lc5wkVZP+YPdDMwn2oqfmRXxQIO5KMy39OgkSbBhGNGolm 1HLqm3ySmoEZyUscyK4L7O4SEvdP73qtAx96TwgNpja93WJTvovG4VYfxUUGs2lFeaFexY GQx0fkwWcJVknPB+U3CtNS/aIXwLMyUIW1oR8FP5aHXaiyBI7b8rBHVAWE9P0A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch 2022Q2 has been updated by madpilot: URL: https://cgit.FreeBSD.org/ports/commit/?id=c9d13b150bf209302fbc8f6308ca89411f4d3a44 commit c9d13b150bf209302fbc8f6308ca89411f4d3a44 Author: Guido Falsi AuthorDate: 2022-04-19 08:04:45 +0000 Commit: Guido Falsi CommitDate: 2022-04-19 08:34:25 +0000 net/unison: Try to fix build failure due to race condition in Makefile PR: 263067 MFH: 2022Q2 (cherry picked from commit 0524bb607cfcc51b670796ab3232f690fd6ae9de) --- 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): $< ---> $@"