From nobody Mon Aug 07 06:44:55 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 4RK6J81v91z4TvVq; Mon, 7 Aug 2023 06:44:56 +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 4RK6J7686qz4ZpZ; Mon, 7 Aug 2023 06:44:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691390695; 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=zxHOFcKGmFSXthVR23JOmvXUtnwL9iN1UrvPNYucp0Q=; b=qHfoZf/+nJxYvlwUnT6krZQCiaxOhs4boqjW0K4hAqN2tzjVB4gNYZl37EBA2usJJXpgYu F1svluAYAFAN4o3LIc2pcuzQrnUe5KguOFa7wIC/aZngX2mw3pfBt6RIdsprXEEtmOHPWO f15IidIP1ceWUCiEyPZKNK4Bf796s89gFLa2Vx5llu8gj0zsclomnBydRc2k3pFCKXIbka wewoc/hdc6OU8Xvb0QIXZMopBXM6CFRV70r+SZ7PoTW2pJvBEj265DCTEN/duXgMaHrP8+ qFoknGJ9gyU7oiuMnmBmbHRU4V1aTd2oLqPUE2l3K/hL22pCnWRXm9badHwm2w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691390695; 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=zxHOFcKGmFSXthVR23JOmvXUtnwL9iN1UrvPNYucp0Q=; b=YqGS61RPDWLtpi/qpABbfg0Clk05vSaugquu2SvVEb9kpCDk2KhzAdSyoTtIeei9UQPzuQ hXRKcH9JGiaARocgzmT3o0MQEx5ME1HITWlrovjht3ufNo8Tx6cJCEJO3LaAtYxRkTXS12 UBeF9466hwZ+LlFAZ2o4A8nIFIRC4tNsyfkXL43bvPCWiJbwMC+FVHfp9KMmWPXA3G7/G8 MFoyU6O+7bC8UMKwRXC+YNNVqfZz8dG4ZIMvnfPAz++opOOeRit2ppZbVTJJ9yWbZT2wYp 39lF4oV+OvgaCnWJE7tHuNGGWniNtKgtjd4rfxitIVsu6spYC6JG0t6Wq7CxAA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691390695; a=rsa-sha256; cv=none; b=w59Ls0ckm9FhvDpKcOjpLzBIiPy6VGTy75f7NBXSv1ZLuJCN63o9ozfkeSFHTozbcZ14B5 Lmb+/Snqn/C7MGjGmmLPErxuozahke29H/7HkDNg9EYjNC5LGEh2wgceKA8mX3vN/pXFZB g/tukoNc6rx90HY/35jIjSYrg+J/KMAdjXxXUGycT8Gnpli1ajOKCgkYyQAHZQtSpfhyR0 YHxRYRapD03mQcifticiOmX79g/U2a2jOXJnYJir7zG+h4dEsPkw3ENsvSmA1/90PnLyuA yH3hM8qlequXT3xld/ZL3t3P5B3Dk0RR2TEO+JkBQFNbHWYAU+aM3F9yoampIg== 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 4RK6J75DnyzjNp; Mon, 7 Aug 2023 06:44:55 +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 3776itiO060933; Mon, 7 Aug 2023 06:44:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3776itIw060932; Mon, 7 Aug 2023 06:44:55 GMT (envelope-from git) Date: Mon, 7 Aug 2023 06:44:55 GMT Message-Id: <202308070644.3776itIw060932@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: ce1070f1121f - main - security/nflib: Remove NATIVE option 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: yuri X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ce1070f1121f0d062dcf393bdc42f39d15438e13 Auto-Submitted: auto-generated The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=ce1070f1121f0d062dcf393bdc42f39d15438e13 commit ce1070f1121f0d062dcf393bdc42f39d15438e13 Author: Yuri Victorovich AuthorDate: 2023-08-07 06:42:51 +0000 Commit: Yuri Victorovich CommitDate: 2023-08-07 06:44:53 +0000 security/nflib: Remove NATIVE option Let CPUTYPE handle native optimizations. PR: 272702 Reported by: diizzy@ --- security/nflib/Makefile | 6 +----- security/nflib/files/patch-CMakeCompilers.txt | 11 +++++++++++ security/nflib/files/patch-CMakeLists.txt | 11 ++++++++++- 3 files changed, 22 insertions(+), 6 deletions(-) diff --git a/security/nflib/Makefile b/security/nflib/Makefile index 6b821c36d14c..686d3f61c5e5 100644 --- a/security/nflib/Makefile +++ b/security/nflib/Makefile @@ -2,7 +2,7 @@ PORTNAME= nflib DISTVERSIONPREFIX= v DISTVERSION= 1.0.0-23 DISTVERSIONSUFFIX= -g5cf40ed -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= security math MAINTAINER= yuri@FreeBSD.org @@ -28,10 +28,6 @@ USE_LDCONFIG= yes CMAKE_ON= NFL_OPTIMIZED -OPTIONS_DEFINE= NATIVE - -NATIVE_DESC= Build with native optimizations (-march=native) - post-patch-NATIVE-off: @${REINPLACE_CMD} -e 's|-march=native|| ; s|-mtune=native||' ${WRKSRC}/CMakeLists.txt ${WRKSRC}/CMakeCompilers.txt diff --git a/security/nflib/files/patch-CMakeCompilers.txt b/security/nflib/files/patch-CMakeCompilers.txt new file mode 100644 index 000000000000..7448594f4a83 --- /dev/null +++ b/security/nflib/files/patch-CMakeCompilers.txt @@ -0,0 +1,11 @@ +--- CMakeCompilers.txt.orig 2023-08-07 06:26:47 UTC ++++ CMakeCompilers.txt +@@ -16,7 +16,7 @@ endif() + # optimization flags support + if(CMAKE_BUILD_TYPE MATCHES Release) + set(CMAKE_CXX_FLAGS_RELEASE "-DNDEBUG -O3") +- foreach(FLAG -march=native -mtune=native -funroll-loops) ++ foreach(FLAG -funroll-loops) + string(REGEX REPLACE -= _ FLAG_ID ${FLAG}) + string(TOUPPER ${FLAG_ID} FLAG_ID) + CHECK_CXX_COMPILER_FLAG(${FLAG} COMPILER_SUPPORTS${FLAG_ID}) diff --git a/security/nflib/files/patch-CMakeLists.txt b/security/nflib/files/patch-CMakeLists.txt index 66188024ab0b..67616fe75fb4 100644 --- a/security/nflib/files/patch-CMakeLists.txt +++ b/security/nflib/files/patch-CMakeLists.txt @@ -1,5 +1,14 @@ ---- CMakeLists.txt.orig 2020-02-22 22:31:07 UTC +--- CMakeLists.txt.orig 2019-11-18 12:19:53 UTC +++ CMakeLists.txt +@@ -12,7 +12,7 @@ if(NFL_OPTIMIZED) + + include(CheckCXXSourceCompiles) + set(CMAKE_CXX_FLAGS_OLD ${CMAKE_CXX_FLAGS}) +- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=native") ++ #set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=native") + + check_cxx_source_compiles("#include \nint main() { return 0;}" NFLLIB_USE_AVX) + check_cxx_source_compiles("#include \nint main() { return 0;}" NFLLIB_USE_SSE) @@ -64,4 +64,6 @@ install(FILES ${NFLLIB_HDRS_3} DESTINATION include/nfl install(FILES ${NFLLIB_HDRS_4} DESTINATION include/nfl/opt/arch) install(FILES ${NFLLIB_PRNG_HDRS} DESTINATION include/nfl/prng)