From nobody Sat May 2 05:41:50 2026 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 4g6xcG6wfpz6cjlv for ; Sat, 02 May 2026 05:41:50 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g6xcG5xhhz3YLF for ; Sat, 02 May 2026 05:41:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777700510; 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=7ULPh9wsfJlzQyHBwMweQqejg3oooHIQ2o4Kz+MbnOE=; b=SELY/gT6PXdU+OZ8D9zcIlzl7pzqIhE/dQ2ML8DNCn1XlWwCyliCZFEw9NkMZ60CSwbToK 59QM9DjWMfa4eWClKEZ7+tRaocWU119FzZ44pFeuy/zmBgHpNvpmUGylInsvliRmWLDlqq 9NUcZKZDv9Shn3b4hUabCzYu5exVIQ+mFugmsaNSVmizQND/5PT2+5zyLdyGTCI2b7Kc3h u6NKo1C7vsMBXjs2LkOnILL9aC26Lew/ZVZje4VqqabGzSzhP7Ww4jQWjDL6JBArA/GR7Z wTUwrxYEDpRTZabESggdG/IjxrouFDARNti+8nc68BulLPwCt2xWd+8WtFQUQw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777700510; a=rsa-sha256; cv=none; b=xIXA9msvoply2CZIVWCqxQp3z9fJfEWT9glQTsrhNDxWqVp3SUlVAzQP76FJOxwmztA2N1 t+PWJSUTpJQVkNU072fhZ+TqAMw1K6SLthRO26pbIhc3OmS1zePRoPtYxI3YP1Mj4OplcR pgl+XmGjCCbjXwaRqnH/n7QfVF/lpQqR9EfSbXEUel3h68aJGaUstfPIQYgpXDgHwuKFj0 /Lg+/2wRhQKWFgArcvHO8l9slXf+IFk5B5nE1bHOPMDBr1r/7KKB+cM7CR8aIYMNW3C5ml ut7L7P/hPWdwDDfmacjXivD6Jo1VF/0aIYVrxqYzGKehEq0WzJV4br2BMlobQQ== 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=1777700510; 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=7ULPh9wsfJlzQyHBwMweQqejg3oooHIQ2o4Kz+MbnOE=; b=PO9CRflAuPhBpm41dNhw7ZPCLmKHSyVs8suYhCWKdb3xJ8ZzydPvTV31x8uSMV8b5TmniF ZBCyeAXwXUSerYhdMfIAlkMzfZA2UclFAy6WaQtrZNwtRoxlF1Ga3KpAY9s9ukGO52/4Jr jns+v+Sgy54d5nOUXLbsuFbKH7cIZjIdVocAN2xdwTZ3XZ+AqZac3ePY5hw2rgTfH4zllP mNGGQ+qINP463ABenvak2mIF7jQlErdDbgYQEqPRIbq3TONPqC3LYKGLraD3y8rdDSSM6i PBSv8yZLcwSqgjz3uaULjYGZWJcJrMovvWmFW0PdlYoHHVlUYqQ6ZcOr8XMXFw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g6xcG5Xg3zYhN for ; Sat, 02 May 2026 05:41:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 24275 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 02 May 2026 05:41:50 +0000 To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Xin LI Subject: git: 8fb0c95b96e9 - main - devel/vectorscan: Fix various style issues. 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: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: delphij X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8fb0c95b96e97d71339d6a158ed42936fc0b10e4 Auto-Submitted: auto-generated Date: Sat, 02 May 2026 05:41:50 +0000 Message-Id: <69f58e9e.24275.709e40b7@gitrepo.freebsd.org> The branch main has been updated by delphij: URL: https://cgit.FreeBSD.org/ports/commit/?id=8fb0c95b96e97d71339d6a158ed42936fc0b10e4 commit 8fb0c95b96e97d71339d6a158ed42936fc0b10e4 Author: Xin LI AuthorDate: 2026-05-02 05:38:21 +0000 Commit: Xin LI CommitDate: 2026-05-02 05:38:21 +0000 devel/vectorscan: Fix various style issues. - Use DISTVERSION instead of PORTVERSION - Fix variable ordering - Fix compiler requirement: compiler:c++11-lib -> compiler:c++17-lang - Respect CFLAGS: patch cmake/cflags-generic.cmake to not hardcode -O3, and patch CMakeLists.txt to not strip -O from config-specific flags - Add OPTIMIZED_CFLAGS option (default on) to restore -O3 for performance, letting users opt out while matching upstream intent - Fix options ordering: OPTIONS_DEFAULT before OPTIONS_RADIO, descriptions and helpers in canonical order Reported by: diizzy --- devel/vectorscan/Makefile | 43 ++++++++++++---------- devel/vectorscan/files/patch-CMakeLists.txt | 14 +++++++ .../files/patch-cmake_cflags-generic.cmake | 11 ++++++ 3 files changed, 49 insertions(+), 19 deletions(-) diff --git a/devel/vectorscan/Makefile b/devel/vectorscan/Makefile index dd8bc0cea64d..d3223fc7a2df 100644 --- a/devel/vectorscan/Makefile +++ b/devel/vectorscan/Makefile @@ -1,6 +1,6 @@ PORTNAME= vectorscan -PORTVERSION= 5.4.12 DISTVERSIONPREFIX= vectorscan/ +DISTVERSION= 5.4.12 CATEGORIES= devel textproc MASTER_SITES= SF/boost/boost/${BOOST_VERSION}:boost DISTFILES= boost_${BOOST_VERSION_UNDER}.tar.gz:boost @@ -11,35 +11,48 @@ WWW= https://github.com/VectorCamp/vectorscan LICENSE= BSD3CLAUSE +ONLY_FOR_ARCHS= aarch64 amd64 + BUILD_DEPENDS= ragel:devel/ragel -USES= compiler:c++11-lib cmake pathfix python:build +USES= cmake compiler:c++17-lang pathfix python:build USE_GITHUB= yes GH_ACCOUNT= VectorCamp -ONLY_FOR_ARCHS= aarch64 amd64 +BOOST_VERSION= 1.89.0 +BOOST_VERSION_UNDER= ${BOOST_VERSION:C/\./_/g} + +CMAKE_ARGS+= -DBOOST_ROOT=${WRKDIR}/boost_${BOOST_VERSION_UNDER} + +CFLAGS+= -fPIC -OPTIONS_DEFINE= SHARED +OPTIONS_DEFINE= OPTIMIZED_CFLAGS SHARED +OPTIONS_DEFAULT= OPTIMIZED_CFLAGS SHARED +OPTIONS_DEFAULT_amd64= FAT_RUNTIME OPTIONS_RADIO= ISA OPTIONS_RADIO_ISA= NATIVE FAT_RUNTIME OPTIONS_RADIO_ISA_amd64= AVX2 AVX512 AVX512VBMI OPTIONS_RADIO_ISA_aarch64= SVE SVE2 SVE2_BITPERM OPTIONS_SUB= yes -SHARED_DESC= Build shared library -NATIVE_DESC= Build with native CPU tunes + FAT_RUNTIME_DESC= Build for multiple microarchitectures with runtime ISA dispatch +NATIVE_DESC= Build with native CPU tunes +SHARED_DESC= Build shared library AVX2_DESC= Enable AVX2 instructions for fixed-ISA builds AVX512_DESC= Enable AVX512 instructions for fixed-ISA builds AVX512VBMI_DESC= Enable AVX512VBMI instructions for fixed-ISA builds SVE_DESC= Enable Arm SVE instructions SVE2_DESC= Enable Arm SVE2 instructions SVE2_BITPERM_DESC= Enable Arm SVE2 bit permutation instructions -OPTIONS_DEFAULT= SHARED -OPTIONS_DEFAULT_amd64= FAT_RUNTIME -CMAKE_ARGS+= -DBOOST_ROOT=${WRKDIR}/boost_${BOOST_VERSION_UNDER} -NATIVE_CMAKE_BOOL= USE_CPU_NATIVE -FAT_RUNTIME_CMAKE_BOOL= FAT_RUNTIME +FAT_RUNTIME_CMAKE_BOOL= FAT_RUNTIME +NATIVE_CMAKE_BOOL= USE_CPU_NATIVE +OPTIMIZED_CFLAGS_CFLAGS= -O3 +OPTIMIZED_CFLAGS_CXXFLAGS= -O3 +SHARED_CMAKE_ON= -DBUILD_SHARED_LIBS:BOOL=ON -DBUILD_STATIC_LIBS:BOOL=ON +SHARED_CMAKE_OFF= -DBUILD_STATIC_LIBS:BOOL=ON +SHARED_VARS= PLIST_SUB+="SOVERSION=${PORTVERSION}" \ + PLIST_SUB+="SOSHORTVERSION=${PORTVERSION:R:R}" AVX2_CMAKE_BOOL= BUILD_AVX2 AVX512_CMAKE_ON= -DBUILD_AVX2:BOOL=ON -DBUILD_AVX512:BOOL=ON AVX512VBMI_CMAKE_ON= -DBUILD_AVX2:BOOL=ON -DBUILD_AVX512:BOOL=ON \ @@ -48,14 +61,6 @@ SVE_CMAKE_BOOL= BUILD_SVE SVE2_CMAKE_ON= -DBUILD_SVE:BOOL=ON -DBUILD_SVE2:BOOL=ON SVE2_BITPERM_CMAKE_ON= -DBUILD_SVE:BOOL=ON -DBUILD_SVE2:BOOL=ON \ -DBUILD_SVE2_BITPERM:BOOL=ON -SHARED_CMAKE_ON= -DBUILD_SHARED_LIBS:BOOL=ON -DBUILD_STATIC_LIBS:BOOL=ON -SHARED_CMAKE_OFF= -DBUILD_STATIC_LIBS:BOOL=ON -SHARED_VARS= PLIST_SUB+="SOVERSION=${PORTVERSION}" \ - PLIST_SUB+="SOSHORTVERSION=${PORTVERSION:R:R}" - -CFLAGS+= -fPIC -BOOST_VERSION= 1.89.0 -BOOST_VERSION_UNDER= ${BOOST_VERSION:C/\./_/g} post-patch: ${RM} ${WRKSRC}/tools/CMakeLists.txt diff --git a/devel/vectorscan/files/patch-CMakeLists.txt b/devel/vectorscan/files/patch-CMakeLists.txt new file mode 100644 index 000000000000..c0e928bf150a --- /dev/null +++ b/devel/vectorscan/files/patch-CMakeLists.txt @@ -0,0 +1,14 @@ +--- CMakeLists.txt.orig 2026-05-02 04:09:59 UTC ++++ CMakeLists.txt +@@ -170,11 +170,6 @@ endif() + endif() + endif() + +-# remove CMake's idea of optimisation +-foreach (CONFIG ${CMAKE_BUILD_TYPE} ${CMAKE_CONFIGURATION_TYPES}) +- string(REGEX REPLACE "-O[^ ]*" "" CMAKE_C_FLAGS_${CONFIG} "${CMAKE_C_FLAGS_${CONFIG}}") +- string(REGEX REPLACE "-O[^ ]*" "" CMAKE_CXX_FLAGS_${CONFIG} "${CMAKE_CXX_FLAGS_${CONFIG}}") +-endforeach () + + message(STATUS "ARCH_C_FLAGS : ${ARCH_C_FLAGS}") + message(STATUS "ARCH_CXX_FLAGS : ${ARCH_CXX_FLAGS}") diff --git a/devel/vectorscan/files/patch-cmake_cflags-generic.cmake b/devel/vectorscan/files/patch-cmake_cflags-generic.cmake new file mode 100644 index 000000000000..f80f74e199b2 --- /dev/null +++ b/devel/vectorscan/files/patch-cmake_cflags-generic.cmake @@ -0,0 +1,11 @@ +--- cmake/cflags-generic.cmake.orig 2026-05-02 04:09:59 UTC ++++ cmake/cflags-generic.cmake +@@ -1,6 +1,6 @@ + # set compiler flags - more are tested and added later +-set(EXTRA_C_FLAGS "${OPT_C_FLAG} -std=c17 -Wall -Wextra ") +-set(EXTRA_CXX_FLAGS "${OPT_CXX_FLAG} -std=c++17 -Wall -Wextra ") ++set(EXTRA_C_FLAGS "-std=c17 -Wall -Wextra ") ++set(EXTRA_CXX_FLAGS "-std=c++17 -Wall -Wextra ") + if (NOT CMAKE_COMPILER_IS_CLANG) + set(EXTRA_CXX_FLAGS "${EXTRA_CXX_FLAGS} -fno-new-ttp-matching") + endif()