Re:_git:_6692307d2ec0_-_main_-_cad/surelog:_update_1 .82_→_1.83

From: Po-Chuan Hsieh <sunpoet_at_freebsd.org>
Date: Thu, 16 May 2024 18:52:46 UTC
On Thu, May 16, 2024 at 4:57 PM Yuri Victorovich <yuri@freebsd.org> wrote:

> The branch main has been updated by yuri:
>
> URL:
> https://cgit.FreeBSD.org/ports/commit/?id=6692307d2ec04a8d94da7b1936bbca5763490926
>
> commit 6692307d2ec04a8d94da7b1936bbca5763490926
> Author:     Yuri Victorovich <yuri@FreeBSD.org>
> AuthorDate: 2024-05-16 08:55:10 +0000
> Commit:     Yuri Victorovich <yuri@FreeBSD.org>
> CommitDate: 2024-05-16 08:56:51 +0000
>
>     cad/surelog: update 1.82 → 1.83
>
>     Reported by:    portscout
> ---
>  cad/surelog/Makefile               | 10 +++++-----
>  cad/surelog/distinfo               |  6 +++---
>  cad/surelog/pkg-plist              |  2 +-
>  devel/py-orderedmultidict/Makefile |  2 +-
>  devel/py-six/Makefile              |  2 +-
>  5 files changed, 11 insertions(+), 11 deletions(-)
>
> diff --git a/cad/surelog/Makefile b/cad/surelog/Makefile
> index 8b7e874d1c73..0f5f9d340777 100644
> --- a/cad/surelog/Makefile
> +++ b/cad/surelog/Makefile
> @@ -1,6 +1,6 @@
>  PORTNAME=      surelog
>  DISTVERSIONPREFIX=     v
> -DISTVERSION=   1.82
> +DISTVERSION=   1.83
>  CATEGORIES=    cad
>
>  MAINTAINER=    yuri@FreeBSD.org
> @@ -52,8 +52,8 @@ OPTIONS_DEFINE=               PYTHON TCMALLOC
>  OPTIONS_DEFAULT=       PYTHON TCMALLOC # should be the same TCMALLOC
> default as in cad/yosys, cad/uhdm because surelog's lib is used in the
> yosys plugin cad/yosys-systemverilog
>  OPTIONS_SUB=           yes
>
> -PYTHON_USES=           python
> -PYTHON_USES_OFF=       python:build
> +PYTHON_USES=           python:3.10 # it needs 3.9.19 while we have 3.9.18
>

Please check d50689478e72327eccb0078d33ef5e30f9074fc4 (Python 3.9.19,
committed 3 days ago) and revert it.


> +PYTHON_USES_OFF=       python:3.10,build
>  PYTHON_BUILD_DEPENDS=  swig:devel/swig
>  PYTHON_CMAKE_BOOL=     SURELOG_WITH_PYTHON
>  PYTHON_CMAKE_ON=       -DFREEBSD_PYTHON_DISTVERSION=${PYTHON_DISTVERSION}
> @@ -70,7 +70,7 @@ post-install:
>         @${RM} -r \
>                 ${STAGEDIR}${DATADIR}
>
> -post-test:
> -       cd ${BUILD_WRKSRC} && ctest
> +post-test: # 9 tests fail, see
> https://github.com/chipsalliance/Surelog/issues/3971
> +       @cd ${BUILD_WRKSRC} && ctest
>
>  .include <bsd.port.mk>
> diff --git a/cad/surelog/distinfo b/cad/surelog/distinfo
> index 45095d2c7f51..31f8834d2eb8 100644
> --- a/cad/surelog/distinfo
> +++ b/cad/surelog/distinfo
> @@ -1,6 +1,6 @@
> -TIMESTAMP = 1702189327
> -SHA256 (chipsalliance-Surelog-v1.82_GH0.tar.gz) =
> e2c4074f9d35b7a1450b722681d1557bdd4af3de09363dbdb9d0da9cf26b976b
> -SIZE (chipsalliance-Surelog-v1.82_GH0.tar.gz) = 95835712
> +TIMESTAMP = 1715831837
> +SHA256 (chipsalliance-Surelog-v1.83_GH0.tar.gz) =
> 3add228495a6ef0e0e3921cb20c30ae09a32c04c76faab4f1a78e546e1d98d86
> +SIZE (chipsalliance-Surelog-v1.83_GH0.tar.gz) = 96087587
>  SHA256 (alainmarcel-antlr4-a27cf84_GH0.tar.gz) =
> f1d2636c219d2fa9faad1672739e409d6a9a78ac1495a911ae2a5e43bd5194d1
>  SIZE (alainmarcel-antlr4-a27cf84_GH0.tar.gz) = 4205182
>  SHA256 (nlohmann-json-788e546_GH0.tar.gz) =
> 5d7e9a9fafbb0d0ddd6b1364fd701a86972782ca7c2dace80eefa9c312c5926f
> diff --git a/cad/surelog/pkg-plist b/cad/surelog/pkg-plist
> index cb7f869e6fc4..61b238689cd3 100644
> --- a/cad/surelog/pkg-plist
> +++ b/cad/surelog/pkg-plist
> @@ -82,7 +82,7 @@
> lib/cmake/Surelog/SurelogTargets-%%CMAKE_BUILD_TYPE%%.cmake
>  lib/cmake/Surelog/SurelogTargets.cmake
>  lib/libantlr4-runtime.a
>  lib/libsurelog.so
> -lib/libsurelog.so.1.82
> +lib/libsurelog.so.1.83
>  %%PYTHON%%lib/surelog-python/python/slSV3_1aPythonListener.py
>  %%PYTHON%%lib/surelog-python/python/slformatmsg.py
>  %%PYTHON%%lib/surelog-python/python/slwaivers.py
> diff --git a/devel/py-orderedmultidict/Makefile
> b/devel/py-orderedmultidict/Makefile
> index bfc809d93b63..552e4b84047c 100644
> --- a/devel/py-orderedmultidict/Makefile
> +++ b/devel/py-orderedmultidict/Makefile
> @@ -17,7 +17,7 @@ BUILD_DEPENDS=
> ${PYTHON_PKGNAMEPREFIX}setuptools>=0:devel/py-setuptools@${PY_FLA
>  RUN_DEPENDS=   ${PYTHON_PKGNAMEPREFIX}six>=1.8.0:devel/py-six@
> ${PY_FLAVOR}
>
>  USES=          python
> -USE_PYTHON=    autoplist concurrent pep517
> +USE_PYTHON=    allflavors autoplist concurrent pep517 # allflavors
> because cad/surelog needs 3.10
>

Please revert it.


>
>  NO_ARCH=       yes
>
> diff --git a/devel/py-six/Makefile b/devel/py-six/Makefile
> index 972441563daf..a95cd3c45cb5 100644
> --- a/devel/py-six/Makefile
> +++ b/devel/py-six/Makefile
> @@ -15,7 +15,7 @@ TEST_DEPENDS=
> ${PYTHON_PKGNAMEPREFIX}gdbm>=0:databases/py-gdbm@${PY_FLAVOR} \
>                 ${PYTHON_PKGNAMEPREFIX}tkinter>=0:x11-toolkits/py-tkinter@
> ${PY_FLAVOR}
>
>  USES=          python
> -USE_PYTHON=    autoplist concurrent distutils pytest
> +USE_PYTHON=    allflavors autoplist concurrent distutils pytest
>
>  NO_ARCH=       yes
>
>