Skip site navigation (1)Skip section navigation (2) 
Date:      Fri, 19 Feb 2021 09:22:30 +0000 (UTC)
From:      Yuri Victorovich <yuri@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r566037 - in head/biology/spoa: . files
Message-ID:  <202102190922.11J9MUmQ068714@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: yuri
Date: Fri Feb 19 09:22:30 2021
New Revision: 566037
URL: https://svnweb.freebsd.org/changeset/ports/566037

Log:
  biology/spoa: Fix build after recent devel/cereal update; Fix LIB_DEPENDS
  
  Reported by:	fallout

Modified:
  head/biology/spoa/Makefile
  head/biology/spoa/files/patch-CMakeLists.txt

Modified: head/biology/spoa/Makefile
==============================================================================
--- head/biology/spoa/Makefile	Fri Feb 19 09:11:57 2021	(r566036)
+++ head/biology/spoa/Makefile	Fri Feb 19 09:22:30 2021	(r566037)
@@ -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
 

Modified: head/biology/spoa/files/patch-CMakeLists.txt
==============================================================================
--- head/biology/spoa/files/patch-CMakeLists.txt	Fri Feb 19 09:11:57 2021	(r566036)
+++ head/biology/spoa/files/patch-CMakeLists.txt	Fri Feb 19 09:22:30 2021	(r566037)
@@ -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)

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202102190922.11J9MUmQ068714>