From nobody Tue Apr 19 07:45:20 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 ACDE811CDC27; Tue, 19 Apr 2022 07:45:20 +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 4KjG744Ptyz4Qx1; Tue, 19 Apr 2022 07:45:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650354320; 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=in7u1+/5lD9Jv7sajP1P4mq+/65/pId20uRNGqjmBhs=; b=XFK16+h/I57DA1pWP/w0bPVoiUM/MB7iS8Q8AnAWl7pF2NpP0uYqAJ/isO/nnFtEwTfttL t0JvL+pTsCtAPRKSbw3seRJ0KhdhAZanHexdL82Xgp4Y9x2gWf1G4Qw+rBZg4maqAot3aw x10j78JFB8lNOq7vR75z0SI3JSXFZcAb6Z/0rVwGTEtrs+VEd2s5l+Wl7WSdRmKgPTa0Gl B/3uMZwWHa0rhPMp6Mi+HJVcRGgqaO3jLZaRjr6bS3tNEFybMNYoj6juX3z7xyPIWfCrku XRMHgQeuZ9oyESQXEfYRpy34y64pDdjdCoTZfRVOPTprVr69/AhpQaSwddogYQ== 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 7736323452; Tue, 19 Apr 2022 07:45:20 +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 23J7jKCP014148; Tue, 19 Apr 2022 07:45:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23J7jKtZ014147; Tue, 19 Apr 2022 07:45:20 GMT (envelope-from git) Date: Tue, 19 Apr 2022 07:45:20 GMT Message-Id: <202204190745.23J7jKtZ014147@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Alexey Dokuchaev Subject: git: 29410e20d1de - main - devel/ocaml-opam: pass correct $(CC) value to the bootstrap script 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: danfe X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 29410e20d1de876478fde6e4bc80b8b0823b1184 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650354320; 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=in7u1+/5lD9Jv7sajP1P4mq+/65/pId20uRNGqjmBhs=; b=iglhsr+5FZFd0h/qzPox2QkPTkM8Rac93bdZDnx8jRRk2ULplRszUOiWWsgNiI7M/RkxY6 BHcBwqAhLyHljPBdEXKGaFnrjXuDgDhsTwGNkktDqOkeNQDXWO+UqSSfL7BbmfeoVahpMZ 0pWt/8JwCVSOO5q6kTWKLT5IRXr0kZapeM5LbNkj0Hk6fQWa3xg5p+SqHAvcUGp43BqE5q tPpnfu3akgSa7FTsJ83FSKbPjhkYc2B/I8ls9ZtaQOdnk177dyOCebeiFBhrNvaS33JvtS UFHee9L1Ak0vcE97hWoSpLgyKIst4t7Rw69Rkg3JiZuOGPZWRRRCc1EU7FNtog== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1650354320; a=rsa-sha256; cv=none; b=yaPSEuG8dZn9XDy21K7fcKgj/PHDpl7dpj8VwcHSwe2o1QIOst5PnFlUAR/O2v56eqvjxn 4CfXOcFVsg4W0qznUgQxXCJt5n+KsrffjT8GH3PaIlFbaMssgEwBT/RJx24DyWPzbZIYln mGqjb03yIyJdb3iK0gLIJhIaTIkhK2fAQZ7Xojtioe2jMD/y7b1dEKW4aFgdxX6OdFMGsr 63YkrQ/eAS1a4XPfTq2btyrpce699yaSRuK2s8gEaCH06F5ZoWqmmkKl7tpj9fWNVo9SbE q0duAQf0y+dePct/HIZkNaIg5tsT/ScGG4fQuZnNME+uPJ3Fu/5/sz6c1eQslg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by danfe: URL: https://cgit.FreeBSD.org/ports/commit/?id=29410e20d1de876478fde6e4bc80b8b0823b1184 commit 29410e20d1de876478fde6e4bc80b8b0823b1184 Author: Alexey Dokuchaev AuthorDate: 2022-04-19 07:44:06 +0000 Commit: Alexey Dokuchaev CommitDate: 2022-04-19 07:44:06 +0000 devel/ocaml-opam: pass correct $(CC) value to the bootstrap script Otherwise it could be guessed wrongly and the build would fail, as happens e.g. when ccache(1) tarball is extracted under /opt in the build jail (tinderbox). --- devel/ocaml-opam/files/patch-Makefile | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/devel/ocaml-opam/files/patch-Makefile b/devel/ocaml-opam/files/patch-Makefile new file mode 100644 index 000000000000..76bc788026c4 --- /dev/null +++ b/devel/ocaml-opam/files/patch-Makefile @@ -0,0 +1,11 @@ +--- Makefile.orig 2021-12-07 16:13:53 UTC ++++ Makefile +@@ -252,7 +252,7 @@ endif + + .PHONY: compiler cold + compiler: +- env MAKE=$(MAKE) BOOTSTRAP_EXTRA_OPTS= BOOTSTRAP_OPT_TARGET=opt.opt BOOTSTRAP_ROOT=.. BOOTSTRAP_DIR=bootstrap ./shell/bootstrap-ocaml.sh $(OCAML_PORT) ++ env CC="$(CC)" MAKE=$(MAKE) BOOTSTRAP_EXTRA_OPTS= BOOTSTRAP_OPT_TARGET=opt.opt BOOTSTRAP_ROOT=.. BOOTSTRAP_DIR=bootstrap ./shell/bootstrap-ocaml.sh $(OCAML_PORT) + + src_ext/secondary/ocaml/bin/ocaml: + env MAKE=$(MAKE) BOOTSTRAP_EXTRA_OPTS="--disable-ocamldoc --disable-debug-runtime --disable-debugger" BOOTSTRAP_OPT_TARGET=opt BOOTSTRAP_ROOT=../.. BOOTSTRAP_DIR=src_ext/secondary ./shell/bootstrap-ocaml.sh $(OCAML_PORT)