From nobody Sun Dec 22 22:47:04 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 4YGbr91DSMz5hNp8; Sun, 22 Dec 2024 22:47: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YGbr90hL4z4JLl; Sun, 22 Dec 2024 22:47:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734907625; 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=Kg5Oe5H+zdYy9zc6zgUB6HVlR74P3iaMy3V8TkpyU14=; b=JHDXI3jSH6UMqPIKTA4cNsTIfYwHApW9yH48uNgvOXwXxUVkyj6tNlTt7W+xtjAiH4raow biUHdSUj6qCvtlF6469dq9+LVTzpMe4mp3DQU1VZc1hdJcvhdLIKWFqRJL7tDIQ5fdf+S1 fJ8HBBrLC4rX/7sTQu6FZEb2xsx8tavi202N5C8r4AsV4ERYx79QB/s3rdbHDWiriRi1Zq 32bAIC3ClK92Gt0eScgDRec7NncMo/PWr6zbQw6xUPUbdZeRg60xvTURQRgNeKbMXJpGV2 eLPWHdcDUFE2jQ1yb7od1cdK6oYjNjukr9EbH+dIaok9Vh9Q7vY8JS4bQ0OGVw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734907625; 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=Kg5Oe5H+zdYy9zc6zgUB6HVlR74P3iaMy3V8TkpyU14=; b=iPlBVTzKcmwdYBP7xvthiWXjNFGE6wd+4DiT/o3f9V+VpGyrDv+Nyx0qHUUNuDdVvtMfOn GAa6TOlYOLfAstWIaW9pHyqW3DN0Q+yPTr/bz+Bxoq3HvUkb4NkIHS/Wcz2KkjVeYRfRk2 bEIDCTixRDoQ6mDa3MaCYafmzyb6ml+B/olMzcfDgnDpZK8ln8xZBWOJkqikjLRSA1k2lm O8Wop2vCxQw5HZunOsCERPLE7xskFETE+msYeokHUxs1wd8ygZ6vOn3us0MHASa5QRDgRq BhSS6G9Qe1CIwU8PTGTFDTL4rzya5xL+wX6TJGW9mI7u5aQovdBIoQHkn+NuWQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734907625; a=rsa-sha256; cv=none; b=GWyIttNUp/IUa2/my7AbMfqkbP/55Y2+VrpsTj+mw6fN0ocTDcCH4wwXozTn9XIhkSwU9I Hptp1wcL/jT30/hJSRsI2LG+tuyYj25ynZOO+zgwnUtn/kZhpsO+o79OHzbukHM8TbdMbE jlrVau2ntrz13CqulHGLH0czgsDK9j9kiAxXwch6LyhfuqzpqygIQCZ7by6NZ+l7hRJ3Ya J2UX9C5enNPP82aItH18gCMW0RcpEYthr4L3dsUMRfbMxrJK4FIpng0L9zJL/55APHRqTA 7YotFEDp2ciSD3cxSj4QiCUEwZTwhuUde3UYPUhfAkQcJhxPC34U8+C0NfiFZg== 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 4YGbr90GrDzSMX; Sun, 22 Dec 2024 22:47:05 +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 4BMMl41j004357; Sun, 22 Dec 2024 22:47:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BMMl4aW004354; Sun, 22 Dec 2024 22:47:04 GMT (envelope-from git) Date: Sun, 22 Dec 2024 22:47:04 GMT Message-Id: <202412222247.4BMMl4aW004354@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: 1c314a46811c - main - math/deal.ii: Fix on 32-bit architectures 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: 1c314a46811ccd4958b38fc1423488f7003295c0 Auto-Submitted: auto-generated The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=1c314a46811ccd4958b38fc1423488f7003295c0 commit 1c314a46811ccd4958b38fc1423488f7003295c0 Author: Yuri Victorovich AuthorDate: 2024-12-22 22:04:48 +0000 Commit: Yuri Victorovich CommitDate: 2024-12-22 22:47:02 +0000 math/deal.ii: Fix on 32-bit architectures ... by matching index size with that in science/PETSc. Reported by: fallout --- math/deal.ii/Makefile | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/math/deal.ii/Makefile b/math/deal.ii/Makefile index a76b0fec4879..194ec73aae12 100644 --- a/math/deal.ii/Makefile +++ b/math/deal.ii/Makefile @@ -39,6 +39,8 @@ CMAKE_TESTING_ON= FREEBSD_ENABLE_TESTS LDFLAGS+= -lomp LDFLAGS+= -lexecinfo # TMP for bundled kokkos +XARCH!= uname -p + OPTIONS_DEFINE= ADOLC ARPACK GSL LAPACK MPI OPENCASCADE PETSC SCALAPACK SLEPC SUNDIALS # for all options see contrib/docker/Dockerfile, TODO some of them need to be enabled here OPTIONS_DEFAULT= GSL LAPACK MPI OPENCASCADE PETSC SCALAPACK SLEPC SUNDIALS @@ -79,9 +81,12 @@ OPENCASCADE_LIB_DEPENDS= libTKernel.so:cad/opencascade PETSC_DESC= Compile with Petsc (only with MPI) PETSC_USES= xorg PETSC_USE= XORG=x11 # PETSc adds x11 through interface libraries -PETSC_CMAKE_BOOL= DEAL_II_WITH_PETSC DEAL_II_WITH_64BIT_INDICES +PETSC_CMAKE_BOOL= DEAL_II_WITH_PETSC PETSC_LIB_DEPENDS= libpetsc.so:science/PETSc PETSC_IMPLIES= MPI # has to use the same MPI as PETSc uses +.if ${XARCH:M*64*} # match index size width being set to 64 in science/PETSc and math/metis +PETSC_CMAKE_BOOL+= DEAL_II_WITH_64BIT_INDICES # as opposed to 32-bit indices that are default in deal.II +.endif SCALAPACK_DESC= Compile with ScaLAPACK (only with MPI) SCALAPACK_CMAKE_BOOL= DEAL_II_WITH_SCALAPACK