From nobody Thu Apr 06 21:44:00 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 4Psw4M09Yhz43PxJ; Thu, 6 Apr 2023 21:44:03 +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 4Psw4L2YQGz461S; Thu, 6 Apr 2023 21:44:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680817442; 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=RKGyG4yDho01K/DSMwgDvmpasU8OnW6sh1hEADwKNoY=; b=ue6+3bznd9VOnT+c+qK6RFSTzJez568vn//FNxQh35g7RCb+OTq603k1zFhMdqv8NQRIbN yklSnsMzVGEwhlMqAriNJc2foKziUfAIeBdQ4Od0BG8VN5JmHJhJnWS9LRXaUgH82EP9P1 DE34bNWj0suxmHckWWCU5AMmcUKwL/F3l+vePUphH5FPhDycqKwjx4zK57n72loTo0HPC3 zWVQDpjcSVjfb5gC/hX0StGuPfwaEkBguK9Om9ADyROVgzqPUfad4GsmBic8kPg5c6BsTs CLrISDSvL2Pa+fEU2YwqMqqsaFKztOGR/GAQciO2pKkwRTZ1c3jhbccOiyXKoQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680817442; 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=RKGyG4yDho01K/DSMwgDvmpasU8OnW6sh1hEADwKNoY=; b=DsvER2lYITN14kH6spI98shsRSh3nAQGUe0mEmWn2FxO7HwgETrfRshxbLkHk5w+1jqk8T zeB55FxvDaznGIsxw4hWU7DWfn7ahML9/96CNkiTep7IPJCJ1+mJFauadk/vgP2rXw9GEO 1GVBTyrMSA3nR3ev2aqll1CYk7c9DzSAcFbzxUxMcwV5el+98t3dMlQ0qpGSmXmrsabjRc rligKl245VQmHoTkuowo+pwF6CCkcURy6ojiRiDWWR94VxLb+Q9hwrFp3vti4CGbFGyYJX Q7DR3FPCe0FJnP3uzfImNGIRAc8Qwu4O/DdagNvliDdLsW+XEwKrpxdgVtzTzg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680817442; a=rsa-sha256; cv=none; b=tdDJ4X9bJ92hGstL5ioKPBMsOmlHZZ8IW+DRfirVX5HFmJl8rPia8Ms8kol0wFJS7sSSJT U0i0iogjc2cGE8mP8WK1Fz8BEGxsZS3C57B6NkUPj7R0MbTVYgUK5SIYgwHPQ02WVyqDZq fJd9bbQJ+qIAZHKT3ZxJXv5+1CfAoa4TY7WF2WEAZy0qQybAS08wduwfRk+a+aXLnPpGS4 r3bZBLjag95y8NpSNgQ8ofvDIJFUMdjdj/iRysTTFBUhn0KJZ1HuuV+hZpMYXjD7jLQGfu moOvUlF/pMDLdzUOhXCfanTQoQvae5CTY0047MuPAZ50dfIucKupCHjEh1zhgA== 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 4Psw4J4QTmzL6Q; Thu, 6 Apr 2023 21:44:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 336Li0Xu070609; Thu, 6 Apr 2023 21:44:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 336Li0RH070608; Thu, 6 Apr 2023 21:44:00 GMT (envelope-from git) Date: Thu, 6 Apr 2023 21:44:00 GMT Message-Id: <202304062144.336Li0RH070608@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Robert Clausecker Subject: git: d8b7018aa8d2 - main - devel/fccf: exorcise -march=native and fix LLVM use 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: fuz X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d8b7018aa8d21de29c5e83913397618d4217b2e6 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/ports/commit/?id=d8b7018aa8d21de29c5e83913397618d4217b2e6 commit d8b7018aa8d21de29c5e83913397618d4217b2e6 Author: Robert Clausecker AuthorDate: 2023-02-27 23:40:28 +0000 Commit: Robert Clausecker CommitDate: 2023-04-06 20:33:19 +0000 devel/fccf: exorcise -march=native and fix LLVM use - remove -march=native as per policy. - convert PORTVERSION to DISTVERSION - depend on LLVM using USES=llvm - ensure that the correct LLVM is linked against --- devel/fccf/Makefile | 13 ++++++------- devel/fccf/files/patch-CMakeLists.txt | 15 +++++++++++++-- 2 files changed, 19 insertions(+), 9 deletions(-) diff --git a/devel/fccf/Makefile b/devel/fccf/Makefile index 224b3b6f2e64..6d391124306d 100644 --- a/devel/fccf/Makefile +++ b/devel/fccf/Makefile @@ -1,7 +1,7 @@ PORTNAME= fccf -PORTVERSION= 0.6.0 -PORTREVISION= 1 DISTVERSIONPREFIX= v +DISTVERSION= 0.6.0 +PORTREVISION= 2 CATEGORIES= devel MAINTAINER= ports@FreeBSD.org @@ -10,19 +10,18 @@ WWW= https://github.com/p-ranav/fccf LICENSE= MIT -BUILD_DEPENDS= argparse>0:devel/argparse \ - llvm${LLVM_DEFAULT}>0:devel/llvm${LLVM_DEFAULT} +BUILD_DEPENDS= argparse>0:devel/argparse LIB_DEPENDS= libfmt.so:devel/libfmt -RUN_DEPENDS= llvm${LLVM_DEFAULT}>0:devel/llvm${LLVM_DEFAULT} -USES= cmake +USES= cmake llvm:build,lib,run USE_GITHUB= yes GH_ACCOUNT= p-ranav +CMAKE_ARGS= -DLLVM_DIR:STRING=${PREFIX}/llvm${LLVM_VERSION}/lib/cmake/llvm CXXFLAGS+= -I${LOCALBASE}/include/argparse post-patch: - ${REINPLACE_CMD} "s/llvm-config/llvm-config${LLVM_DEFAULT}/g" ${WRKSRC}/CMakeLists.txt + ${REINPLACE_CMD} "s/llvm-config/${LLVM_CONFIG}/g" ${WRKSRC}/CMakeLists.txt .include diff --git a/devel/fccf/files/patch-CMakeLists.txt b/devel/fccf/files/patch-CMakeLists.txt index 60a94ebfdcbe..dc107e0cff99 100644 --- a/devel/fccf/files/patch-CMakeLists.txt +++ b/devel/fccf/files/patch-CMakeLists.txt @@ -1,8 +1,10 @@ --- CMakeLists.txt.orig 2022-05-02 12:24:57 UTC +++ CMakeLists.txt -@@ -22,29 +22,32 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=native" +@@ -20,31 +20,33 @@ endif() + + set(CMAKE_CXX_FLAGS_DEBUG "-g") set(CMAKE_CXX_FLAGS_RELEASE "-O3") - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=native") +-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=native") -# ---- Argparse ------------- @@ -52,3 +54,12 @@ # ---- LLVM --------------- find_package(LLVM REQUIRED CONFIG) +@@ -90,7 +92,7 @@ find_package(Threads REQUIRED) + ## Append flags to enable exceptions and optimization + set(CMAKE_CXX_FLAGS_DEBUG "-g") + set(CMAKE_CXX_FLAGS_RELEASE "-O3") +-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=native -std=c++17 -fexceptions") ++set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17 -fexceptions") + + # ---- Declare library ---- +