diff options
| author | yuri <yuri@35697150-7ecd-e111-bb59-0022644237b5> | 2021-02-19 09:22:30 +0000 |
|---|---|---|
| committer | yuri <yuri@35697150-7ecd-e111-bb59-0022644237b5> | 2021-02-19 09:22:30 +0000 |
| commit | 06dc1535fc0ef79bfb16c39e2b643da079f85eda (patch) | |
| tree | 850a28cd6989d83c34183ed2bad46717d57414cd /biology | |
| parent | 5fe91cd0feb20c93bc48ff1f38de8d03262a123a (diff) | |
| download | freebsd-ports-06dc1535fc0ef79bfb16c39e2b643da079f85eda.tar.gz freebsd-ports-06dc1535fc0ef79bfb16c39e2b643da079f85eda.tar.bz2 | |
biology/spoa: Fix build after recent devel/cereal update; Fix LIB_DEPENDS
Reported by: fallout
git-svn-id: http://svn.freebsd.org/ports/head@566037 35697150-7ecd-e111-bb59-0022644237b5
Diffstat (limited to 'biology')
| -rw-r--r-- | biology/spoa/Makefile | 3 | ||||
| -rw-r--r-- | biology/spoa/files/patch-CMakeLists.txt | 17 |
2 files changed, 16 insertions, 4 deletions
diff --git a/biology/spoa/Makefile b/biology/spoa/Makefile index cca49a95a263..41bdf70f51f7 100644 --- a/biology/spoa/Makefile +++ b/biology/spoa/Makefile @@ -2,6 +2,7 @@ PORTNAME= spoa DISTVERSION= 4.0.7 +PORTREVISION= 2 CATEGORIES= biology MAINTAINER= yuri@FreeBSD.org @@ -13,8 +14,8 @@ LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= bioparser>0:biology/bioparser \ ${LOCALBASE}/include/biosoup/nucleic_acid.hpp:biology/biosoup \ cereal>0:devel/cereal \ - cpu_features>0:devel/cpu_features \ simde>0:devel/simde +LIB_DEPENDS= libcpu_features.so:devel/cpu_features RUN_DEPENDS= cereal>0:devel/cereal TEST_DEPENDS= googletest>0:devel/googletest diff --git a/biology/spoa/files/patch-CMakeLists.txt b/biology/spoa/files/patch-CMakeLists.txt index a94d9aae7e0e..a5e7af7845e8 100644 --- a/biology/spoa/files/patch-CMakeLists.txt +++ b/biology/spoa/files/patch-CMakeLists.txt @@ -14,7 +14,7 @@ add_library(${PROJECT_NAME} src/alignment_engine.cpp -@@ -55,8 +56,8 @@ add_library(${PROJECT_NAME} +@@ -55,19 +56,19 @@ add_library(${PROJECT_NAME} src/dispatcher.cpp) target_include_directories(${PROJECT_NAME} PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> @@ -24,8 +24,10 @@ + #$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/vendor/cpu_features/include> $<INSTALL_INTERFACE:include>) target_link_libraries(${PROJECT_NAME} - cereal) -@@ -65,9 +66,9 @@ if (BUILD_SHARED_LIBS) +- cereal) ++ cereal::cereal) + if (BUILD_SHARED_LIBS) + set_property(TARGET ${PROJECT_NAME} PROPERTY SOVERSION "7.0.0") endif () if (spoa_generate_dispatch) @@ -38,6 +40,15 @@ list(APPEND ARCHITECTURES avx2 sse4.1 sse2) foreach(arch IN LISTS ARCHITECTURES) +@@ -78,7 +79,7 @@ if (spoa_generate_dispatch) + $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/vendor/simde> + $<INSTALL_INTERFACE:include>) + target_link_libraries(${PROJECT_NAME}_${arch} +- cereal) ++ cereal::cereal) + set_target_properties(${PROJECT_NAME}_${arch} PROPERTIES + COMPILE_FLAGS "-m${arch}") + if (BUILD_SHARED_LIBS) @@ -92,8 +93,8 @@ if (spoa_generate_dispatch) ${PROJECT_NAME}_sse4.1 ${PROJECT_NAME}_sse2) |