From owner-svn-ports-head@freebsd.org Sun Apr 7 11:08:34 2019 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 3FADD157DC68; Sun, 7 Apr 2019 11:08:34 +0000 (UTC) (envelope-from pizzamig@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id C5ACD8BEED; Sun, 7 Apr 2019 11:08:33 +0000 (UTC) (envelope-from pizzamig@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 9B97AB353; Sun, 7 Apr 2019 11:08:33 +0000 (UTC) (envelope-from pizzamig@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x37B8XNS063638; Sun, 7 Apr 2019 11:08:33 GMT (envelope-from pizzamig@FreeBSD.org) Received: (from pizzamig@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x37B8XT1063636; Sun, 7 Apr 2019 11:08:33 GMT (envelope-from pizzamig@FreeBSD.org) Message-Id: <201904071108.x37B8XT1063636@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pizzamig set sender to pizzamig@FreeBSD.org using -f From: Luca Pizzamiglio Date: Sun, 7 Apr 2019 11:08:33 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r498272 - in head/net-mgmt/openbmp: . files X-SVN-Group: ports-head X-SVN-Commit-Author: pizzamig X-SVN-Commit-Paths: in head/net-mgmt/openbmp: . files X-SVN-Commit-Revision: 498272 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: C5ACD8BEED X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.97 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-0.97)[-0.975,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 07 Apr 2019 11:08:34 -0000 Author: pizzamig Date: Sun Apr 7 11:08:32 2019 New Revision: 498272 URL: https://svnweb.freebsd.org/changeset/ports/498272 Log: net-mgmt/openbmp: Fix the build with librdkafka 1.0.0 Adding zstd support to librdkafka broke this port. Fix it. Reported by: antoine@ Sponsored by: trivago N.V. Modified: head/net-mgmt/openbmp/Makefile head/net-mgmt/openbmp/files/patch-Server_CMakeLists.txt Modified: head/net-mgmt/openbmp/Makefile ============================================================================== --- head/net-mgmt/openbmp/Makefile Sun Apr 7 10:47:34 2019 (r498271) +++ head/net-mgmt/openbmp/Makefile Sun Apr 7 11:08:32 2019 (r498272) @@ -4,7 +4,7 @@ PORTNAME= openbmp DISTVERSIONPREFIX= v DISTVERSION= 0.14.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= net-mgmt MAINTAINER= pizzamig@FreeBSD.org Modified: head/net-mgmt/openbmp/files/patch-Server_CMakeLists.txt ============================================================================== --- head/net-mgmt/openbmp/files/patch-Server_CMakeLists.txt Sun Apr 7 10:47:34 2019 (r498271) +++ head/net-mgmt/openbmp/files/patch-Server_CMakeLists.txt Sun Apr 7 11:08:32 2019 (r498272) @@ -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 -@@ -24,6 +24,14 @@ find_path(LIBYAML_CPP_INCLUDE_DIR +@@ -24,6 +24,23 @@ find_path(LIBYAML_CPP_INCLUDE_DIR PATH_SUFFIXES include) +find_path(LIBLZ4_CPP_LIBRARY_DIR -+ NAMES -+ liblz4.so ++ NAMES ++ liblz4.so + HINTS + ${HINT_ROOT_DIR} + PATH_SUFFIXES + lib) + ++find_path(LIBZSTD_CPP_LIBRARY_DIR ++ NAMES ++ libzstd.so ++ HINTS ++ ${HINT_ROOT_DIR} ++ PATH_SUFFIXES ++ lib) ++ ++ find_library(LIBYAML_CPP_LIBRARY NAMES libyaml-cpp.a yaml-cpp -@@ -84,6 +92,7 @@ endif() +@@ -84,6 +101,7 @@ endif() # Update the include dir 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(${LIBLZ4_CPP_LIBRARY_DIR}) ++link_directories(${LIBLZ4_CPP_LIBRARY_DIR} ${LIBZSTD_CPP_LIBRARY_DIR}) # 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() # 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 lz4 ${SSL_LIBS}) ++set (LIBS pthread ${LIBYAML_CPP_LIBRARY} ${LIBRDKAFKA_CPP_LIBRARY} ${LIBRDKAFKA_LIBRARY} z lz4 zstd ${SSL_LIBS}) # Set the binary add_executable (openbmpd ${SRC_FILES})