diff --git a/biology/spoa/Makefile b/biology/spoa/Makefile index 05da6a20b28e..b598f6a520ff 100644 --- a/biology/spoa/Makefile +++ b/biology/spoa/Makefile @@ -1,43 +1,44 @@ PORTNAME= spoa DISTVERSION= 4.0.7 PORTREVISION= 2 CATEGORIES= biology MAINTAINER= yuri@FreeBSD.org COMMENT= C++ implementation of the partial order alignment (POA) algorithm LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= bioparser>0:biology/bioparser \ ${LOCALBASE}/include/biosoup/nucleic_acid.hpp:biology/biosoup \ cereal>0:devel/cereal \ simde>0:devel/simde LIB_DEPENDS= libcpu_features.so:devel/cpu_features RUN_DEPENDS= cereal>0:devel/cereal TEST_DEPENDS= googletest>0:devel/googletest USES= cmake compiler:c++11-lang localbase:ldflags USE_LDCONFIG= yes USE_GITHUB= yes GH_ACCOUNT= rvaser CMAKE_ON= BUILD_SHARED_LIBS spoa_optimize_for_portability spoa_build_executable spoa_use_simde spoa_use_simde_nonvec spoa_use_simde_openmp CMAKE_OFF= spoa_optimize_for_native +CXXFLAGS+= -I${LOCALBASE}/include/cpu_features LDFLAGS+= -lz -lcpu_features .include .if ${ARCH} == amd64 || ${ARCH} == i386 CMAKE_ARGS+= -Dspoa_generate_dispatch:BOOL=ON .endif do-test: @cd ${BUILD_WRKSRC} && \ ${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} -D${PORTNAME}_build_tests:BOOL=ON ${CMAKE_SOURCE_PATH} && \ ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET} && \ ${BUILD_WRKSRC}/bin/${PORTNAME}_test .include diff --git a/devel/cpu_features/Makefile b/devel/cpu_features/Makefile index 2c2ee5028668..061b43b57598 100644 --- a/devel/cpu_features/Makefile +++ b/devel/cpu_features/Makefile @@ -1,30 +1,27 @@ PORTNAME= cpu_features -PORTVERSION= 0.6.0 +DISTVERSION= 0.6.0 +PORTREVISION= 1 DISTVERSIONPREFIX= v CATEGORIES= devel MAINTAINER= skreuzer@FreeBSD.org COMMENT= Cross platform C99 library to get cpu features at runtime LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE NOT_FOR_ARCHS= aarch64 armv6 armv7 mips mips64 riscv64 NOT_FOR_ARCHS_REASON= assumes android if on ARM or MIPS; not ported to riscv64 -USES= cmake:insource +USES= cmake:testing # 3 tests fail, see https://github.com/google/cpu_features/issues/215 USE_GITHUB= yes GH_ACCOUNT= google CMAKE_ON= BUILD_SHARED_LIBS CFLAGS+= -fPIC -do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/list_cpu_features ${STAGEDIR}${PREFIX}/bin - ${INSTALL_LIB} ${WRKSRC}/libcpu_features.so ${STAGEDIR}${PREFIX}/lib - ${MKDIR} ${STAGEDIR}${PREFIX}/include/internal - ${INSTALL_DATA} ${WRKSRC}/include/*.h ${STAGEDIR}${PREFIX}/include - ${INSTALL_DATA} ${WRKSRC}/include/internal/*.h ${STAGEDIR}${PREFIX}/include/internal +post-install: + ${INSTALL_DATA} ${WRKSRC}/include/cpuinfo_*.h ${STAGEDIR}${PREFIX}/include/${PORTNAME} .include diff --git a/devel/cpu_features/files/patch-cmake_googletest.CMakeLists.txt.in b/devel/cpu_features/files/patch-cmake_googletest.CMakeLists.txt.in new file mode 100644 index 000000000000..574ffd9b7c5c --- /dev/null +++ b/devel/cpu_features/files/patch-cmake_googletest.CMakeLists.txt.in @@ -0,0 +1,17 @@ +--- cmake/googletest.CMakeLists.txt.in.orig 2022-01-16 19:20:55 UTC ++++ cmake/googletest.CMakeLists.txt.in +@@ -5,11 +5,11 @@ project(googletest-download NONE) + include(ExternalProject) + ExternalProject_Add(googletest + GIT_REPOSITORY https://github.com/google/googletest.git +- GIT_TAG master ++ GIT_TAG main + SOURCE_DIR "${CMAKE_BINARY_DIR}/googletest-src" + BINARY_DIR "${CMAKE_BINARY_DIR}/googletest-build" + CONFIGURE_COMMAND "" + BUILD_COMMAND "" + INSTALL_COMMAND "" + TEST_COMMAND "" +-) +\ No newline at end of file ++) diff --git a/devel/cpu_features/pkg-plist b/devel/cpu_features/pkg-plist index e89c9e3391a6..c38fceecee8a 100644 --- a/devel/cpu_features/pkg-plist +++ b/devel/cpu_features/pkg-plist @@ -1,15 +1,13 @@ bin/list_cpu_features -include/cpu_features_cache_info.h -include/cpu_features_macros.h -include/cpuinfo_aarch64.h -include/cpuinfo_arm.h -include/cpuinfo_mips.h -include/cpuinfo_ppc.h -include/cpuinfo_x86.h -include/internal/bit_utils.h -include/internal/cpuid_x86.h -include/internal/filesystem.h -include/internal/hwcaps.h -include/internal/stack_line_reader.h -include/internal/string_view.h +include/cpu_features/cpu_features_cache_info.h +include/cpu_features/cpu_features_macros.h +include/cpu_features/cpuinfo_aarch64.h +include/cpu_features/cpuinfo_arm.h +include/cpu_features/cpuinfo_mips.h +include/cpu_features/cpuinfo_ppc.h +include/cpu_features/cpuinfo_x86.h +lib/cmake/CpuFeatures/CpuFeaturesConfig.cmake +lib/cmake/CpuFeatures/CpuFeaturesConfigVersion.cmake +lib/cmake/CpuFeatures/CpuFeaturesTargets-%%CMAKE_BUILD_TYPE%%.cmake +lib/cmake/CpuFeatures/CpuFeaturesTargets.cmake lib/libcpu_features.so diff --git a/security/hexl/Makefile b/security/hexl/Makefile index cf60790555f4..e589e0b20de7 100644 --- a/security/hexl/Makefile +++ b/security/hexl/Makefile @@ -1,27 +1,29 @@ PORTNAME= hexl DISTVERSIONPREFIX= v DISTVERSION= 1.2.3 CATEGORIES= security MAINTAINER= yuri@FreeBSD.org COMMENT= Intel homomorphic encryption acceleration library LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE BROKEN_i386= error: __int128 is not supported on this target LIB_DEPENDS= libcpu_features.so:devel/cpu_features USES= cmake:testing compiler:c++11-lang localbase:ldflags USE_LDCONFIG= yes USE_GITHUB= yes GH_ACCOUNT= intel CMAKE_ON= HEXL_SHARED_LIB CMAKE_OFF= HEXL_BENCHMARK HEXL_TESTING CMAKE_TESTING_ON= HEXL_TESTING CMAKE_TESTING_TARGET= unittest +CXXFLAGS+= -I${LOCALBASE}/include/cpu_features + .include diff --git a/security/softether5/Makefile b/security/softether5/Makefile index 3ed91a1caedc..17b4d28cf2fa 100644 --- a/security/softether5/Makefile +++ b/security/softether5/Makefile @@ -1,70 +1,72 @@ PORTNAME= softether DISTVERSION= 5.02.5180 PORTEPOCH= 2 CATEGORIES= security net-vpn PKGNAMESUFFIX= 5 DIST_SUBDIR= ${PORTNAME} # Some patches are managed in my GitHub fork PATCH_SITES= https://github.com/metalefty/${GH_PROJECT}/commit/ PATCHFILES= f4baf91.patch:-p1 5890ce9.patch:-p1 ddaffd5.patch:-p1 \ 57aa471.patch:-p1 MAINTAINER= meta@FreeBSD.org COMMENT= SoftEther VPN 5 (Developer Edition) LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE LIB_DEPENDS= libsodium.so:security/libsodium USES+= cmake:noninja compiler:c11 iconv:wchar_t \ localbase:ldflags ncurses pkgconfig readline ssl USE_RC_SUBR= softether_bridge softether_client \ softether_server softether_trafficserver USE_LDCONFIG= yes USE_GITHUB= yes GH_ACCOUNT= SoftEtherVPN GH_PROJECT= SoftEtherVPN GH_TUPLE= SoftEtherVPN:libhamcore:2951ae5:libhamcore/src/libhamcore \ BLAKE2:BLAKE2:b52178a:BLAKE2/3rdparty/BLAKE2 \ cxong:tinydir:ec6bff2:tinydir/3rdparty/tinydir CMAKE_ARGS+= -DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DSE_DBDIR="${SE_DBDIR}" \ -DSE_LOGDIR="${SE_LOGDIR}" \ -DSE_PIDDIR="${SE_PIDDIR}" +CFLAGS+= -I${LOCALBASE}/include/cpu_features + OPTIONS_DEFINE= DOCS PORTDOCS= DISCLAIMER.md WARNING.TXT CONFLICTS_INSTALL= softether-4.[0-9]* softether-devel-4.[0-9]* SE_DBDIR?= /var/db/${PORTNAME} SE_LOGDIR?= /var/log/${PORTNAME} SE_PIDDIR?= /var/run/${PORTNAME} PLIST_SUB= SE_DBDIR="${SE_DBDIR}" SE_LOGDIR="${SE_LOGDIR}" SE_PIDDIR="${SE_PIDDIR}" SUB_LIST= SE_DBDIR="${SE_DBDIR}" SE_LOGDIR="${SE_LOGDIR}" SE_PIDDIR="${SE_PIDDIR}" SUB_FILES= pkg-message .include # devel/cpu_features not available on these archs, see devel/cpu_features/Makefile .if (${ARCH} == aarch64 || ${ARCH} == armv6 || ${ARCH} == armv7 || ${ARCH} == mips || ${ARCH} == mips64) # skip cpu_features when devel/cpu_features is not available CMAKE_BOOL_ON+= SKIP_CPU_FEATURES .else -BUILD_DEPENDS+= ${LOCALBASE}/include/cpu_features_macros.h:devel/cpu_features +BUILD_DEPENDS+= ${LOCALBASE}/include/cpu_features/cpu_features_macros.h:devel/cpu_features LIB_DEPENDS+= libcpu_features.so:devel/cpu_features .endif post-install: @${MKDIR} ${STAGEDIR}${SE_LOGDIR} ${STAGEDIR}${SE_DBDIR} ${STAGEDIR}${SE_PIDDIR} post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} .for doc in ${PORTDOCS} ${FIND} ${WRKSRC} -name ${doc} -exec ${INSTALL_DATA} {} ${STAGEDIR}${DOCSDIR} \; .endfor .include