From nobody Mon Dec 16 09:33:20 2024 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 4YBZW46mFHz5hBWX; Mon, 16 Dec 2024 09:33:20 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YBZW46FgGz4mkb; Mon, 16 Dec 2024 09:33:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734341600; 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=8VtfJ4YD5zRI0VfimDpZqH6QcOxcqJ0we//23ubsR8A=; b=eXLNBzG4YYjkAU7xz1UDKjUSqefwZSTDsN4phOdH1ZzdfTkotI83cnTIVBmJCKP069e0hF HcDQ8Il7s3STF1CKWUUouF8HMLmEfJSJxmnkUoAutpHPmuRJNJJhujfkc6ZBeB5VWsxmpQ kzua2/bOzVIFDkj7d1dnokE2l6GerbUuaLCiGz5AuSJUOIBG3UmGHOse5ycgKVWMg16wqK aqp2GRD5FHAYlpSeAIINLJYmX59pnYAlV1M1XTCFcd1riVmqUaIPMpg3VrHr3zeamdpqE7 MK422ie+DKQeEec0H2cc+RgTo1NM2tGIoNM9jzv4K8ofxIgMWV/GRBmysJdTRg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734341600; 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=8VtfJ4YD5zRI0VfimDpZqH6QcOxcqJ0we//23ubsR8A=; b=RNNYdGksKH2s0vkeLjNfJs+BnKnFwovJe+zdkVu4u0JfjVTC4Ro8zgvClecaqeUQuI2Uo8 PmTgVguiWwS0u4fEIRbQ3tHW9c+1+GnLd8PyqraGuHMQfYySA4Wv5yv0V5VrWTHur8unKc dPXcgpDo+KYRBRMmaA1FnJuyyXEEq3iDjfVFNet5fyuDWvihV5eN4DWFCxBLZ4nJSGNeRI ToFqiJZbeQ202sy9IljIspgsJ3qThbCn1/viJko1b8NU5IYKnP4tBi3NgWlOr/JmH74Taw rYT0c+X/al51GH7NjgmoFqyY52geVeVsd77/rfq51BvbVnsSAbDLAqRXAv24aQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734341600; a=rsa-sha256; cv=none; b=B1D8KfCV9dMpI4mwG7Ole+VjsQVZr3j0msaFRr+jfIGl/NH4VjoCkCHB64566xl1BCOohM BotjMQbjylBBDdDEfGjRpUgvyiso97t/u4TVTErTd8Lxn4Az8Q7H7zrNcsMijFFiA2lFUs imyn+53nk022ehmrmsf577P/2wVaQkrjyquDJK/2sQVxZ137Spl+V1W2r4IIt5oxYKawyW 2zdsNshdZSyO3ZXmIdvnAkNLe4sH1Ui4sFe2W/mzxNXMHFmkcnttxQTZrekwHfl3xcxX8O LeFwLEru63ROvGC98cF/2+u471DPY20GjR3IcKdVsiM7Y5drz0YToOUK1yqDNw== 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 4YBZW45s27znvw; Mon, 16 Dec 2024 09:33:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4BG9XKAV072371; Mon, 16 Dec 2024 09:33:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BG9XKVZ072368; Mon, 16 Dec 2024 09:33:20 GMT (envelope-from git) Date: Mon, 16 Dec 2024 09:33:20 GMT Message-Id: <202412160933.4BG9XKVZ072368@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Baptiste Daroussin Subject: git: e07da5f2329a - main - net/usockets: fix shared library and provide pc file 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: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e07da5f2329ad771844b20f262f4c07c73c0a832 Auto-Submitted: auto-generated The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/ports/commit/?id=e07da5f2329ad771844b20f262f4c07c73c0a832 commit e07da5f2329ad771844b20f262f4c07c73c0a832 Author: Baptiste Daroussin AuthorDate: 2024-12-16 08:05:44 +0000 Commit: Baptiste Daroussin CommitDate: 2024-12-16 09:33:08 +0000 net/usockets: fix shared library and provide pc file fix the shared library to make sure it provides a soname. while here follow the gentoo and openbsd path by providing a .pc file some of the futur ports depending on uSockets requires it. Approved by: yuri Differential Revision: https://reviews.freebsd.org/D48110 --- net/usockets/Makefile | 9 ++++++++- net/usockets/files/patch-Makefile | 4 ++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/net/usockets/Makefile b/net/usockets/Makefile index 03a3da0a1f7a..aa58c180a918 100644 --- a/net/usockets/Makefile +++ b/net/usockets/Makefile @@ -1,6 +1,7 @@ PORTNAME= usockets DISTVERSIONPREFIX= v DISTVERSION= 0.8.8 +PORTREVISION= 1 CATEGORIES= net devel MAINTAINER= yuri@FreeBSD.org @@ -25,12 +26,18 @@ CXXFLAGS+= -fPIC ALL_TARGET= default +SUB_FILES= libusockets.pc +SUB_LISTS= VERSION=${DISTVERSION} + PLIST_FILES= include/libusockets.h \ + lib/libuSockets.so.0 \ lib/libuSockets.so do-install: ${INSTALL_DATA} ${WRKSRC}/src/libusockets.h ${STAGEDIR}${PREFIX}/include - ${INSTALL_LIB} ${WRKSRC}/libuSockets.so ${STAGEDIR}${PREFIX}/lib + ${INSTALL_LIB} ${WRKSRC}/libuSockets.so.0 ${STAGEDIR}${PREFIX}/lib + ${RLN} ${WRKSRC}/libuSockets.so.0 ${STAGEDIR}${PREFIX}/lib/libuSockets.so + ${INSTALL_DATA} ${WRKDIR}/libusockets.pc ${STAGEDIR}${LOCALBASE}/libdata/pkgconfig do-test: # tests fail to compile: https://github.com/uNetworking/uSockets/issues/213 cd ${WRKSRC} && \ diff --git a/net/usockets/files/patch-Makefile b/net/usockets/files/patch-Makefile index 1a326b309bd0..f8bb9ea1bd80 100644 --- a/net/usockets/files/patch-Makefile +++ b/net/usockets/files/patch-Makefile @@ -1,11 +1,11 @@ ---- Makefile.orig 2023-12-28 02:58:25 UTC +--- Makefile.orig 2024-02-07 13:04:14 UTC +++ Makefile @@ -88,7 +88,7 @@ endif $(CXX) $(CXXFLAGS) -std=c++17 -flto -O3 -c src/crypto/*.cpp endif # Create a static library (try windows, then unix) - lib.exe /out:uSockets.a *.o || $(AR) rvs uSockets.a *.o -+ $(CXX) -shared -o libuSockets.so *.o -lssl ++ $(CXX) -shared -o libuSockets.so.0 -Wl,-soname=libuSockets.so.0 *.o -lssl # BoringSSL needs cmake and golang .PHONY: boringssl