From nobody Mon Jan 22 07:36:56 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 4TJMVd1yGsz57Kfx; Mon, 22 Jan 2024 07:36:57 +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 4TJMVc7317z47CN; Mon, 22 Jan 2024 07:36:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705909017; 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=Qg9fg+bEq8XCY5CvcJIyHMpWwqAwu+YHEIjtSvvbBhw=; b=tpcaWMRLJT7WySYkPyGy0YsDl+gkSRUP1mETVT2XoQga60/IWJbmhN3tyubOX9ow6Nz+vD aP8ynr958SeZ5Vjj2Mb9jYz5FDsXPFLVMJCOLnEcVYQrIgpAOJGwZsl9XisCzP9lRntmkD wXFZgVS8aN67/bAHkLNkCGeaN3Hzegcr617EsC7o5Zhu8Et8+J5gO1i5G1+jpjRzGmuR8H xY6vU5V1zNLrBdoznMdF2iLPm8Mttz2k38i7Bc6SpXL954UDKoZulov/oNn5ZMMt4+o294 WVllkdMmHonjJ9Vt/7sQ1IG4MF9xRzOz2WnWDM1irfUJQS6cIsryCfjACkb75g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705909017; 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=Qg9fg+bEq8XCY5CvcJIyHMpWwqAwu+YHEIjtSvvbBhw=; b=MrgrIHHZlM3mAobEjtOCyArQp40yvZX/Xyaza0c4mjo7wS8kse83NYM7/f/pAVhEJsljT9 vqVHKYRmzPmOn72rFRKyf6e4wKE2Clzvx8/uwzgF7eeAEygcdRWwnoMIpbs4Zqq9xExwBI BNr+WwS5I+MSOs/e7f+KXaHMOhH8MLJmlGcD5h85DhzPJ7hwbOFTgdwEhdhCcCnfMAJneg r0GGssYOX3oaC9ewdALFT27Qu1OYLNzazS1TVQOMxfMgAdC+Wq/r15qXsCEQDHG1tLwjJf KjPiszZWRU3Ox7vtOnAH8k3y7/+rxCxbgjssQ9Sr+5zYAIRx6laTaoZAhiaN2g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705909017; a=rsa-sha256; cv=none; b=gKA4ZJh4C3gKnJAx7bUBcAjYJTYW3t7xbZcN3kGAf1iSM2Q1+t3PDnLoQI7XPyRhbpl54V Vb75YAbyADwd2Y60k6VQrrkzIpgv8PM7Lcjz+zg/So2D3aPT1rpsNIakTSYI2MG53cCU1i O3SVRNf46QoFl0K9VNLnsSLE0l5utvasL/Sc/Dx5g2BCHQIxfKdnBmTmvGo4XzHOMj/bcE PLpVKejxhxF/IUvNqyUw1Qv1ciUhIwHIROVPmfcabhUyYxH9c9+mTJyPOmteoVgNuqudJ7 PmGWAZLoxItEtjtgtpifjeKwfsi4xNQ2Kkp2gXfevZXyjJ8vl6lFlZqxnpksSg== 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 4TJMVc66xlzt67; Mon, 22 Jan 2024 07:36:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 40M7auHN008739; Mon, 22 Jan 2024 07:36:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40M7aufb008736; Mon, 22 Jan 2024 07:36:56 GMT (envelope-from git) Date: Mon, 22 Jan 2024 07:36:56 GMT Message-Id: <202401220736.40M7aufb008736@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: cfdad59b52e2 - main - net/usockets: 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: yuri X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: cfdad59b52e23763719685bda5d58ed9c8371318 Auto-Submitted: auto-generated The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=cfdad59b52e23763719685bda5d58ed9c8371318 commit cfdad59b52e23763719685bda5d58ed9c8371318 Author: Yuri Victorovich AuthorDate: 2024-01-22 07:35:50 +0000 Commit: Yuri Victorovich CommitDate: 2024-01-22 07:36:54 +0000 net/usockets: Fix build -fPIC was missing in some cases, and this was somehow flying on 14 but was failing on 15. Reported by: fallout --- net/usockets/Makefile | 3 ++- net/usockets/files/patch-Makefile | 20 +++----------------- net/usockets/files/patch-tests_sni__test.c | 15 +++++++++++++++ 3 files changed, 20 insertions(+), 18 deletions(-) diff --git a/net/usockets/Makefile b/net/usockets/Makefile index 56edca8f7ce5..0fecfee0aa8d 100644 --- a/net/usockets/Makefile +++ b/net/usockets/Makefile @@ -20,6 +20,7 @@ GH_ACCOUNT= uNetworking GH_PROJECT= uSockets MAKE_ARGS= WITH_OPENSSL=1 +CXXFLAGS+= -fPIC ALL_TARGET= default @@ -32,7 +33,7 @@ do-install: do-test: # tests fail to compile: https://github.com/uNetworking/uSockets/issues/213 cd ${WRKSRC} && \ - ${CXX} -o test tests/sni_test.c ${STAGEDIR}${PREFIX}/lib/libuSockets.so && \ + ${CC} ${CFLAGS} -o test tests/sni_test.c ${STAGEDIR}${PREFIX}/lib/libuSockets.so && \ ./test .include diff --git a/net/usockets/files/patch-Makefile b/net/usockets/files/patch-Makefile index feba3bb79842..1a326b309bd0 100644 --- a/net/usockets/files/patch-Makefile +++ b/net/usockets/files/patch-Makefile @@ -1,25 +1,11 @@ --- Makefile.orig 2023-12-28 02:58:25 UTC +++ Makefile -@@ -77,18 +77,18 @@ ifeq ($(WITH_ASIO),1) - $(CC) $(CFLAGS) -O3 -c src/*.c src/eventing/*.c src/crypto/*.c src/io_uring/*.c - # Also link in Boost Asio support - ifeq ($(WITH_ASIO),1) -- $(CXX) $(CXXFLAGS) -Isrc -std=c++14 -flto -O3 -c src/eventing/asio.cpp -+ $(CXX) $(CXXFLAGS) -Isrc -fPIC -std=c++14 -flto -O3 -c src/eventing/asio.cpp - endif - - # For now we do rely on C++17 for OpenSSL support but we will be porting this work to C11 - ifeq ($(WITH_OPENSSL),1) -- $(CXX) $(CXXFLAGS) -std=c++17 -flto -O3 -c src/crypto/*.cpp -+ $(CXX) $(CXXFLAGS) -fPIC -std=c++17 -flto -O3 -c src/crypto/*.cpp - endif - ifeq ($(WITH_BORINGSSL),1) -- $(CXX) $(CXXFLAGS) -std=c++17 -flto -O3 -c src/crypto/*.cpp -+ $(CXX) $(CXXFLAGS) -fPIC -std=c++17 -flto -O3 -c src/crypto/*.cpp +@@ -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 -+ lib.exe /out:uSockets.a *.o || $(CXX) -shared -o libuSockets.so *.o -lssl ++ $(CXX) -shared -o libuSockets.so *.o -lssl # BoringSSL needs cmake and golang .PHONY: boringssl diff --git a/net/usockets/files/patch-tests_sni__test.c b/net/usockets/files/patch-tests_sni__test.c new file mode 100644 index 000000000000..6b12040160cd --- /dev/null +++ b/net/usockets/files/patch-tests_sni__test.c @@ -0,0 +1,15 @@ +--- tests/sni_test.c.orig 2024-01-22 07:32:06 UTC ++++ tests/sni_test.c +@@ -1,10 +1,10 @@ +-extern "C" { ++//extern "C" { + void *sni_new(); + void sni_free(void *sni, void (*cb)(void *user)); + int sni_add(void *sni, const char *hostname, void *user); + void *sni_remove(void *sni, const char *hostname); + void *sni_find(void *sni, const char *hostname); +-} ++//} + + #include + #include