From nobody Mon Feb 13 13:23:59 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PFlRM4TSgz3qYWt; Mon, 13 Feb 2023 13:23:59 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PFlRM3xNBz46WR; Mon, 13 Feb 2023 13:23:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676294639; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2yha5AgEVOnZJmEqCLIXvlBwzL8hf4Icz0tYt9q93MY=; b=LC/OXnIKBY4pAx/H6Z+pLcMfwgpRQwIAafiaFg4VKjc5OMf3b43P+/Yg+zRbvq6mHXb/fW SkePE6r5vnf+BXLgKEYGtjJDUxHxq6VqaigM39HpjMrs12mG0hH81L/kKMt3h3D/gUWe+z VZOxV57I5px0/zIAGthmN/uS1YnLZeBf3OOz8XkobziM7OgyMUIHwTJhUPADtHXLA0Pgnh EitN8Xo18oTSdDumUto4Eu3kZOwIEt3P0WzEsdi+p3SMTZwhWW1QTw+iwvjjjvgR26bqkl OzJtYtB+WyF3c+Bw/OY7SdVdDqAgg/AUEc1kE5VmVSJ1e8uKCdlO+oAmRme2fw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676294639; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2yha5AgEVOnZJmEqCLIXvlBwzL8hf4Icz0tYt9q93MY=; b=tFGrqdJw67ROKJz/9JSEfJkQskwKCS9wIvpLXObG1LJf2jniC9fVlp92yLqFDAbg4e7r7v 3nNrdWxr6lIjUFwCxZ5NKIXLckKfam6ZHNBr3ZXOBtIa2GnKPWy4MMeU/LIpE9+yS9I6a0 rQuyqNNXPxmKrnRiSubmkqg/QikJbHWkUKMqOrMLGsrCfJAObZLYf3e+nFFE1ZX0YHnBIQ aqpPLJ3agJbJ5moUUoj1ghw5zzlXL0fD+8oTgKt+OERuVrfe5oLtLM+0k8oUEq40J+Uqxd xA/E/7p/Ms1/9dCCI3haQ61iBfLazc5Jmz+d/c/O5+aH5uMiOsJgrqp2dLv05Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1676294639; a=rsa-sha256; cv=none; b=RYxJvFk/dUHSyc1dz1LSagN6CAWkJNlRgVsw6g2b8yrCQJLkl+1zG9JTKQRIZ/Pd50NNkF ZSmNUi2bFlzcO7jZK1KODKxfUTvFpUsRzjViHiYaRpLesv46qOW91aRSRsuRk6JigmYnzC oPHmfd+N51iZJAwvrYLclyijK53QncPo+gnuE5b1uzOPibrgZc4y5yHW/jVApPejvAEelu ZSEv3ao8irZnLD1YAVg+iGUYhs1Or7grbNe6lOg2kPE3cV8mdpb3BzEvIGuK0oZYSvAAdh JBn/Y5+NHesDeMVGADTR6U6DHPopg/U5tOLc2X/eZ/G2zDfZyLo0JD3PenuhjA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PFlRM2w1LzKlV; Mon, 13 Feb 2023 13:23:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 31DDNxZq094805; Mon, 13 Feb 2023 13:23:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31DDNxQ5094804; Mon, 13 Feb 2023 13:23:59 GMT (envelope-from git) Date: Mon, 13 Feb 2023 13:23:59 GMT Message-Id: <202302131323.31DDNxQ5094804@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Luca Pizzamiglio Subject: git: 602b040678a7 - main - net-mgmt/openbmp: Fix build List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: pizzamig X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 602b040678a73adec7d1d298b41676a38559fe49 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by pizzamig: URL: https://cgit.FreeBSD.org/ports/commit/?id=602b040678a73adec7d1d298b41676a38559fe49 commit 602b040678a73adec7d1d298b41676a38559fe49 Author: Luca Pizzamiglio AuthorDate: 2023-02-13 13:23:10 +0000 Commit: Luca Pizzamiglio CommitDate: 2023-02-13 13:23:10 +0000 net-mgmt/openbmp: Fix build librdkafka added libcurl dependency openbmp's cmake is not smart to get it alone --- net-mgmt/openbmp/Makefile | 2 +- net-mgmt/openbmp/files/patch-Server_CMakeLists.txt | 30 +++++++++++++++++----- 2 files changed, 24 insertions(+), 8 deletions(-) diff --git a/net-mgmt/openbmp/Makefile b/net-mgmt/openbmp/Makefile index b3579ca0f40a..2c21496e9357 100644 --- a/net-mgmt/openbmp/Makefile +++ b/net-mgmt/openbmp/Makefile @@ -1,7 +1,7 @@ PORTNAME= openbmp DISTVERSIONPREFIX= v DISTVERSION= 0.14.0 -PORTREVISION= 11 +PORTREVISION= 12 CATEGORIES= net-mgmt MAINTAINER= pizzamig@FreeBSD.org diff --git a/net-mgmt/openbmp/files/patch-Server_CMakeLists.txt b/net-mgmt/openbmp/files/patch-Server_CMakeLists.txt index 42fe05df7869..28ecb7738702 100644 --- a/net-mgmt/openbmp/files/patch-Server_CMakeLists.txt +++ b/net-mgmt/openbmp/files/patch-Server_CMakeLists.txt @@ -1,6 +1,6 @@ ---- Server/CMakeLists.txt.orig 2018-03-06 18:31:59 UTC -+++ Server/CMakeLists.txt -@@ -24,6 +24,23 @@ find_path(LIBYAML_CPP_INCLUDE_DIR +--- Server/CMakeLists.txt.orig 2018-03-06 19:31:59.000000000 +0100 ++++ Server/CMakeLists.txt 2023-02-13 13:54:14.656995000 +0100 +@@ -24,6 +24,31 @@ PATH_SUFFIXES include) @@ -20,24 +20,40 @@ + PATH_SUFFIXES + lib) + ++find_library(LIBCURL_LIBRARY_DIR ++ NAMES ++ libcurl.so ++ HINTS ++ ${HINT_ROOT_DIR} ++ PATH_SUFFIXES ++ lib64 ++ lib) + find_library(LIBYAML_CPP_LIBRARY NAMES libyaml-cpp.a yaml-cpp -@@ -84,6 +101,7 @@ endif() +@@ -33,6 +58,7 @@ + lib64 + lib) + ++ + find_path(LIBRDKAFKA_INCLUDE_DIR + librdkafka/rdkafkacpp.h + HINTS +@@ -84,6 +110,7 @@ # 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} ${LIBZSTD_CPP_LIBRARY_DIR}) ++link_directories(${LIBLZ4_CPP_LIBRARY_DIR} ${LIBZSTD_CPP_LIBRARY_DIR} ${LIBCURL_LIBRARY_DIR}) # Define the source files to compile -@@ -134,7 +152,7 @@ if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" OR CMA +@@ -134,7 +161,7 @@ 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 zstd ${SSL_LIBS}) ++set (LIBS pthread ${LIBYAML_CPP_LIBRARY} ${LIBRDKAFKA_CPP_LIBRARY} ${LIBRDKAFKA_LIBRARY} z lz4 zstd curl ${SSL_LIBS}) # Set the binary add_executable (openbmpd ${SRC_FILES})