mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-23 00:43:28 +00:00
Code Issues Releases Activity

net-mgmt/openbmp: Fix the build with librdkafka 1.0.0

Browse Source 
Adding zstd support to librdkafka broke this port.
Fix it.

Reported by:	antoine@
Sponsored by:	trivago N.V.
This commit is contained in:
Luca Pizzamiglio 2019-04-07 11:08:32 +00:00
parent b2bc8c8054
commit 41cd751407
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=498272
2 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
net-mgmt/openbmp/Makefile
View File

@ -4,7 +4,7 @@
PORTNAME= openbmp PORTNAME= openbmp
DISTVERSIONPREFIX= v DISTVERSIONPREFIX= v
DISTVERSION= 0.14.0 DISTVERSION= 0.14.0
PORTREVISION= 3 PORTREVISION= 4
CATEGORIES= net-mgmt CATEGORIES= net-mgmt
MAINTAINER= pizzamig@FreeBSD.org MAINTAINER= pizzamig@FreeBSD.org

25
net-mgmt/openbmp/files/patch-Server_CMakeLists.txt
View File

@ -1,34 +1,43 @@
--- Server/CMakeLists.txt.orig 2017-09-14 09:29:16 UTC --- Server/CMakeLists.txt.orig 2018-03-06 18:31:59 UTC
+++ Server/CMakeLists.txt +++ Server/CMakeLists.txt
@@ -24,6 +24,14 @@ find_path(LIBYAML_CPP_INCLUDE_DIR @@ -24,6 +24,23 @@ find_path(LIBYAML_CPP_INCLUDE_DIR
PATH_SUFFIXES PATH_SUFFIXES
include) include)
+find_path(LIBLZ4_CPP_LIBRARY_DIR +find_path(LIBLZ4_CPP_LIBRARY_DIR
+ NAMES + NAMES
+ liblz4.so + liblz4.so
+ HINTS + HINTS
+ ${HINT_ROOT_DIR} + ${HINT_ROOT_DIR}
+ PATH_SUFFIXES + PATH_SUFFIXES
+ lib) + lib)
+
+find_path(LIBZSTD_CPP_LIBRARY_DIR
+ NAMES
+ libzstd.so
+ HINTS
+ ${HINT_ROOT_DIR}
+ PATH_SUFFIXES
+ lib)
+
+ +
find_library(LIBYAML_CPP_LIBRARY find_library(LIBYAML_CPP_LIBRARY
NAMES NAMES
libyaml-cpp.a yaml-cpp libyaml-cpp.a yaml-cpp
@@ -84,6 +92,7 @@ endif() @@ -84,6 +101,7 @@ endif()
# Update the include dir # Update the include dir
include_directories(${LIBRDKAFKA_INCLUDE_DIR} ${LIBYAML_CPP_INCLUDE_DIR} src/ src/bmp src/bgp src/bgp/linkstate src/kafka) include_directories(${LIBRDKAFKA_INCLUDE_DIR} ${LIBYAML_CPP_INCLUDE_DIR} src/ src/bmp src/bgp src/bgp/linkstate src/kafka)
#link_directories(${LIBRDKAFKA_LIBRARY}) #link_directories(${LIBRDKAFKA_LIBRARY})
+link_directories(${LIBLZ4_CPP_LIBRARY_DIR}) +link_directories(${LIBLZ4_CPP_LIBRARY_DIR} ${LIBZSTD_CPP_LIBRARY_DIR})
# Define the source files to compile # Define the source files to compile
@@ -134,7 +143,7 @@ if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" OR CMA @@ -134,7 +152,7 @@ if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" OR CMA
endif() endif()
# Set the libs to link # Set the libs to link
-set (LIBS pthread ${LIBYAML_CPP_LIBRARY} ${LIBRDKAFKA_CPP_LIBRARY} ${LIBRDKAFKA_LIBRARY} z ${SSL_LIBS} dl) -set (LIBS pthread ${LIBYAML_CPP_LIBRARY} ${LIBRDKAFKA_CPP_LIBRARY} ${LIBRDKAFKA_LIBRARY} z ${SSL_LIBS} dl)
+set (LIBS pthread ${LIBYAML_CPP_LIBRARY} ${LIBRDKAFKA_CPP_LIBRARY} ${LIBRDKAFKA_LIBRARY} z lz4 ${SSL_LIBS}) +set (LIBS pthread ${LIBYAML_CPP_LIBRARY} ${LIBRDKAFKA_CPP_LIBRARY} ${LIBRDKAFKA_LIBRARY} z lz4 zstd ${SSL_LIBS})
# Set the binary # Set the binary
add_executable (openbmpd ${SRC_FILES}) add_executable (openbmpd ${SRC_FILES})