From nobody Mon Feb 13 22:47:32 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 4PFzxd0Rw2z3qXYf; Mon, 13 Feb 2023 22:47:33 +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 4PFzxc74hNz3K2d; Mon, 13 Feb 2023 22:47:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676328453; 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=EccYzx6lPUtnRC60uAQTwa97UqIhglW9JbZHlZvMD5o=; b=wmpCN6tIVTsSCkg+SCPAySbKTiwAHQcfdi0Ct2sHo2q28cDxgRBVWufyivtlOvqXfd71DL kQuEbXD3iDQVq+R7tVq+N9VfqcPgqqVAfe3z7oxKe06GjDwcxwjoSpUHKZJOLH+PdNPwhq uSoB7cXl017DSyNZ+GMIhFY3ACnUo3NsHmxcoaThhD4wt+WZJPjdSkIid7IXzE7ozV3xf4 vzJJ54hL2PW+LpKSS1zZk624plfrtYIowi4qU8GFgAz7sR+POmlRBFc3i9v4YaFo/91xvb 4AWvWSTi9BoBFAs4rB9R8Wl4o9UVNPJvR74OHrppvn3z1BeaTW0TCrAv1HWcmw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676328453; 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=EccYzx6lPUtnRC60uAQTwa97UqIhglW9JbZHlZvMD5o=; b=XP388u3ongjeQK37WfvuRow7FDdMJwaw8Np6oyrY6fwUIksnZ5jklr3gCSPE02stOnBPay arbksjpXv5EEuZE29pqW14VepOtpJSrLRr19jibsRPZi5XkAmX+XScF3euUnAKBdGpDwy+ p+kz/AvbM+boYnaDzQ2fFljH5eXu2P5FRkXyoQGRQOQkS/TUCcs6pk3rdt4KDSwmNsYA6z ERy5hQ1AROVPCsJ/P5SSQAglPaKJUf/F+9HGkjsNJ71KnlTVfFeaRQQcszYYZlipp9Y5JT ZVgogz8uVLbIJ56UJQsyDR656eQRqPqPXtmCgxR9M0t8Gm6/eDXXb25UUkwHWw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1676328453; a=rsa-sha256; cv=none; b=IvZDNeNboN0U2yKBX3eVqbhjkD7uxjrsYn6vNBysHfTxO3KXhHR4ufZBEuZqkH1/0tyn0V s6D9kTEC1BXy/Jeq0qIaClTF77zML4MQbWa1+q3Zw7uWmVUIn/yC3H7QnlAKdlZZGFtYkQ aclBFrzoYiN+Ez82muPY3Il7qrWJACW5hucAb5NSTWJlCUJS74c9V48cTj0YUyJMLdOFMd YijbDkDzorNd700sfxL600dbaI2Ol2+OdDxqXN/w3da/IswqQZ5WFi+Vw83Lt+uidmxVz2 f3dKSfe40LjFLnmOGUnA6IvabgEh+33w2zPcd10318tEVEuo6uerAusV8RkUPg== 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 4PFzxc67jczbwK; Mon, 13 Feb 2023 22:47:32 +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 31DMlWRc000066; Mon, 13 Feb 2023 22:47:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31DMlW2C000065; Mon, 13 Feb 2023 22:47:32 GMT (envelope-from git) Date: Mon, 13 Feb 2023 22:47:32 GMT Message-Id: <202302132247.31DMlW2C000065@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Daniel Engberg Subject: git: 97400f86dcca - main - net/mosquitto: Link with correct library type when using websockets option 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: diizzy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 97400f86dcca45ff2a6c1e60d5f47f613fb2782f Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by diizzy: URL: https://cgit.FreeBSD.org/ports/commit/?id=97400f86dcca45ff2a6c1e60d5f47f613fb2782f commit 97400f86dcca45ff2a6c1e60d5f47f613fb2782f Author: Daniel Engberg AuthorDate: 2023-02-13 22:37:10 +0000 Commit: Daniel Engberg CommitDate: 2023-02-13 22:47:19 +0000 net/mosquitto: Link with correct library type when using websockets option Libwebsockets refers to static library as websockets and shared as websockets_shared. Currently it causes shared option in mosuitto to link with static library and static option doesn't work at all. PR: 269536 Reviewed by: Joseph Benden (maintainer) --- net/mosquitto/files/patch-src_CMakeLists.txt | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/net/mosquitto/files/patch-src_CMakeLists.txt b/net/mosquitto/files/patch-src_CMakeLists.txt new file mode 100644 index 000000000000..c268f901f8f0 --- /dev/null +++ b/net/mosquitto/files/patch-src_CMakeLists.txt @@ -0,0 +1,18 @@ +--- src/CMakeLists.txt.orig 2023-02-13 19:40:35 UTC ++++ src/CMakeLists.txt +@@ -194,13 +194,13 @@ endif (WIN32) + + if (WITH_WEBSOCKETS) + if (STATIC_WEBSOCKETS) +- set (MOSQ_LIBS ${MOSQ_LIBS} websockets_static) ++ set (MOSQ_LIBS ${MOSQ_LIBS} websockets) + if (WIN32) + set (MOSQ_LIBS ${MOSQ_LIBS} iphlpapi) + link_directories(${mosquitto_SOURCE_DIR}) + endif (WIN32) + else (STATIC_WEBSOCKETS) +- set (MOSQ_LIBS ${MOSQ_LIBS} websockets) ++ set (MOSQ_LIBS ${MOSQ_LIBS} websockets_shared) + endif (STATIC_WEBSOCKETS) + endif (WITH_WEBSOCKETS) +