From nobody Mon Aug 26 00:52:35 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 4WsXFw12CYz5Tt0h; Mon, 26 Aug 2024 00:52:36 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WsXFv4Lxjz4jtR; Mon, 26 Aug 2024 00:52:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1724633555; 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=92YbYQCVCPPzN1a4cYHgt3/OyScwDbFIhSHQyM5oDcc=; b=GEp7d1dN5wi9vjcZr1pYbq9Jg/MUYO89LYBJDeMgFnm9/WGDmY79YnPS+rYJ9bmPdwM6ak /Jbbv7X4XDyak/p8l4jtpOtjtpOZ/vjdDb02R7knhLSee7qb8BjSyjhAd7jN1T84eWUqu9 pMjRbM7O7qPimIOu3ZNttMJ2DJcNK83lLqMv9YHrXEDhqoa0FElQlZPZRXwhTXolLFaLZ7 Q/PkvWopYJHKd4QM34I/7flmTNxmwx8qf4MWGLgccaUxjkdjdRSGjgtoj9D+vLXf/QAxU0 FmhR8uW4YDSZDOyobklqoKL/aa0iSkD4WJznHr89FgkpCkbOF6D4gmNJqYSpEg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1724633555; a=rsa-sha256; cv=none; b=N2PqzB/M7+YW6VEnbTJVoEa4z4gxqH6wVFl/wLsj6AkI0HYDuZCrzIgWHuLNgLGdXAL8gF 8VFCFHTuXldHlGw3VYEgBnLkLrfCz/5+jFNOWN0G+Kj6rAV2R41iyjFN9ktXfc3Xgj2Hag 8+JiSZ/Er0v+ZhiEaLavh5vO4ehRqLUZicAvS9A7+CH2Zm9l4r60UdesufW80Ne/9uHcGg N2YOG6YDil+MV8CnznXLmHqqH8dQeoaizM6zw3z2InC/hXiX00xr7KpXXqeu5cdDhZfzMG YW/fddOagg3fGHuZUMhbERWH4dfaOCL4igskkR/S7zjIN/TsTpgMhTZho0VDJw== 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=1724633555; 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=92YbYQCVCPPzN1a4cYHgt3/OyScwDbFIhSHQyM5oDcc=; b=kKwzjVlLqdpqYo0LI8+PZoNt1DcL8Ds61metPIsBm17lyVdhUmI86oAzyp15Tibr23rF17 zziRmmEaVL6P1uBXv3xwb0SbOBXlFctSaF4XC761OucP5+q28qmKMRGsygDYjjZ0qBfnuC ieovzgcsoKmIN5q9mvGHb8OfZjLVyMwkg2KGbvltNN0oN+0rzVDyWKQsPMnc8EuIVEqg3e T2b7CZM4U6erjcRnA4c/19vEiPt7cXkDbJ3X82dYmemObxulWsdX+rKWNfZGPFfsktvjH3 NBrIXWnSNB1ocmwIIFVmybWOGTrQiKttmgnpnInwGwVtXExXH3979gEkKavTjw== 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 4WsXFv3yTHzlP9; Mon, 26 Aug 2024 00:52:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 47Q0qZSp090404; Mon, 26 Aug 2024 00:52:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 47Q0qZtA090401; Mon, 26 Aug 2024 00:52:35 GMT (envelope-from git) Date: Mon, 26 Aug 2024 00:52:35 GMT Message-Id: <202408260052.47Q0qZtA090401@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: a6cd5e6562ba - main - science/arbor: Replace the units bundled lib with external dependency 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: a6cd5e6562bab547071b08337e0285b81522e227 Auto-Submitted: auto-generated The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=a6cd5e6562bab547071b08337e0285b81522e227 commit a6cd5e6562bab547071b08337e0285b81522e227 Author: Yuri Victorovich AuthorDate: 2024-08-25 22:13:52 +0000 Commit: Yuri Victorovich CommitDate: 2024-08-26 00:52:24 +0000 science/arbor: Replace the units bundled lib with external dependency --- science/arbor/Makefile | 8 ++++++-- science/arbor/distinfo | 4 +--- science/arbor/files/patch-CMakeLists.txt | 19 +++++++++++++++++++ science/arbor/pkg-plist | 1 - 4 files changed, 26 insertions(+), 6 deletions(-) diff --git a/science/arbor/Makefile b/science/arbor/Makefile index b0d9aeda07ea..b1752bf03828 100644 --- a/science/arbor/Makefile +++ b/science/arbor/Makefile @@ -1,6 +1,7 @@ PORTNAME= arbor DISTVERSIONPREFIX= v DISTVERSION= 0.10.1 +PORTREVISION= 1 CATEGORIES= science MAINTAINER= yuri@FreeBSD.org @@ -19,7 +20,8 @@ BUILD_DEPENDS= bash:shells/bash \ ${PYTHON_PKGNAMEPREFIX}svgwrite>0:graphics/py-svgwrite@${PY_FLAVOR} BUILD_DEPENDS+= ${LOCALBASE}/lib/cmake/GTest/GTestConfig.cmake:devel/googletest # https://github.com/arbor-sim/arbor/issues/2205 LIB_DEPENDS= libhwloc.so:devel/hwloc2 \ - libpugixml.so:textproc/pugixml + libpugixml.so:textproc/pugixml \ + libunits.so:misc/units RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}svgwrite>0:graphics/py-svgwrite@${PY_FLAVOR} TEST_DEPENDS= googletest>=0:devel/googletest @@ -27,13 +29,15 @@ USES= cmake compiler:c++17-lang localbase python shebangfix USE_GITHUB= yes GH_ACCOUNT= arbor-sim -GH_TUPLE= LLNL:units:7917f5f:units/ext/units SHEBANG_FILES= scripts/arbor-build-catalogue CMAKE_ON= BUILD_SHARED_LIBS +CMAKE_OFF= ARB_USE_BUNDLED_UNITS CMAKE_ARGS= -DPython3_EXECUTABLE=${PYTHON_CMD} +LDFLAGS+= -L${LOCALBASE}/lib -lunits + OPTIONS_DEFINE= NATIVE NATIVE_CMAKE_ON= -DARB_ARCH=native diff --git a/science/arbor/distinfo b/science/arbor/distinfo index 80f2fcad4032..895ebcc91640 100644 --- a/science/arbor/distinfo +++ b/science/arbor/distinfo @@ -1,5 +1,3 @@ -TIMESTAMP = 1723264051 +TIMESTAMP = 1724617928 SHA256 (arbor-sim-arbor-v0.10.1_GH0.tar.gz) = 6a9a209dc20ab6edcf9847a70b0b4dbabf0c0d3c7e6e29b5bec7c00de9d7b8ae SIZE (arbor-sim-arbor-v0.10.1_GH0.tar.gz) = 10159032 -SHA256 (LLNL-units-7917f5f_GH0.tar.gz) = 5ea0edf7dfe48185c05f1fd455ef66a483fc5fa6d8586bef4e4b219ef0f3e378 -SIZE (LLNL-units-7917f5f_GH0.tar.gz) = 1878237 diff --git a/science/arbor/files/patch-CMakeLists.txt b/science/arbor/files/patch-CMakeLists.txt new file mode 100644 index 000000000000..b813375ca016 --- /dev/null +++ b/science/arbor/files/patch-CMakeLists.txt @@ -0,0 +1,19 @@ +--- CMakeLists.txt.orig 2024-08-09 10:22:00 UTC ++++ CMakeLists.txt +@@ -40,7 +40,7 @@ check_cxx_compiler_flag("-march=native" CXX_HAS_NATIVE + + # Specify target architecture. + check_cxx_compiler_flag("-march=native" CXX_HAS_NATIVE) +-if(CXX_HAS_NATIVE) ++if(FALSE AND CXX_HAS_NATIVE) + set(ARB_DEFAULT_ARCH "native") + else() + set(ARB_DEFAULT_ARCH "none") +@@ -307,7 +307,6 @@ install(TARGETS ext-units EXPORT arbor-targets) + install(TARGETS ext-random123 EXPORT arbor-targets) + target_link_libraries(arbor-public-deps INTERFACE ext-units) + install(TARGETS ext-units EXPORT arbor-targets) +-install(TARGETS units compile_flags_target EXPORT arbor-targets) + + # Keep track of packages we need to add to the generated CMake config + # file for arbor. diff --git a/science/arbor/pkg-plist b/science/arbor/pkg-plist index db7fee5f5693..f7844f35709c 100644 --- a/science/arbor/pkg-plist +++ b/science/arbor/pkg-plist @@ -121,5 +121,4 @@ lib/cmake/arbor/arbor-targets.cmake lib/libarbor.so lib/libarborenv.so lib/libarborio.so -lib/libunits.a %%DATADIR%%/BuildModules.cmake