From nobody Sun Apr 10 18:28:17 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 EC5971A80CF5; Sun, 10 Apr 2022 18:28:17 +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 4Kc0q56Kp3z4hV4; Sun, 10 Apr 2022 18:28:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649615297; 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=S1rS03ZZqRFRRwstOHyXvtsj7o373x9xMLUURks/d4A=; b=D1G51u0mcXLB8VI3Nz9Iz/29Esxpx2aFbJsBg9+TScTC6twIDOdUlUY829ySamP9OLV4wD 80bDTFyKYH1o/zB8cZ7PMKecVYXfCyvHf6B75rgnbY08kUgaaCDaZBOvuBVMSGeYGz3tHW qbXd80OorFBvn9abVL6QzFMGcO2bpWmkREq5Gkn+wDzXX3K+j5g4ZLXKIx6NhC5/QUJdh1 R4QP3I9VSGibu3G9gj3Kd10l1boXJ8mRXP1bcZfIkTQQy6Dt15hvd7UXknZWfZ2fZ3iMC7 zWLJ4UPsZPRXJRRYqndnWDofKz8pJAD13CD/FxVr3PnRVgicON1brv6Wvvu3Ug== 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 B95A213A9E; Sun, 10 Apr 2022 18:28:17 +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 23AISHxC061692; Sun, 10 Apr 2022 18:28:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23AISHX2061691; Sun, 10 Apr 2022 18:28:17 GMT (envelope-from git) Date: Sun, 10 Apr 2022 18:28:17 GMT Message-Id: <202204101828.23AISHX2061691@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: 4c90e1b3af44 - main - math/coq: force unsafe strings to unbreak against modern OCaml. 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: danfe X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4c90e1b3af44ccf4d88df788767754e27c80366b Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649615297; 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=S1rS03ZZqRFRRwstOHyXvtsj7o373x9xMLUURks/d4A=; b=meK5YBwk/ZqkVcqo6qBKdX7pzdEI3cULYI29khzCEXwsU/m2vSHWuTcWMyr5xtgvJZgp5M 2nPPCYSYxIjAtgW4wk3QJBTuZLJks3/mK9MZvavtHAEAsXjSiRX6MEPQK5VUt51TdpAvN6 S7KNcBtbdsVRDedUETibaqY2eY+caXDEdKL2ebnxTOY8cdfBuPFSZWwri8WTE35/fuy+Jb d1O9+zk+0gCOdJwx/pvZkp+AoQMF2uYIHDsf3JgYphUiDR0UMAUBt56e8q7UnLRHWcfBQh cPTov2XjZU/8nYmXkZ/P+p9XkP/hzlCQFFCp2jWHl9x608jxmUdCTE5oIK98fQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1649615297; a=rsa-sha256; cv=none; b=DzWcbjUlKDkpfNw12285C7nBDDb8Ag45kDJwwQnymH+c0X47jzuycLcO+beES1f/46yH6n /tgENhRWlR4ariP7S1LXC1YFT0iYi2Gr/XD+NZdpMnWALsciXDoeLL+fH86N/mIqNLhZZi EPUM4tZqKrRb5LmfwBSELQEA42DBS4HShoRXy7dcyK3jF9UMXU7MLKKEnac0XGPgvHBxnE SHyygwu0fa2m9yDZ8AJ+aogMl4/E7ovYrwY6SchrRANn8GdUC9Hz8UNo3KxfAoT8HnX2xv WRTgvIiig3MYJBz59SmhD9bFmx7QYenHsk3KFshdifuAMObdyVJXLE0cbn9cpQ== 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=4c90e1b3af44ccf4d88df788767754e27c80366b commit 4c90e1b3af44ccf4d88df788767754e27c80366b Author: Alexey Dokuchaev AuthorDate: 2022-04-10 18:27:14 +0000 Commit: Alexey Dokuchaev CommitDate: 2022-04-10 18:27:14 +0000 math/coq: force unsafe strings to unbreak against modern OCaml. --- math/coq/Makefile | 9 ++++++--- math/coq/files/patch-Makefile.build | 20 +++++++++++++++++++- 2 files changed, 25 insertions(+), 4 deletions(-) diff --git a/math/coq/Makefile b/math/coq/Makefile index 8e85c3b8dcf2..dd9757d6e5c1 100644 --- a/math/coq/Makefile +++ b/math/coq/Makefile @@ -33,7 +33,7 @@ CONFIGURE_ARGS= -prefix ${PREFIX} \ -emacslib ${PREFIX}/share/emacs/site-lisp/coq \ -usecamlp5 \ -byteonly -MAKE_ENV= VERBOSE=1 +MAKE_ENV= VERBOSE=1 USERFLAGS=-unsafe-string ALL_TARGET= world CONFLICTS_INSTALL= coq coq-emacs_* # bin/coq-tex bin/coq_makefile bin/coqc bin/coqchk bin/coqdep bin/coqdoc bin/coqide bin/coqmktop bin/coqtop bin/coqtop.byte bin/coqwc bin/coqworkmgr bin/gallina @@ -56,8 +56,11 @@ add-plist-post: @${DO_NADA} post-patch: - ${REINPLACE_CMD} -e '/show_latex_mes/s/)$$/; true)/' \ - ${WRKSRC}/Makefile.doc + @${REINPLACE_CMD} -e '/show_latex_mes/s/)$$/; true)/' \ + ${WRKSRC}/Makefile.doc +# Allow passing USERFLAGS down to inner make(1) via environment + @${REINPLACE_CMD} -e '/User compilation flag/,+1d' \ + ${WRKSRC}/configure.ml post-install: cd ${STAGEDIR}${PREFIX} && ${STRIP_CMD} ${STRIP_FILES} diff --git a/math/coq/files/patch-Makefile.build b/math/coq/files/patch-Makefile.build index b66ed54c2c10..15fa789877ed 100644 --- a/math/coq/files/patch-Makefile.build +++ b/math/coq/files/patch-Makefile.build @@ -1,6 +1,6 @@ --- Makefile.build.orig 2016-12-08 15:13:52 UTC +++ Makefile.build -@@ -101,7 +101,7 @@ TIMER=$(if $(TIMED), $(STDTIME), $(TIMEC +@@ -101,7 +101,7 @@ TIMER=$(if $(TIMED), $(STDTIME), $(TIMECMD)) # TIME="%C (%U user, %S sys, %e total, %M maxres)" COQOPTS=$(COQ_XML) $(NATIVECOMPUTE) @@ -9,3 +9,21 @@ LOCALINCLUDES=$(addprefix -I , $(SRCDIRS) ) MLINCLUDES=$(LOCALINCLUDES) -I $(MYCAMLP4LIB) +@@ -334,7 +334,7 @@ coqbinaries: $(COQMKTOP) $(COQTOPEXE) $(COQTOPBYTE) \ + ifeq ($(BEST),opt) + $(COQTOPEXE): $(COQMKTOP) $(LINKCMX) $(LIBCOQRUN) $(TOPLOOPCMA:.cma=.cmxs) + $(SHOW)'COQMKTOP -o $@' +- $(HIDE)$(COQMKTOP) -boot -opt $(OPTFLAGS) $(LINKMETADATA) -o $@ ++ $(HIDE)$(COQMKTOP) -boot -opt $(filter-out -unsafe-string, $(OPTFLAGS)) $(LINKMETADATA) -o $@ + $(STRIP) $@ + $(CODESIGN) $@ + else +@@ -344,7 +344,7 @@ endif + + $(COQTOPBYTE): $(COQMKTOP) $(LINKCMO) $(LIBCOQRUN) $(TOPLOOPCMA) + $(SHOW)'COQMKTOP -o $@' +- $(HIDE)$(COQMKTOP) -boot -top $(BYTEFLAGS) -o $@ ++ $(HIDE)$(COQMKTOP) -boot -top $(filter-out -unsafe-string, $(BYTEFLAGS)) -o $@ + + # coqmktop +