Date: Sun, 26 Sep 2021 19:13:50 GMT From: Yuri Victorovich <yuri@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: a53ac0c36736 - main - net/usockets: Update 0.7.1 -> 0.8.0 Message-ID: <202109261913.18QJDoKp075654@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=a53ac0c36736399902330760203bf83693a72aa7 commit a53ac0c36736399902330760203bf83693a72aa7 Author: Yuri Victorovich <yuri@FreeBSD.org> AuthorDate: 2021-09-26 18:46:38 +0000 Commit: Yuri Victorovich <yuri@FreeBSD.org> CommitDate: 2021-09-26 19:12:45 +0000 net/usockets: Update 0.7.1 -> 0.8.0 Reported by: portscout --- net/usockets/Makefile | 10 ++++++++-- net/usockets/distinfo | 6 +++--- net/usockets/files/patch-Makefile | 18 +++++++++++++++--- 3 files changed, 26 insertions(+), 8 deletions(-) diff --git a/net/usockets/Makefile b/net/usockets/Makefile index 3d29491fb229..d5ed7554e835 100644 --- a/net/usockets/Makefile +++ b/net/usockets/Makefile @@ -1,6 +1,6 @@ PORTNAME= usockets DISTVERSIONPREFIX= v -DISTVERSION= 0.7.1 +DISTVERSION= 0.8.0 CATEGORIES= net devel MAINTAINER= yuri@FreeBSD.org @@ -13,10 +13,11 @@ BROKEN_FreeBSD_11= error: unknown type name 'u_short'; did you mean 'short'?, et 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 +USE_LDCONFIG= yes + USE_GITHUB= yes GH_ACCOUNT= uNetworking GH_PROJECT= uSockets -USE_LDCONFIG= yes MAKE_ARGS= WITH_OPENSSL=1 @@ -29,4 +30,9 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/src/libusockets.h ${STAGEDIR}${PREFIX}/include ${INSTALL_LIB} ${WRKSRC}/libuSockets.so ${STAGEDIR}${PREFIX}/lib +do-test: # tests fail to compile: https://github.com/uNetworking/uSockets/issues/160 + cd ${WRKSRC} && \ + ${CXX} -o test tests/sni_test.c ${STAGEDIR}${PREFIX}/lib/libuSockets.so && \ + ./test + .include <bsd.port.mk> diff --git a/net/usockets/distinfo b/net/usockets/distinfo index dc0bc9a6f419..42f56808b33e 100644 --- a/net/usockets/distinfo +++ b/net/usockets/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1613430806 -SHA256 (uNetworking-uSockets-v0.7.1_GH0.tar.gz) = 1fdc5376e5ef9acf4fb673fcd5fd191da9b8d59a319e9ec7922872070a3dd21c -SIZE (uNetworking-uSockets-v0.7.1_GH0.tar.gz) = 62337 +TIMESTAMP = 1632681366 +SHA256 (uNetworking-uSockets-v0.8.0_GH0.tar.gz) = 06826f458ca8e7e5b55679563c4dc7b907dd4ae9e4efe231142b5c1b7417f197 +SIZE (uNetworking-uSockets-v0.8.0_GH0.tar.gz) = 65467 diff --git a/net/usockets/files/patch-Makefile b/net/usockets/files/patch-Makefile index c42a72e7ed91..58682e358332 100644 --- a/net/usockets/files/patch-Makefile +++ b/net/usockets/files/patch-Makefile @@ -1,18 +1,30 @@ ---- Makefile.orig 2020-09-05 12:33:36 UTC +--- Makefile.orig 2021-09-05 06:06:00 UTC +++ Makefile -@@ -39,12 +39,12 @@ override LDFLAGS += uSockets.a +@@ -46,22 +46,22 @@ override LDFLAGS += uSockets.a # By default we build the uSockets.a static library default: rm -f *.o - $(CC) $(CFLAGS) -flto -O3 -c src/*.c src/eventing/*.c src/crypto/*.c + $(CC) $(CFLAGS) -fPIC -flto -c src/*.c src/eventing/*.c src/crypto/*.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 -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 ++ $(CXX) $(CXXFLAGS) -fPIC -std=c++17 -flto -c src/crypto/*.cpp endif - $(AR) rvs uSockets.a *.o + $(CXX) -shared -o libuSockets.so *.o -lssl # Builds all examples .PHONY: examples + examples: default +- for f in examples/*.c; do $(CC) -flto -O3 $(CFLAGS) -o $$(basename "$$f" ".c") "$$f" $(LDFLAGS); done ++ for f in examples/*.c; do $(CC) -fPIC -flto $(CFLAGS) -o $$(basename "$$f" ".c") "$$f" $(LDFLAGS); done + + swift_examples: + swiftc -O -I . examples/swift_http_server/main.swift uSockets.a -o swift_http_server
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202109261913.18QJDoKp075654>