diff options
Diffstat (limited to 'devel/marisa-trie')
| -rw-r--r-- | devel/marisa-trie/Makefile | 45 | ||||
| -rw-r--r-- | devel/marisa-trie/distinfo | 6 | ||||
| -rw-r--r-- | devel/marisa-trie/files/patch-CMakeLists.txt | 46 | ||||
| -rw-r--r-- | devel/marisa-trie/pkg-plist | 10 |
4 files changed, 62 insertions, 45 deletions
diff --git a/devel/marisa-trie/Makefile b/devel/marisa-trie/Makefile index 260bab44d51a..5e646b59bc32 100644 --- a/devel/marisa-trie/Makefile +++ b/devel/marisa-trie/Makefile @@ -1,11 +1,11 @@ PORTNAME= marisa-trie DISTVERSIONPREFIX= v -DISTVERSION= 0.2.6 +DISTVERSION= 0.3.1 PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= devel -MAINTAINER= ports@FreeBSD.org +MAINTAINER= wen@FreeBSD.org COMMENT= MARISA: Matching Algorithm with Recursively Implemented StorAge WWW= https://github.com/s-yata/marisa-trie @@ -13,43 +13,14 @@ LICENSE= BSD2CLAUSE LGPL21+ LICENSE_COMB= dual LICENSE_FILE= ${WRKSRC}/COPYING.md -USES= autoreconf libtool:build pathfix -USE_GITHUB= yes -GH_ACCOUNT= s-yata -GH_PROJECT= marisa-trie +USES= cmake:testing compiler:c++20-lang pathfix USE_LDCONFIG= yes -GNU_CONFIGURE= yes -CONFIGURE_ARGS= --with-pkg-config-dir=${PREFIX}/libdata/pkgconfig - -INSTALL_TARGET= install-strip -TEST_TARGET= check - -OPTIONS_DEFINE= SSE2 SSE3 SSSE3 SSE4 SSE41 SSE42 SSE4A POPCNT -OPTIONS_DEFAULT=${MACHINE_CPU:tu} - -SSE2_DESC= Support for SSE2 -SSE2_CONFIGURE_ENABLE= sse2 - -SSE3_DESC= Support for SSE3 -SSE3_CONFIGURE_ENABLE= sse3 - -SSSE3_DESC= Support for SSSE3 -SSSE3_CONFIGURE_ENABLE= sse3 - -SSE4_DESC= Support for SSE4 -SSE4_CONFIGURE_ENABLE= sse4 - -SSE41_DESC= Support for SSE4.1 -SSE41_CONFIGURE_ENABLE= sse4.1 - -SSE42_DESC= Support for SSE4.2 -SSE42_CONFIGURE_ENABLE= sse4.2 - -SSE4A_DESC= Support for SSE4a -SSE4A_CONFIGURE_ENABLE= sse4a +USE_GITHUB= yes +GH_ACCOUNT= s-yata -POPCNT_DESC= Support for POPCNT -POPCNT_CONFIGURE_ENABLE= POPCNT +CMAKE_ON_amd64= ENABLE_NATIVE_CODE +CMAKE_ON= BUILD_SHARED_LIBS \ + ${CMAKE_ON_${ARCH}} .include <bsd.port.mk> diff --git a/devel/marisa-trie/distinfo b/devel/marisa-trie/distinfo index 9a0f5b959572..d3a53decd190 100644 --- a/devel/marisa-trie/distinfo +++ b/devel/marisa-trie/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1665596480 -SHA256 (s-yata-marisa-trie-v0.2.6_GH0.tar.gz) = 1063a27c789e75afa2ee6f1716cc6a5486631dcfcb7f4d56d6485d2462e566de -SIZE (s-yata-marisa-trie-v0.2.6_GH0.tar.gz) = 168332 +TIMESTAMP = 1759225340 +SHA256 (s-yata-marisa-trie-v0.3.1_GH0.tar.gz) = 986ed5e2967435e3a3932a8c95980993ae5a196111e377721f0849cad4e807f3 +SIZE (s-yata-marisa-trie-v0.3.1_GH0.tar.gz) = 212791 diff --git a/devel/marisa-trie/files/patch-CMakeLists.txt b/devel/marisa-trie/files/patch-CMakeLists.txt new file mode 100644 index 000000000000..6e8778796dcc --- /dev/null +++ b/devel/marisa-trie/files/patch-CMakeLists.txt @@ -0,0 +1,46 @@ +--- CMakeLists.txt.orig 2025-07-20 11:08:58 UTC ++++ CMakeLists.txt +@@ -19,7 +19,6 @@ function(check_macro_defined MACRO OUTPUT_VAR) + SOURCE_FROM_CONTENT + "check_${OUTPUT_VAR}.cc" + "#ifndef ${MACRO}\n#error \"${MACRO} is missing\"\n#endif\n" +- COMPILE_DEFINITIONS -march=native + ) + set("${OUTPUT_VAR}" "${result}" PARENT_SCOPE) + message("${OUTPUT_VAR}: ${result}") +@@ -46,25 +45,25 @@ function(add_native_code TARGET) + cmake_dependent_option(ENABLE_BMI2 "Use BMI2 instructions" ON "ENABLE_NATIVE_CODE;HAVE_BMI2" OFF) + function(add_native_code TARGET) + if(ENABLE_NATIVE_CODE) +- target_compile_options("${TARGET}" PRIVATE -march=native) ++# target_compile_options("${TARGET}" PRIVATE -march=native) + if(ENABLE_BMI2) +- target_compile_options("${TARGET}" PRIVATE -DMARISA_USE_BMI2 -mbmi2 -msse4) ++ target_compile_options("${TARGET}" PRIVATE -DMARISA_USE_BMI2) + elseif(ENABLE_BMI) +- target_compile_options("${TARGET}" PRIVATE -DMARISA_USE_BMI -mbmi -msse4) ++ target_compile_options("${TARGET}" PRIVATE -DMARISA_USE_BMI) + elseif(ENABLE_SSE4A) +- target_compile_options("${TARGET}" PRIVATE -DMARISA_USE_SSE4A -msse4a) ++ target_compile_options("${TARGET}" PRIVATE -DMARISA_USE_SSE4A) + elseif(ENABLE_SSE4_2 AND ENABLE_POPCNT) +- target_compile_options("${TARGET}" PRIVATE -DMARISA_USE_SSE4 -msse4) ++ target_compile_options("${TARGET}" PRIVATE -DMARISA_USE_SSE4) + elseif(ENABLE_SSE4_2) +- target_compile_options("${TARGET}" PRIVATE -DMARISA_USE_SSE4_2 -msse4.2) ++ target_compile_options("${TARGET}" PRIVATE -DMARISA_USE_SSE4_2) + elseif(ENABLE_SSE4_1) +- target_compile_options("${TARGET}" PRIVATE -DMARISA_USE_SSE4_1 -msse4.1) ++ target_compile_options("${TARGET}" PRIVATE -DMARISA_USE_SSE4_1) + elseif(ENABLE_SSSE3) +- target_compile_options("${TARGET}" PRIVATE -DMARISA_USE_SSSE3 -mssse3) ++ target_compile_options("${TARGET}" PRIVATE -DMARISA_USE_SSSE3) + elseif(ENABLE_SSE3) +- target_compile_options("${TARGET}" PRIVATE -DMARISA_USE_SSE3 -msse3) ++ target_compile_options("${TARGET}" PRIVATE -DMARISA_USE_SSE3) + elseif(ENABLE_SSE2) +- target_compile_options("${TARGET}" PRIVATE -DMARISA_USE_SSE2 -msse2) ++ target_compile_options("${TARGET}" PRIVATE -DMARISA_USE_SSE2) + endif() + endif() + endfunction() diff --git a/devel/marisa-trie/pkg-plist b/devel/marisa-trie/pkg-plist index 8bde20e459b5..7b9f19f3d70b 100644 --- a/devel/marisa-trie/pkg-plist +++ b/devel/marisa-trie/pkg-plist @@ -8,17 +8,17 @@ bin/marisa-reverse-lookup include/marisa.h include/marisa/agent.h include/marisa/base.h -include/marisa/exception.h include/marisa/iostream.h include/marisa/key.h include/marisa/keyset.h include/marisa/query.h -include/marisa/scoped-array.h -include/marisa/scoped-ptr.h include/marisa/stdio.h include/marisa/trie.h -lib/libmarisa.a +lib/cmake/Marisa/MarisaConfig.cmake +lib/cmake/Marisa/MarisaConfigVersion.cmake +lib/cmake/Marisa/MarisaTargets-%%CMAKE_BUILD_TYPE%%.cmake +lib/cmake/Marisa/MarisaTargets.cmake lib/libmarisa.so lib/libmarisa.so.0 -lib/libmarisa.so.0.0.0 +lib/libmarisa.so.0.3.1 libdata/pkgconfig/marisa.pc |