From nobody Mon Dec 11 17:42:38 2023 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 4Sppwt40h9z53tFr; Mon, 11 Dec 2023 17:42:38 +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 4Sppwt2HfFz4S9k; Mon, 11 Dec 2023 17:42:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702316558; 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=+2aAX+GJI4McN+rivvQorqj8LxE3oz8mWRt+PCBxFpQ=; b=njrG67mdT2EzX50B0MpA22xPObjsSWxYfuZaVzrobL//tRCWprVBuC0JkEqW2qOryYsetc Yrf8YeeVpfbE39EUrzVXjxa7PnpmFK5mO0VCju/kkZh5swkHnJYETv596zzfMRZ4HY0CTL JTIAuy0ibG1Lcvcnrj9B4eG3w/W+XgwgdxjYtRdeCyvn3K8ulCdmKl22OIj+q3qzIZ6tiO paB5zRgk1EHql+HSHVsMNogcYbwWFEibQLioV0ftPQdLHR/jflx/h3ygCyONOpkPzq5V8x K8Zd+sYA0neM0RjUJFDl1e8ndSuLCih4lsV8l/z6M6PNwdUmpeblegH1aMxp6Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1702316558; a=rsa-sha256; cv=none; b=IL1/TqJ3Bd6V6bYScx05qoSA0RC5KLpFN0xAqtp9t7rmJ3q+HgZyoxe17fIXkAQe5XYP1d IDDPVdYsoctm1+/qypiHYjupn2g6gHR4Kxvs5NUWh7UCh9MlIIicpomgHTSKfu+6YHUhhu Xt7x1xz6Q+uBYfKSjDwIVoFM6wiP0SBpNw2DUy3P5M38B5bbmTBLUI2ylD8SawbHocTsTj RQ1WSbusT78qD+OkuRrI3RAEIEZoqQRcr9rhCEO9PhQ7Zv0gfdw6A83vmf6YkHFmJ+Krn5 nVAg/5161jxNrd4liCnbhaCxE3xYYD1cK+kHV2j/rzGDPZjc4Nif7gX8+hKr2Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702316558; 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=+2aAX+GJI4McN+rivvQorqj8LxE3oz8mWRt+PCBxFpQ=; b=SBEnbEpsVu6jG1XVCr2yD9ilJPBqQiV2iz+n+IMo+99ivyrdd6jOkxVjdLi1qXFcOoe7Mw 7bqD1Zk/wuqdNh6EwAp85dBCRL2MQ0eo+nfwqHI3vQBQ/Ziz5Rz+AnBEwYFAaoeVaTeUyL GKmzi16W7dbBveS2u7nx9gMpTLdmlEjvRIyknvg62Pd963IP5sgrve9ATbYf50oiplwfRP rK474oQJLZuZZMX0FoS02Ry4BDLDoKzglmNDKanW4LP7GWetxg9uHLL++Cp9rpDQBMrkiq dyw4JXcCjEsVo3M9YgUK3lNOvmeY6PKqrSubYLKAdWDF5Z7/YO+ANfxWounNNg== 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 4Sppwt155qzh3q; Mon, 11 Dec 2023 17:42:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BBHgcMg022339; Mon, 11 Dec 2023 17:42:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BBHgckJ022336; Mon, 11 Dec 2023 17:42:38 GMT (envelope-from git) Date: Mon, 11 Dec 2023 17:42:38 GMT Message-Id: <202312111742.3BBHgckJ022336@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Brooks Davis Subject: git: af6504f9e7ec - main - math/stp: remove nonsensical sbrk use 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: brooks X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: af6504f9e7ecf4fda8cb04ac0271447049fcda31 Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/ports/commit/?id=af6504f9e7ecf4fda8cb04ac0271447049fcda31 commit af6504f9e7ecf4fda8cb04ac0271447049fcda31 Author: Brooks Davis AuthorDate: 2023-12-11 17:39:48 +0000 Commit: Brooks Davis CommitDate: 2023-12-11 17:42:26 +0000 math/stp: remove nonsensical sbrk use This code called sbrk(4000000) and beyond error checking ignored the result meaning the 4MB of address space allocated could never be used without another call to sbrk and reference to INITIAL_MEMORY_PREALLOCATION_SIZE, but nothing in the repo does either. Submitted upstream as https://github.com/stp/stp/pull/474 Approved by: arrowd (maintainer) Sponsored by: DARPA Differential Revision: https://reviews.freebsd.org/D42978 --- math/stp/Makefile | 5 +-- math/stp/files/patch-tools_stp_main__common.cpp | 45 +++++++++++++++++++++++++ 2 files changed, 46 insertions(+), 4 deletions(-) diff --git a/math/stp/Makefile b/math/stp/Makefile index 6661895d29e7..1ac149d4b152 100644 --- a/math/stp/Makefile +++ b/math/stp/Makefile @@ -1,6 +1,6 @@ PORTNAME= stp DISTVERSION= 2.3.3 -PORTREVISION= 11 +PORTREVISION= 12 PORTEPOCH= 1 CATEGORIES= math @@ -11,9 +11,6 @@ WWW= https://stp.github.io/ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -BROKEN_aarch64= fails to link: missing sbrk -BROKEN_riscv64= fails to link: missing sbrk - LIB_DEPENDS= libboost_program_options.so:devel/boost-libs \ libminisat.so:math/minisat \ libcryptominisat5.so:math/cryptominisat diff --git a/math/stp/files/patch-tools_stp_main__common.cpp b/math/stp/files/patch-tools_stp_main__common.cpp new file mode 100644 index 000000000000..1ad6bb03f991 --- /dev/null +++ b/math/stp/files/patch-tools_stp_main__common.cpp @@ -0,0 +1,45 @@ +--- tools/stp/main_common.cpp.orig ++++ tools/stp/main_common.cpp +@@ -27,16 +27,8 @@ + #include "stp/Parser/parser.h" + #include "stp/cpp_interface.h" + +-//for srbk() function +-#if !defined(__MINGW32__) && !defined(__MINGW64__) && !defined(_MSC_VER) +-#include +-#endif +- + extern void errorHandler(const char* error_msg); + +-// Amount of memory to ask for at beginning of main. +-extern const intptr_t INITIAL_MEMORY_PREALLOCATION_SIZE; +- + using namespace stp; + using std::unique_ptr; + using std::cout; +@@ -49,9 +41,6 @@ + exit(-1); + } + +-// Amount of memory to ask for at beginning of main. +-const intptr_t INITIAL_MEMORY_PREALLOCATION_SIZE = 4000000; +- + Main::Main() : onePrintBack(false) + { + bm = NULL; +@@ -62,15 +51,6 @@ + + // Register the error handler + vc_error_hdlr = errorHandler; +- +-#if !defined(__MINGW32__) && !defined(__MINGW64__) && !defined(_MSC_VER) +- // Grab some memory from the OS upfront to reduce system time when +- // individual hash tables are being allocated +- if (sbrk(INITIAL_MEMORY_PREALLOCATION_SIZE) == ((void*)-1)) +- { +- FatalError("Initial allocation of memory failed."); +- } +-#endif + + bm = new STPMgr(); + GlobalParserBM = bm;