From nobody Sun Apr 20 23:01:24 2025 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 4ZgkWn2p10z5tlJ5; Sun, 20 Apr 2025 23:01:25 +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 4ZgkWm73GKz3mXq; Sun, 20 Apr 2025 23:01:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1745190085; 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=iK5M/E4syGYMKHIJemHvOlBc7pafC6XkYyH1q4Y45eE=; b=I1MGhDXL3OjvIkKB3bfFkjiXUC/fx7n7G6xQqhT2xzhULITbeOlR+XxJbGCUA6qmhdfUkg 4g3IZ4Y/GCHk0MnYFOyj8MZ6z1Te0JD1OQl6mGL4HuAA9BJlu5cbIKwYZmNN/JWng75VgN LItCUflHDq2EERK9voC6N4aPsrMxIZfHcWvMVPEc98mxfjg9FvkHOLfOK3dHrNM35W93C5 KJKxL3iInn848rEIcPqGH+4iwstrjG11sCvD6Tl9mdz3A39ktyAvhAW6ckbzZu0eHhQg/v dnYpPI7k434OXC6vwNWIMcW45JtxorabBmimG+XFeCY9sgVgFL16sRn94cra7g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1745190085; a=rsa-sha256; cv=none; b=FoBWmtdaTH+WgNX5hXSGXp4YpsyWJaBHMMKH4ZOfAlMHHaRB/ymDk6tb7G3/ra/Xob1Ope zozFgVtRSWNsqQZpun9kZNdvfocbqBoH0HRUyIBh/gs/gtdUSXmJQTz4h6zkVpft0t5Ff0 yOKMauyrnjhqnuPN2UoZ20mMO8Xy5goiWRGlIgE1+nILg0Su8CEFe9k8AmS7hfB7mxY4vd OxMG4AP3UkQbtiUCuKfm2cwyIEkAg/iJUDovBEYsKdeRfvcAiqfeXS6FsXv27ywPFozTey Q/X6bVpswI0t96ODGTKVE3tNHIubHXxP6rdoe4INFCkWrO6LMu/9qCicf9Alag== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1745190085; 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=iK5M/E4syGYMKHIJemHvOlBc7pafC6XkYyH1q4Y45eE=; b=jBOYEdSqZtAFRzx58loY4114/NL8OzTfPrQBq3SO1GwRNKtQIgU81VDlE4IX3z3aQ0ykfW fFS4UhZ5jjjj0SPyb0f2kg2gpWNe/L8QgRH07uertdcjG3WOeCsQDiZwU3TbNwH3VI7xwB 2K1QPHvLATZ0KyNvzlsuYy8+UfPiFevAgsVposMbnSUYBmQ1BducZ74hW8OmNqe5BQA1Ig lI+euUHJ3ZaNxO/v3ImpNmwGn8qXPd+brl8r+Akqt0tkdS4B4iNr3TAn+P3MQL43N/vcNc hhKB6RV0cP2rOW30DO8X2lBUOEEJiGl+zHqDzKW0xepGXibVK6exGzZYVayX2w== 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 4ZgkWm6cwXz8SW; Sun, 20 Apr 2025 23:01:24 +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 53KN1O4A029458; Sun, 20 Apr 2025 23:01:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 53KN1OvM029455; Sun, 20 Apr 2025 23:01:24 GMT (envelope-from git) Date: Sun, 20 Apr 2025 23:01:24 GMT Message-Id: <202504202301.53KN1OvM029455@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Yuri Victorovich Subject: git: 02d606ffb4c2 - main - net/usockets: Improve port 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: yuri X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 02d606ffb4c272e869ced9c3cf96e96df5b95ead Auto-Submitted: auto-generated The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=02d606ffb4c272e869ced9c3cf96e96df5b95ead commit 02d606ffb4c272e869ced9c3cf96e96df5b95ead Author: Daniel Engberg AuthorDate: 2025-04-20 22:58:46 +0000 Commit: Yuri Victorovich CommitDate: 2025-04-20 23:01:09 +0000 net/usockets: Improve port PR: 286126 --- net/usockets/Makefile | 28 +++++++++++++++++----------- net/usockets/files/patch-Makefile | 11 ----------- 2 files changed, 17 insertions(+), 22 deletions(-) diff --git a/net/usockets/Makefile b/net/usockets/Makefile index aa58c180a918..d7b4ef6980be 100644 --- a/net/usockets/Makefile +++ b/net/usockets/Makefile @@ -1,7 +1,7 @@ PORTNAME= usockets DISTVERSIONPREFIX= v DISTVERSION= 0.8.8 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net devel MAINTAINER= yuri@FreeBSD.org @@ -13,34 +13,40 @@ LICENSE_FILE= ${WRKSRC}/LICENSE BROKEN_riscv64= fails to build: Hard-float 'd' ABI can't be used for a target that doesn't support the D instruction set extension -USES= compiler:c++17-lang gmake ssl # c++17 only for temp C_++ code, otherwise it is c11 +USES= compiler:c++17-lang ssl USE_LDCONFIG= yes USE_GITHUB= yes GH_ACCOUNT= uNetworking GH_PROJECT= uSockets -MAKE_ARGS= WITH_OPENSSL=1 -CFLAGS+= -fPIC # -fPIC is required for the build to succeed, see https://github.com/uNetworking/uSockets/issues/217 -CXXFLAGS+= -fPIC +USE_CSTD= c11 +USE_CXXSTD= c++17 -ALL_TARGET= default +CFLAGS+= -fPIC SUB_FILES= libusockets.pc -SUB_LISTS= VERSION=${DISTVERSION} +SUB_LIST+= VERSION=${DISTVERSION} PLIST_FILES= include/libusockets.h \ lib/libuSockets.so.0 \ - lib/libuSockets.so + lib/libuSockets.so \ + libdata/pkgconfig/libusockets.pc + +do-build: + @cd ${WRKSRC} && \ + ${SETENVI} ${MAKE_ENV} ${CC} ${CFLAGS} -DLIBUS_USE_OPENSSL -Isrc -c src/*.c src/eventing/*.c src/crypto/*.c src/io_uring/*.c && \ + ${SETENVI} ${MAKE_ENV} ${CXX} ${CXXFLAGS} -c src/crypto/*.cpp && \ + ${SETENVI} ${MAKE_ENV} ${CXX} ${CXXFLAGS} -shared -o libuSockets.so.0 -Wl,-soname=libuSockets.so.0 *.o -lssl do-install: ${INSTALL_DATA} ${WRKSRC}/src/libusockets.h ${STAGEDIR}${PREFIX}/include ${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 + ${RLN} ${STAGEDIR}${PREFIX}/lib/libuSockets.so.0 ${STAGEDIR}${PREFIX}/lib/libuSockets.so + ${INSTALL_DATA} ${WRKDIR}/libusockets.pc ${STAGEDIR}${PREFIX}/libdata/pkgconfig do-test: # tests fail to compile: https://github.com/uNetworking/uSockets/issues/213 - cd ${WRKSRC} && \ + @cd ${WRKSRC} && \ ${CC} ${CFLAGS} -o test tests/sni_test.c ${STAGEDIR}${PREFIX}/lib/libuSockets.so && \ ./test diff --git a/net/usockets/files/patch-Makefile b/net/usockets/files/patch-Makefile deleted file mode 100644 index f8bb9ea1bd80..000000000000 --- a/net/usockets/files/patch-Makefile +++ /dev/null @@ -1,11 +0,0 @@ ---- 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.0 -Wl,-soname=libuSockets.so.0 *.o -lssl - - # BoringSSL needs cmake and golang - .PHONY: boringssl