From nobody Tue Apr 19 08:35:06 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 DFDAA11DACD4; Tue, 19 Apr 2022 08:35:06 +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 4KjHDV5W8Bz4blx; Tue, 19 Apr 2022 08:35:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650357306; 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=kanyzbjOqDm2YkQ69xoOYmLI+CdBaITWANCahKcWBoM=; b=COYrSE5u4eYyaHfwya6knt5K+kbXu66IWYcOhCtl7xkK+RLwUBYtIiVVhxJBeZRAbW0Zdb 5iAxBihLYrr0IPSnXN5lPcMc0W5A7j5hQ3ypg9hvqF5h4cirWwTg95eY8RdRTMjqsj/Hz9 0mKhfF/rAhrZrVTD8DbMAnC1LH75tmP2kzq+e+TI1UHnAjrsHU+Vn7lpYf5dt59WrPtUOk J0hqm60uphsI0gsNwDepcE10PMv/3iDcoPaU+Fu7wlMah84Q8WmmzNL9zwEG6Mm/B9/DEN Yiqkq8PEhDKH+4uohSTcBTuROjlP6Sw/w53SeNMZDAeyhdf+XkWQTfTgmYLChQ== 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 8FBFF24186; Tue, 19 Apr 2022 08:35:06 +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 23J8Z6Ft082802; Tue, 19 Apr 2022 08:35:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23J8Z6R1082801; Tue, 19 Apr 2022 08:35:06 GMT (envelope-from git) Date: Tue, 19 Apr 2022 08:35:06 GMT Message-Id: <202204190835.23J8Z6R1082801@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: 47c4c9014587 - 2022Q2 - net/unison251: 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/2022Q2 X-Git-Reftype: branch X-Git-Commit: 47c4c901458758f40f67554212a301fdb8045ff6 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650357306; 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=kanyzbjOqDm2YkQ69xoOYmLI+CdBaITWANCahKcWBoM=; b=OemCozxtUEJxJ+jJhvPYnOq6XGEQFPuwZP5jzpZ0bUxO61qMdIFsDOVkuZhJt9USndh9Vv l17JHwTnIS+kh6dQM/M3mG6k61t2gpjN04aDZnsPc2Z8atN2e86nPnmxw1O1RP06X2T85F eL5TudNRbpie7ZNeU5/SWzxusW7JsIl4bov9Ja4nW+PRJ3wwHV4BD91xSREh8bgZQ5mCPk PqZUw5P/gsmbCEC51co9FmMFJOOxas8whGvo+L3Opw+7AKoJbUJUxwG5DfgSi0AlgoTmM/ YEgwwdvirSWf+vzo2Yuc9/oustkYurDZJo2L7I0wIamk/fr7F2rQkrLwTq3PWA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1650357306; a=rsa-sha256; cv=none; b=SRfmASt8YDgw5BOi58+iGy85FdvetzJJvnHlcsSAprU/HpC0qCq0pKflg9ebWym3COgQKL eKJ2YE09oWvOZCgEVbW1yCyaoCfJbUSUhCstTukoOEpZ46AZM8m6fQ/fcQ85N5+H+Wm8LJ 6Yq0x5vqo+vWelVgcgXNmE/xkCIvbPrm1oY1tGD3RpQFNRF4OB4FCfc4FxL3zT/WXoZu5j 97yWv2i7zgNhe7dkoeMQr6RGn9RS41BVw0pYBfT+9MG6Ix5Fq9RwQfWsRf3jxF0YEt15YJ 43YcIYRa2IqK7rtmlqpJSOTy7m+kVJ+fkaNHOZaOs0DMKGTRb9DvbCOQG7sMCw== 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=47c4c901458758f40f67554212a301fdb8045ff6 commit 47c4c901458758f40f67554212a301fdb8045ff6 Author: Guido Falsi AuthorDate: 2022-04-19 08:06:18 +0000 Commit: Guido Falsi CommitDate: 2022-04-19 08:34:38 +0000 net/unison251: Try to fix build failure due to race condition in Makefile PR: 263067 MFH: 2022Q2 (cherry picked from commit c46c155b02df4d51fc6e5868fb151918b0a07cc5) --- net/unison251/files/patch-Makefile.OCaml | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/net/unison251/files/patch-Makefile.OCaml b/net/unison251/files/patch-Makefile.OCaml index 45859e189c5a..147a3793331a 100644 --- a/net/unison251/files/patch-Makefile.OCaml +++ b/net/unison251/files/patch-Makefile.OCaml @@ -1,6 +1,6 @@ ---- Makefile.OCaml.orig 2021-06-23 14:30:30 UTC +--- Makefile.OCaml.orig 2021-12-18 15:04:56 UTC +++ Makefile.OCaml -@@ -34,7 +34,11 @@ ifeq ($(shell uname),OpenBSD) +@@ -34,7 +34,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) +@@ -301,6 +305,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 +@@ -427,6 +436,10 @@ win32rc/unison.res.lib: win32rc/unison.res + -$(RM) $@ + ocamllex $< + ++compat%.cmi: compat%.mli ++ @echo "$(CAMLC): $< ---> $@" ++ $(CAMLC) $(CAMLFLAGS) $(COMPATCAMLFLAGS) -c $(CWD)/$< ++ + %.cmi : %.mli + @echo "$(CAMLC): $< ---> $@" + $(CAMLC) $(CAMLFLAGS) $(COMPATCAMLFLAGS) -c $(CWD)/$< +@@ -451,7 +464,7 @@ compat%.cmx: compat%.ml %.o %.obj: %.c @echo "$(CAMLC): $< ---> $@"