From nobody Tue Apr 19 08:07:15 2022 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 22B8511D3C95; Tue, 19 Apr 2022 08:07:16 +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 4KjGcN07Y3z4VkY; Tue, 19 Apr 2022 08:07:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650355636; 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=Rm5rEBmgXNJ+ztQvIOEVLjeSscXgXWcisJ6g8uRQ9ks=; b=CyqYUuEcM7vrau4/p2HjTqayMJvPiB3AAGK71oPXuGJ8DnW3xdOh3KBCCLLJPCwrae1JfD QXl7+AOzRIzeF7o4YmlgWiLnY5BMSaKIyknAPpxdviNPUqmimDVB33FOyOV7MCuuPGXCP2 tVYK6FNI4BVr6BlnV1YaIBgXedc4ncLqC9jJUm30JI0ufXQo7QXNYCMKBXGIFZ8hfdVuG7 bmf0r8XxuIqITZYCd16hOPOpDsN9hUMNuQKnQuGAayNm1iaFmdhAk3v0ffFf2iD004qsBx qYWTrs6LqWFpNUJyLR/oZ4hqmIr/1kdQiEc3FUkkkRZ00APcPmBH1wFMTSQ+kw== 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 D0F27239A9; Tue, 19 Apr 2022 08:07:15 +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 23J87F6P041662; Tue, 19 Apr 2022 08:07:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23J87F8a041661; Tue, 19 Apr 2022 08:07:15 GMT (envelope-from git) Date: Tue, 19 Apr 2022 08:07:15 GMT Message-Id: <202204190807.23J87F8a041661@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: c46c155b02df - main - net/unison251: Try to fix build failure due to race condition in Makefile 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: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@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: c46c155b02df4d51fc6e5868fb151918b0a07cc5 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650355636; 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=Rm5rEBmgXNJ+ztQvIOEVLjeSscXgXWcisJ6g8uRQ9ks=; b=F480oKRFwGGBHQ1ZVescTXx7p6Dwkjcuaz+PnvK7DQEO/2u3vWVnY1jBDuGQL9qDV596Ae z5DO3mwJqC8OmgZ9GVmfkwoOOjLCi+VJmZM/F4qdw+EQDVDJkkfxk8ZGjiixapvSFMToY5 oTwxumwYrHZJxCdvRUXKFsheXpu9Tubi/6cZjo9/R7eLQnFQacWrZ8OP+Ts32tHrctjby6 esG1q8vLBvX41oYEWwieNGPyRIoU+PA4tW4AFD4EK4j0ZS78+YMrdSTWeQyDEAm7jc7jty FnpIf3+w8P+F50P5C7wZmihmWlixrzmbtafd+QbRVzSH3MAzns/5VosWVPHfWw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1650355636; a=rsa-sha256; cv=none; b=ujInlVXZsQ9iL2l1PDlxuKCQO4Xvqbp/Bj56KMxIkpU0IJoEnBVuCBtmG/VE6rieH7exsD VYSnUJ1YLORRu415+JZ++ZE979IeQHNqUGLNdWjDs+oyY5BOVPmsnRiZBl/HK06ILyYzSY fYJ25L3yZQgk73k7iLbCkD4AIqQe+LNMzC+Qml3CvoJ2/FLk1WmCLyYST6hS6WpSQUMO3/ CMgYM581Xdbzf9RWNZXxCJRfHWyNAJMX2+odTi4vNiF0YORbgqNCCl7WPDviWAIl3RpIeQ 2962W1Mvdjm23pXsHYOuGpsp6ruGSS2Z/i106bGz7derXwALSR/o1ZpREqjM3A== 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=c46c155b02df4d51fc6e5868fb151918b0a07cc5 commit c46c155b02df4d51fc6e5868fb151918b0a07cc5 Author: Guido Falsi AuthorDate: 2022-04-19 08:06:18 +0000 Commit: Guido Falsi CommitDate: 2022-04-19 08:06:18 +0000 net/unison251: Try to fix build failure due to race condition in Makefile PR: 263067 MFH: 2022Q2 --- 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): $< ---> $@"