From nobody Thu Jun 6 08:49:05 2024 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 4Vvyg52jn5z5M59k; Thu, 06 Jun 2024 08:49:05 +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 4Vvyg52GCsz4T3b; Thu, 6 Jun 2024 08:49:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717663745; 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=ECTqWsrmK+2OKRKDc2hX9IVfwqOMUFMBqJw95nBP9Sg=; b=bKz9ATH5wCw4icVVjUEYkrM1Ft4qwKVYGlp/RL2bUEcbEnSnxfhCgCFf6yqqNiiZh2mFPV c5qYFFMW1o3OjJ2DF8qety/LOjF+RvGHSjbAHquDrgpHZzSLAADr93sCUPJArGrL/DA8fM IjUwEGO7VnSZHMvl3CdB1jGbnokml2kMMYpDnzNLWcZ6cjwW9p82vjPZNfyt7z0Nzkhnc8 GyfQyfxXS5ZBMi7fct1OKiQcvpcnBi/NTaY9Gv/zbrzEfdXOxhdU3YKVfxUyTKhPXqFZ0O W89IamICEIX2qD2OqqqrvsUcWX6AjLzw3kvgyGDDnC0V8FdLLDa1VKwdD/ujdA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1717663745; a=rsa-sha256; cv=none; b=sJmACfB3SMsCd+wdPeNKJH03OTMGF6YiOC/veLWrO0/yyN1UT/k9uC7uVKRHQLYa/E0ajb HX6TimG8lUpSBVzPLt9pGBcC2iByL9ZttiQDGhMsy4T+gQcRPSWiHkttm0Yzjd1O+Un6c1 ETYnLN3rezmEfJjxfvLt+rP2e2kDx50o1YczWezm3ehZxciXuYbikvFXw7nsI2f3Vjw+R0 7n12q6xFZneBBeMToQey5qRu7dNg7jWlQ2kVZM+IQXmFVtCGzfyDkin/YCnjwkMCLZf+Se ygTlpPN+9PpJXQX23hrXzWoypR1jskzbePuV62OHSlw+NXhF042Brb42IDWjWQ== 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=1717663745; 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=ECTqWsrmK+2OKRKDc2hX9IVfwqOMUFMBqJw95nBP9Sg=; b=FZECbYyeWp2X4H/aaSKD5fFBPQnztrxLIOvt9wy0AtmlJ2jjVww16iFV6MEshTrx6EYLRa p77Zlzud3ssWv+2uhCNznwAVeO46UB/TwBDTWg4JJgkG7pIO3NVKJBgp08EleEzbT3Djkz 6Gi5vtD/MhfRFVFN1cIO1mf5Mld+04VGMzckTmSzdKQnOR834bEJR+FJSVIamhIWmZbGcM e3qR3h5VIiZvWH3BWxADgfI6b8ofVOsO74CuQi9lICS15AXWBjl5Q0CGQ9fK/CF5YJH0Ko My/LeosShRDNgylKR9jJS54QP2658hZ2+dFL1UEHZyO0NLRXcoaOJHCno0BIyA== 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 4Vvyg51sqNzfKc; Thu, 6 Jun 2024 08:49:05 +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 4568n5wV002832; Thu, 6 Jun 2024 08:49:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4568n5gU002829; Thu, 6 Jun 2024 08:49:05 GMT (envelope-from git) Date: Thu, 6 Jun 2024 08:49:05 GMT Message-Id: <202406060849.4568n5gU002829@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Yuri Victorovich Subject: git: e42f6a977895 - main - math/cadical: Add shared library 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: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: yuri X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e42f6a977895756044e2b6c93271b1c5fb69664a Auto-Submitted: auto-generated The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=e42f6a977895756044e2b6c93271b1c5fb69664a commit e42f6a977895756044e2b6c93271b1c5fb69664a Author: Yuri Victorovich AuthorDate: 2024-06-06 01:16:15 +0000 Commit: Yuri Victorovich CommitDate: 2024-06-06 08:48:57 +0000 math/cadical: Add shared library --- math/boolector/Makefile | 5 +++-- math/cadical/Makefile | 19 ++++++++++++++++--- math/cvc5/Makefile | 5 +++-- 3 files changed, 22 insertions(+), 7 deletions(-) diff --git a/math/boolector/Makefile b/math/boolector/Makefile index 67612a6808f0..0d69f8ae44fe 100644 --- a/math/boolector/Makefile +++ b/math/boolector/Makefile @@ -1,5 +1,6 @@ PORTNAME= boolector DISTVERSION= 3.2.3 +PORTREVISION= 1 CATEGORIES= math MAINTAINER= yuri@FreeBSD.org @@ -9,9 +10,9 @@ WWW= https://boolector.github.io/ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/COPYING -BUILD_DEPENDS= ${LOCALBASE}/lib/libcadical.a:math/cadical \ - ${LOCALBASE}/lib/liblgl.a:math/lingeling +BUILD_DEPENDS= ${LOCALBASE}/lib/liblgl.a:math/lingeling LIB_DEPENDS= libbtor2parser.so:math/btor2tools \ + libcadical.so:math/cadical \ libcryptominisat5.so:math/cryptominisat \ libminisat.so:math/minisat \ libpicosat.so:math/picosat \ diff --git a/math/cadical/Makefile b/math/cadical/Makefile index fdd221995ad1..f8e39d9c1d5e 100644 --- a/math/cadical/Makefile +++ b/math/cadical/Makefile @@ -1,6 +1,7 @@ PORTNAME= cadical DISTVERSIONPREFIX= rel- DISTVERSION= 1.9.5 +PORTREVISION= 1 CATEGORIES= math devel MAINTAINER= yuri@FreeBSD.org @@ -17,8 +18,6 @@ GH_ACCOUNT= arminbiere GNU_CONFIGURE= yes -CXXFLAGS+= -fPIC - MAKEFILE= makefile BINARY_ALIAS= make=${GMAKE} @@ -30,7 +29,19 @@ TEST_TARGET= test PLIST_FILES= ${EXES:S/^/bin\//} \ include/cadical.hpp \ include/ccadical.h \ - lib/libcadical.a + lib/libcadical.a \ + lib/libcadical.so \ + lib/libcadical.so.${DISTVERSION} + +post-build: # build shared library + @${ECHO} "==> Building the shared library" + cd ${WRKSRC}/src && ${CXX} \ + -shared -Wl,-soname=lib${PORTNAME}.so.$(DISTVERSION) -fPIC \ + -DNDEBUG \ + ${CXXFLAGS} ${LDFLAGS} \ + `${ECHO} *.cpp | ${SED} -e "s/cadical\.cpp//; s/mobical\.cpp//"` \ + -I ${WRKSRC}/build \ + -o ${WRKSRC}/build/lib${PORTNAME}.so.${DISTVERSION} do-install: # workaround for https://github.com/arminbiere/cadical/issues/49 .for e in ${EXES} @@ -39,5 +50,7 @@ do-install: # workaround for https://github.com/arminbiere/cadical/issues/49 ${INSTALL_DATA} ${WRKSRC}/src/cadical.hpp ${STAGEDIR}${PREFIX}/include ${INSTALL_DATA} ${WRKSRC}/src/ccadical.h ${STAGEDIR}${PREFIX}/include ${INSTALL_DATA} ${WRKSRC}/build/libcadical.a ${STAGEDIR}${PREFIX}/lib + ${INSTALL_LIB} ${WRKSRC}/build/libcadical.so.${DISTVERSION} ${STAGEDIR}${PREFIX}/lib + cd ${STAGEDIR}${PREFIX}/lib && ${LN} -s libcadical.so.${DISTVERSION} libcadical.so .include diff --git a/math/cvc5/Makefile b/math/cvc5/Makefile index 6a314f7e0dd8..f35fca75a780 100644 --- a/math/cvc5/Makefile +++ b/math/cvc5/Makefile @@ -1,6 +1,7 @@ PORTNAME= cvc5 DISTVERSIONPREFIX= cvc5- DISTVERSION= 1.1.2 +PORTREVISION= 1 CATEGORIES= math java EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} @@ -12,12 +13,12 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= bash:shells/bash \ - ${LOCALBASE}/lib/libcadical.a:math/cadical \ ${LOCALBASE}/lib/symfpu.a:math/symfpu \ ${PYTHON_PKGNAMEPREFIX}toml>0:textproc/py-toml@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}tomli>0:textproc/py-tomli@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pyparsing>0:devel/py-pyparsing@${PY_FLAVOR} -LIB_DEPENDS= libantlr3c.so:devel/libantlr3c +LIB_DEPENDS= libantlr3c.so:devel/libantlr3c \ + libcadical.so:math/cadical USES= cmake:testing ncurses compiler:c++17-lang \ localbase:ldflags pkgconfig python:build