From nobody Sat Aug 12 14:42:20 2023 X-Original-To: dev-commits-ports-main@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 4RNNfj1QwKz4q707; Sat, 12 Aug 2023 14:42:21 +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 4RNNfj0zS2z4t0T; Sat, 12 Aug 2023 14:42:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691851341; 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=agw7dH/Cedh6TgrT7ddtdERe1tK/SA69nV4AmKQ3UWs=; b=FGnp2JIxSDYjxIY3GcxpyPUkYu5lQacKntcabnIaI9iTeAXzaAQiIlxAoFLkKJiWsqqwsL DtYsIKK/KxjMhWpSaCywkLe8khF7h9hk1X8EjqtfhuD2fwy1mDgthkHEwv0OJLaG9EFtF8 Oiv6n+vvWCIbbgmH9eZCBI1udPijuYgxmzJYtcQ7AcS70A+r3h42uaVTv7XUz88+KgSqzV h2buzX14ZzdNvn+o7/cuILJzekd+FayCEkQ05JhuBFpgZ8mxg7kBe+9anFfAOcu80+Tk0Y 3wwJpTVsK+aryrFKAf81zE2Awc18H0Mf89ih/qa0IhHcyk9KwLoypRyJRxYzJQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691851341; 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=agw7dH/Cedh6TgrT7ddtdERe1tK/SA69nV4AmKQ3UWs=; b=xF8OLpT477oxuT65p7nFGnDUng0qESszuycZQzaeeRdMKQ0N+kT3GGzHdVj4i+nBH8/gMF TAPUjGIaipppRNg1NRGm6Tep4ccMKvqeZ0Vi63ZNhvHJfOuMd0cCeV0b1+9T5Mvl/6G0Ab Jq+yuJlvv9yDL2neb9Ja8zoWQ3KV9EhTW0m9iLPfCLFu/SbxjSSqIrNH8yCr97yD41e994 IVaDUgx6BIRrNqo3dvfMTfQXE02S8zPed3KmfCKHdaYEgNcz2zgDQxk0hYf+iCYcspHar1 2Db6CJrX34+yhtao3hP+QSHOPArMmggPyj97VOKK9tuNM3KNi+koHVab1ySp+A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691851341; a=rsa-sha256; cv=none; b=GunDFJedXqPNKOHkg5CQujiT5kBg3inxOdO5wScQEM63rpwznTb8S1Kz1fajnv7ihPPJ4u 9KmfQeI4X3nMbEUxcIayOyDKmnqtXStREcv8ix5yzn3294YrmD9eyx045XZbYkX83+VuCr ok9uJCIRlXYzUR/76e3N2fbHxY98WUgc+u0dTMBG8x4qlENR7Kz0f2wONCIS4q8Gj/9WVv Bgf8ARhT1//q25Dfzq7yXyQ9lLLqYicrAHjZlMpDUEEoGPeIQrJPxAXZuXfpDBg33Sustm EI6ZEk6nKWBaF3/kdMfS1zNv8v0EL+CWV6THYUs7h4O9knIrrHVN/HG5z5LH2w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4RNNfh6rkHz8qF; Sat, 12 Aug 2023 14:42:20 +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 37CEgKTp054691; Sat, 12 Aug 2023 14:42:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37CEgKTD054688; Sat, 12 Aug 2023 14:42:20 GMT (envelope-from git) Date: Sat, 12 Aug 2023 14:42:20 GMT Message-Id: <202308121442.37CEgKTD054688@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: "Jason W. Bacon" Subject: git: f38473fec0a8 - main - biology/bifrost: Control -march via CPUTYPE make variable List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jwb X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f38473fec0a852349f186e1d28358fc2ce5636de Auto-Submitted: auto-generated The branch main has been updated by jwb: URL: https://cgit.FreeBSD.org/ports/commit/?id=f38473fec0a852349f186e1d28358fc2ce5636de commit f38473fec0a852349f186e1d28358fc2ce5636de Author: Jason W. Bacon AuthorDate: 2023-08-12 14:38:47 +0000 Commit: Jason W. Bacon CommitDate: 2023-08-12 14:38:47 +0000 biology/bifrost: Control -march via CPUTYPE make variable Also disable hard-coded -O3 in cmake to respect user env PR: 272651 Reported by: yuri Reviewed by: nimaje+fbz@bureaucracy.de, dizzy --- biology/bifrost/Makefile | 5 ++++- biology/bifrost/files/patch-CMakeLists.txt | 17 ++++++++--------- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/biology/bifrost/Makefile b/biology/bifrost/Makefile index d5afacfb4181..197f58a662dc 100644 --- a/biology/bifrost/Makefile +++ b/biology/bifrost/Makefile @@ -1,6 +1,7 @@ PORTNAME= bifrost DISTVERSIONPREFIX= v DISTVERSION= 1.2.1 +PORTREVISION= 1 CATEGORIES= biology MAINTAINER= jwb@FreeBSD.org @@ -10,12 +11,14 @@ WWW= https://github.com/pmelsted/bifrost LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -# Requires a 64-bit processor ONLY_FOR_ARCHS= aarch64 amd64 powerpc64 powerpc64le riscv64 +ONLY_FOR_ARCHS_REASON= Requires a 64-bit processor USES= cmake USE_GITHUB= yes +CMAKE_ARGS= -DCOMPILATION_ARCH=${CPUTYPE:UOFF} + GH_ACCOUNT= pmelsted .include diff --git a/biology/bifrost/files/patch-CMakeLists.txt b/biology/bifrost/files/patch-CMakeLists.txt index 1cf55ff9575f..27893b9ec44d 100644 --- a/biology/bifrost/files/patch-CMakeLists.txt +++ b/biology/bifrost/files/patch-CMakeLists.txt @@ -1,11 +1,10 @@ ---- CMakeLists.txt.orig 2023-07-16 13:25:06 UTC +--- CMakeLists.txt.orig 2023-08-12 14:26:29 UTC +++ CMakeLists.txt -@@ -20,8 +20,6 @@ if(COMPILATION_ARCH MATCHES "OFF") - message("Disabling native architecture compilation (including AVX2)") - else(COMPILATION_ARCH MATCHES "OFF") - message("Compilation architecture: ${COMPILATION_ARCH}") -- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -march=${COMPILATION_ARCH}") -- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=${COMPILATION_ARCH}") - endif(COMPILATION_ARCH MATCHES "OFF") +@@ -46,7 +46,6 @@ else(CMAKE_BUILD_TYPE MATCHES Debug) + set(CMAKE_EXE_LINKER_FLAGS "-pg") + else(CMAKE_BUILD_TYPE MATCHES Profile) + message("Build type: Release") +- add_compile_options(-O3) + endif(CMAKE_BUILD_TYPE MATCHES Profile) + endif(CMAKE_BUILD_TYPE MATCHES Debug) - if(ENABLE_AVX2 MATCHES "OFF")