* [gentoo-commits] repo/proj/guru:master commit in: net-libs/usockets/, net-libs/usockets/files/
@ 2020-06-26 14:45 Andrew Ammerlaan
0 siblings, 0 replies; 6+ messages in thread
From: Andrew Ammerlaan @ 2020-06-26 14:45 UTC (permalink / raw
To: gentoo-commits
commit: 288701ce317e0530f533163121dd67fcd8396635
Author: Aisha Tammy <gentoo <AT> aisha <DOT> cc>
AuthorDate: Fri Jun 26 10:19:48 2020 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
CommitDate: Fri Jun 26 10:20:09 2020 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=288701ce
net-libs/usockets: removed unneeded BDEPEND
Package-Manager: Portage-2.3.101, Repoman-2.3.22
Signed-off-by: Aisha Tammy <gentoo <AT> aisha.cc>
net-libs/usockets/files/usockets-Makefile.patch | 17 +++++------------
net-libs/usockets/metadata.xml | 18 +++++++++++-------
...sockets-0.4.1.ebuild => usockets-0.4.1-r1.ebuild} | 20 +++++++++-----------
net-libs/usockets/usockets-9999.ebuild | 20 +++++++++-----------
4 files changed, 34 insertions(+), 41 deletions(-)
diff --git a/net-libs/usockets/files/usockets-Makefile.patch b/net-libs/usockets/files/usockets-Makefile.patch
index a51f8b1..5be09ee 100644
--- a/net-libs/usockets/files/usockets-Makefile.patch
+++ b/net-libs/usockets/files/usockets-Makefile.patch
@@ -1,5 +1,5 @@
diff --git a/Makefile b/Makefile
-index fa6e2ff..529ed74 100644
+index fa6e2ff..ca2603f 100644
--- a/Makefile
+++ b/Makefile
@@ -1,3 +1,14 @@
@@ -17,28 +17,21 @@ index fa6e2ff..529ed74 100644
# WITH_OPENSSL=1 enables OpenSSL 1.1+ support
ifeq ($(WITH_OPENSSL),1)
override CFLAGS += -DLIBUS_USE_OPENSSL
-@@ -33,13 +44,33 @@ ifeq ($(WITH_ASAN),1)
+@@ -33,13 +44,27 @@ ifeq ($(WITH_ASAN),1)
endif
override CFLAGS += -std=c11 -Isrc
-override LDFLAGS += uSockets.a
-# By default we build the uSockets.a static library
--default:
-+static:
+ default:
rm -f *.o
- $(CC) $(CFLAGS) -flto -O3 -c src/*.c src/eventing/*.c src/crypto/*.c
- $(AR) rvs uSockets.a *.o
-+ $(CC) $(CFLAGS) -c src/*.c src/eventing/*.c src/crypto/*.c
-+ $(AR) rvs libusockets.a *.o
-+
-+dynamic:
-+ rm -f *.o
+ $(CC) -fPIC -c src/*.c src/eventing/*.c src/crypto/*.c $(CFLAGS)
++ $(AR) rvs libusockets.a *.o
+ $(CC) -shared -fPIC -Wl,-soname,$(LIBTARGET) $(CFLAGS) -o $(LIBTARGET) *.o $(LDFLAGS)
+
-+default: static dynamic
-+
+install:
+ # install the folders needed (making sure that the exist)
+ install -d "$(DESTDIR)$(libdir)" \
@@ -56,7 +49,7 @@ index fa6e2ff..529ed74 100644
# Builds all examples
.PHONY: examples
-@@ -52,4 +83,5 @@ swift_examples:
+@@ -52,4 +77,5 @@ swift_examples:
clean:
rm -f *.o
rm -f *.a
diff --git a/net-libs/usockets/metadata.xml b/net-libs/usockets/metadata.xml
index 73dd576..a24f33a 100644
--- a/net-libs/usockets/metadata.xml
+++ b/net-libs/usockets/metadata.xml
@@ -1,11 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
- <email>gentoo@aisha.cc</email>
- <name>Aisha Tammy</name>
- </maintainer>
- <use>
- <flag name="libuv">Enable bindings to use the libuv dispatcher</flag>
- </use>
+ <maintainer type="person">
+ <email>gentoo@aisha.cc</email>
+ <name>Aisha Tammy</name>
+ </maintainer>
+ <maintainer type="project">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
+ <use>
+ <flag name="libuv">Enable bindings to use the libuv dispatcher</flag>
+ </use>
</pkgmetadata>
diff --git a/net-libs/usockets/usockets-0.4.1.ebuild b/net-libs/usockets/usockets-0.4.1-r1.ebuild
similarity index 78%
rename from net-libs/usockets/usockets-0.4.1.ebuild
rename to net-libs/usockets/usockets-0.4.1-r1.ebuild
index 0b4a1f0..07f6828 100644
--- a/net-libs/usockets/usockets-0.4.1.ebuild
+++ b/net-libs/usockets/usockets-0.4.1-r1.ebuild
@@ -27,7 +27,6 @@ DEPEND="ssl? (
)
libuv? ( dev-libs/libuv[static-libs?] )
"
-BDEPEND="${DEPEND}"
RDEPEND="${DEPEND}"
PATCHES=(
@@ -36,19 +35,18 @@ PATCHES=(
src_compile() {
# the Makefile uses environment variables
- emake -j1 \
- LIBusockets_VERSION=${PV} \
- WITH_OPENSSL=$(usex ssl 1 0) \
- WITH_LIBUV=$(usex libuv 1 0) \
- default
+ emake LIBusockets_VERSION=${PV} \
+ WITH_OPENSSL=$(usex ssl 1 0) \
+ WITH_LIBUV=$(usex libuv 1 0) \
+ default
}
src_install() {
- emake -j1 \
- libdir="/usr/$(get_libdir)" \
- prefix="/usr" DESTDIR="${D}" \
- LIBusockets_VERSION=${PV} \
- install
+ emake libdir="/usr/$(get_libdir)" \
+ prefix="/usr" \
+ DESTDIR="${D}" \
+ LIBusockets_VERSION=${PV} \
+ install
einstalldocs
if ! use static-libs; then
rm "${D}/usr/$(get_libdir)/libusockets.a" || die
diff --git a/net-libs/usockets/usockets-9999.ebuild b/net-libs/usockets/usockets-9999.ebuild
index 0b4a1f0..07f6828 100644
--- a/net-libs/usockets/usockets-9999.ebuild
+++ b/net-libs/usockets/usockets-9999.ebuild
@@ -27,7 +27,6 @@ DEPEND="ssl? (
)
libuv? ( dev-libs/libuv[static-libs?] )
"
-BDEPEND="${DEPEND}"
RDEPEND="${DEPEND}"
PATCHES=(
@@ -36,19 +35,18 @@ PATCHES=(
src_compile() {
# the Makefile uses environment variables
- emake -j1 \
- LIBusockets_VERSION=${PV} \
- WITH_OPENSSL=$(usex ssl 1 0) \
- WITH_LIBUV=$(usex libuv 1 0) \
- default
+ emake LIBusockets_VERSION=${PV} \
+ WITH_OPENSSL=$(usex ssl 1 0) \
+ WITH_LIBUV=$(usex libuv 1 0) \
+ default
}
src_install() {
- emake -j1 \
- libdir="/usr/$(get_libdir)" \
- prefix="/usr" DESTDIR="${D}" \
- LIBusockets_VERSION=${PV} \
- install
+ emake libdir="/usr/$(get_libdir)" \
+ prefix="/usr" \
+ DESTDIR="${D}" \
+ LIBusockets_VERSION=${PV} \
+ install
einstalldocs
if ! use static-libs; then
rm "${D}/usr/$(get_libdir)/libusockets.a" || die
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/proj/guru:master commit in: net-libs/usockets/, net-libs/usockets/files/
@ 2020-11-23 22:06 Andrew Ammerlaan
0 siblings, 0 replies; 6+ messages in thread
From: Andrew Ammerlaan @ 2020-11-23 22:06 UTC (permalink / raw
To: gentoo-commits
commit: 753e8bf323bb15a1432a121ef768c6e071867616
Author: epsilonKNOT <gentoo <AT> aisha <DOT> cc>
AuthorDate: Sun Nov 22 23:33:44 2020 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
CommitDate: Sun Nov 22 23:33:44 2020 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=753e8bf3
net-libs/usockets: fix ssl build
Package-Manager: Portage-3.0.8, Repoman-3.0.2
Signed-off-by: Aisha Tammy <gentoo <AT> aisha.cc>
net-libs/usockets/files/usockets-Makefile.patch | 17 +++++++++--------
.../{usockets-0.6.0.ebuild => usockets-0.6.0-r1.ebuild} | 2 +-
net-libs/usockets/usockets-9999.ebuild | 2 +-
3 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/net-libs/usockets/files/usockets-Makefile.patch b/net-libs/usockets/files/usockets-Makefile.patch
index c641db0b..a3c50bc1 100644
--- a/net-libs/usockets/files/usockets-Makefile.patch
+++ b/net-libs/usockets/files/usockets-Makefile.patch
@@ -1,5 +1,5 @@
diff --git a/Makefile b/Makefile
-index 27f97ce..1a01539 100644
+index 27f97ce..066305c 100644
--- a/Makefile
+++ b/Makefile
@@ -1,3 +1,13 @@
@@ -8,7 +8,7 @@ index 27f97ce..1a01539 100644
+prefix ?= "/usr/local"
+exec_prefix ?= "$(prefix)"
+libdir ?= "$(exec_prefix)/lib"
-+includedir?= "$(exec_prefix)/include/uSockets"
++includedir ?= "$(exec_prefix)/include/uSockets"
+
+# OpenBSD specific library version
+LIBTARGET = libusockets.so.$(LIBusockets_VERSION)
@@ -16,7 +16,7 @@ index 27f97ce..1a01539 100644
# WITH_OPENSSL=1 enables OpenSSL 1.1+ support or BoringSSL
# For now we need to link with C++ for OpenSSL support, but should be removed with time
ifeq ($(WITH_OPENSSL),1)
-@@ -34,17 +44,28 @@ ifeq ($(WITH_ASAN),1)
+@@ -34,17 +44,31 @@ ifeq ($(WITH_ASAN),1)
endif
override CFLAGS += -std=c11 -Isrc
@@ -28,11 +28,12 @@ index 27f97ce..1a01539 100644
rm -f *.o
- $(CC) $(CFLAGS) -flto -O3 -c src/*.c src/eventing/*.c src/crypto/*.c
-# For now we do rely on C++17 for OpenSSL support but we will be porting this work to C11
--ifeq ($(WITH_OPENSSL),1)
++ $(CC) $(CFLAGS) -fPIC -c src/*.c src/eventing/*.c src/crypto/*.c
+ ifeq ($(WITH_OPENSSL),1)
- $(CXX) $(CXXFLAGS) -std=c++17 -flto -O3 -c src/crypto/*.cpp
--endif
++ $(CXX) $(CXXFLAGS) -fPIC -std=c++17 -c src/crypto/*.cpp
+ endif
- $(AR) rvs uSockets.a *.o
-+ $(CC) -fPIC -c src/*.c src/eventing/*.c src/crypto/*.c $(CFLAGS)
+ $(AR) rvs libusockets.a *.o
+ $(CC) -shared -fPIC -Wl,-soname,$(LIBTARGET) $(CFLAGS) -o $(LIBTARGET) *.o $(LDFLAGS)
+
@@ -41,8 +42,8 @@ index 27f97ce..1a01539 100644
+ install -d "$(DESTDIR)$(libdir)" \
+ "$(DESTDIR)$(includedir)/internal/eventing" \
+ "$(DESTDIR)$(includedir)/internal/networking"
-+ # OpenBSD specific library version
+ install -m 755 $(LIBTARGET) "$(DESTDIR)$(libdir)/"
++ ln -sf $(LIBTARGET)"$(DESTDIR)$(libdir)/libusockets.so"
+ # install static library
+ install -m 755 libusockets.a "$(DESTDIR)$(libdir)/"
+ # we also install all the header files
@@ -53,7 +54,7 @@ index 27f97ce..1a01539 100644
# Builds all examples
.PHONY: examples
-@@ -57,4 +78,5 @@ swift_examples:
+@@ -57,4 +81,5 @@ swift_examples:
clean:
rm -f *.o
rm -f *.a
diff --git a/net-libs/usockets/usockets-0.6.0.ebuild b/net-libs/usockets/usockets-0.6.0-r1.ebuild
similarity index 98%
rename from net-libs/usockets/usockets-0.6.0.ebuild
rename to net-libs/usockets/usockets-0.6.0-r1.ebuild
index 07f68285..2da9a11a 100644
--- a/net-libs/usockets/usockets-0.6.0.ebuild
+++ b/net-libs/usockets/usockets-0.6.0-r1.ebuild
@@ -44,7 +44,7 @@ src_compile() {
src_install() {
emake libdir="/usr/$(get_libdir)" \
prefix="/usr" \
- DESTDIR="${D}" \
+ DESTDIR="${ED}" \
LIBusockets_VERSION=${PV} \
install
einstalldocs
diff --git a/net-libs/usockets/usockets-9999.ebuild b/net-libs/usockets/usockets-9999.ebuild
index 07f68285..2da9a11a 100644
--- a/net-libs/usockets/usockets-9999.ebuild
+++ b/net-libs/usockets/usockets-9999.ebuild
@@ -44,7 +44,7 @@ src_compile() {
src_install() {
emake libdir="/usr/$(get_libdir)" \
prefix="/usr" \
- DESTDIR="${D}" \
+ DESTDIR="${ED}" \
LIBusockets_VERSION=${PV} \
install
einstalldocs
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/proj/guru:master commit in: net-libs/usockets/, net-libs/usockets/files/
@ 2020-11-23 22:06 Andrew Ammerlaan
0 siblings, 0 replies; 6+ messages in thread
From: Andrew Ammerlaan @ 2020-11-23 22:06 UTC (permalink / raw
To: gentoo-commits
commit: ae86e8c552c377835ac0d2bfd521e06e55432c7f
Author: Aisha Tammy <gentoo <AT> aisha <DOT> cc>
AuthorDate: Mon Nov 23 02:46:51 2020 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
CommitDate: Mon Nov 23 02:46:51 2020 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=ae86e8c5
net-libs/usockets: add pkg-config file
really painful upstream makes life hell
libressl is considered a joke
shared libraries are considered a joke
not doing -O3 -flto is considered a joke
rehauled the whole Makefile to make it useable
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Aisha Tammy <gentoo <AT> aisha.cc>
.../usockets/files/usockets-0.6.0-Makefile.patch | 128 +++++++++++++++++++++
net-libs/usockets/files/usockets-Makefile.patch | 62 ----------
net-libs/usockets/usockets-0.6.0-r1.ebuild | 20 ++--
net-libs/usockets/usockets-9999.ebuild | 20 ++--
4 files changed, 148 insertions(+), 82 deletions(-)
diff --git a/net-libs/usockets/files/usockets-0.6.0-Makefile.patch b/net-libs/usockets/files/usockets-0.6.0-Makefile.patch
new file mode 100644
index 00000000..ebc9a0db
--- /dev/null
+++ b/net-libs/usockets/files/usockets-0.6.0-Makefile.patch
@@ -0,0 +1,128 @@
+diff --git a/Makefile b/Makefile
+index 27f97ce..c269c3f 100644
+--- a/Makefile
++++ b/Makefile
+@@ -1,60 +1,62 @@
++DESTDIR ?=
++
++prefix ?= /usr
++exec_prefix ?= $(prefix)
++LIB ?= lib
++libdir ?= $(exec_prefix)/$(LIB)
++includedir ?= $(exec_prefix)/include/uSockets
++
++VERSION ?= 0.0
++LIBTARGET = libusockets.so.$(VERSION)
++
++LIBS =
++REQUIRES =
++
+ # WITH_OPENSSL=1 enables OpenSSL 1.1+ support or BoringSSL
+ # For now we need to link with C++ for OpenSSL support, but should be removed with time
+ ifeq ($(WITH_OPENSSL),1)
+- override CFLAGS += -DLIBUS_USE_OPENSSL
+- # With problems on macOS, make sure to pass needed LDFLAGS required to find these
+- override LDFLAGS += -lssl -lcrypto -lstdc++
+-else
+- # WITH_WOLFSSL=1 enables WolfSSL 4.2.0 support (mutually exclusive with OpenSSL)
+- ifeq ($(WITH_WOLFSSL),1)
+- # todo: change these
+- override CFLAGS += -DLIBUS_USE_WOLFSSL -I/usr/local/include
+- override LDFLAGS += -L/usr/local/lib -lwolfssl
+- else
+- override CFLAGS += -DLIBUS_NO_SSL
+- endif
++CFLAGS += -DLIBUS_USE_OPENSSL
++LIBS += -lssl -lcrypto -lstdc++
++REQUIRES += libssl libcrypto
+ endif
+
+ # WITH_LIBUV=1 builds with libuv as event-loop
+ ifeq ($(WITH_LIBUV),1)
+- override CFLAGS += -DLIBUS_USE_LIBUV
+- override LDFLAGS += -luv
+-endif
+-
+-# WITH_GCD=1 builds with libdispatch as event-loop
+-ifeq ($(WITH_GCD),1)
+- override CFLAGS += -DLIBUS_USE_GCD
+- override LDFLAGS += -framework CoreFoundation
++CFLAGS += -DLIBUS_USE_LIBUV
++LIBS += -luv
++REQUIRES += libuv
+ endif
+
+-# WITH_ASAN builds with sanitizers
+-ifeq ($(WITH_ASAN),1)
+- override CFLAGS += -fsanitize=address -g
+- override LDFLAGS += -lasan
+-endif
+-
+-override CFLAGS += -std=c11 -Isrc
+-override LDFLAGS += uSockets.a
++CFLAGS += -std=c11 -Isrc
+
+-# 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
+-# For now we do rely on C++17 for OpenSSL support but we will be porting this work to C11
++ $(CC) $(CFLAGS) -fPIC -c src/*.c src/eventing/*.c src/crypto/*.c
+ ifeq ($(WITH_OPENSSL),1)
+- $(CXX) $(CXXFLAGS) -std=c++17 -flto -O3 -c src/crypto/*.cpp
++ $(CXX) $(CXXFLAGS) -fPIC -std=c++17 -c src/crypto/*.cpp
+ endif
+- $(AR) rvs uSockets.a *.o
+-
+-# Builds all examples
+-.PHONY: examples
+-examples: default
+- for f in examples/*.c; do $(CC) -flto -O3 $(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
++ $(AR) rvs libusockets.a *.o
++ $(CC) -shared -fPIC -Wl,-soname,$(LIBTARGET) $(CFLAGS) -o $(LIBTARGET) *.o $(LIBS) $(LDFLAGS)
++ sed -e "s:@PREFIX@:$(prefix):" -e "s:@REQUIRES@:$(REQUIRES):" \
++ -e "s:@LIB@:$(LIB):" -e "s:@VERSION@:$(VERSION):" libusockets.pc.in > libusockets.pc
++
++install:
++ install -d "$(DESTDIR)$(libdir)/pkgconfig" \
++ "$(DESTDIR)$(includedir)/internal/eventing" \
++ "$(DESTDIR)$(includedir)/internal/networking"
++ install -m 644 src/*.h "$(DESTDIR)$(includedir)/"
++ install -m 644 src/internal/*.h "$(DESTDIR)$(includedir)/internal/"
++ install -m 644 src/internal/eventing/*.h "$(DESTDIR)$(includedir)/internal/eventing/"
++ install -m 644 src/internal/networking/*.h "$(DESTDIR)$(includedir)/internal/networking/"
++ install -m 755 $(LIBTARGET) "$(DESTDIR)$(libdir)"
++ ln -sf $(LIBTARGET) "$(DESTDIR)$(libdir)/libusockets.so"
++ install -m 755 libusockets.a "$(DESTDIR)$(libdir)/"
++ install -m 644 libusockets.pc "$(DESTDIR)$(libdir)/pkgconfig/"
+
+ clean:
+ rm -f *.o
+ rm -f *.a
++ rm -f *.so
+ rm -rf .certs
++ rm -f libusockets.pc
++
++.PHONY:
+diff --git a/libusockets.pc.in b/libusockets.pc.in
+new file mode 100644
+index 0000000..b63637b
+--- /dev/null
++++ b/libusockets.pc.in
+@@ -0,0 +1,13 @@
++prefix=@PREFIX@
++exec_prefix=${prefix}
++libdir=${exec_prefix}/@LIB@
++includedir=${prefix}/include
++
++Name: uSockets
++Version: @VERSION@
++Description: eventing, networking and crypto for async applications.
++URL: https://github.com/uNetworking/uSockets
++
++Cflags: -I${includedir}
++Libs: -L${libdir} -lusockets
++Requires.private: @REQUIRES@
diff --git a/net-libs/usockets/files/usockets-Makefile.patch b/net-libs/usockets/files/usockets-Makefile.patch
deleted file mode 100644
index a3c50bc1..00000000
--- a/net-libs/usockets/files/usockets-Makefile.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-diff --git a/Makefile b/Makefile
-index 27f97ce..066305c 100644
---- a/Makefile
-+++ b/Makefile
-@@ -1,3 +1,13 @@
-+DESTDIR ?=
-+
-+prefix ?= "/usr/local"
-+exec_prefix ?= "$(prefix)"
-+libdir ?= "$(exec_prefix)/lib"
-+includedir ?= "$(exec_prefix)/include/uSockets"
-+
-+# OpenBSD specific library version
-+LIBTARGET = libusockets.so.$(LIBusockets_VERSION)
-+
- # WITH_OPENSSL=1 enables OpenSSL 1.1+ support or BoringSSL
- # For now we need to link with C++ for OpenSSL support, but should be removed with time
- ifeq ($(WITH_OPENSSL),1)
-@@ -34,17 +44,31 @@ ifeq ($(WITH_ASAN),1)
- endif
-
- override CFLAGS += -std=c11 -Isrc
--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
--# For now we do rely on C++17 for OpenSSL support but we will be porting this work to C11
-+ $(CC) $(CFLAGS) -fPIC -c src/*.c src/eventing/*.c src/crypto/*.c
- ifeq ($(WITH_OPENSSL),1)
-- $(CXX) $(CXXFLAGS) -std=c++17 -flto -O3 -c src/crypto/*.cpp
-+ $(CXX) $(CXXFLAGS) -fPIC -std=c++17 -c src/crypto/*.cpp
- endif
-- $(AR) rvs uSockets.a *.o
-+ $(AR) rvs libusockets.a *.o
-+ $(CC) -shared -fPIC -Wl,-soname,$(LIBTARGET) $(CFLAGS) -o $(LIBTARGET) *.o $(LDFLAGS)
-+
-+install:
-+ # install the folders needed (making sure that the exist)
-+ install -d "$(DESTDIR)$(libdir)" \
-+ "$(DESTDIR)$(includedir)/internal/eventing" \
-+ "$(DESTDIR)$(includedir)/internal/networking"
-+ install -m 755 $(LIBTARGET) "$(DESTDIR)$(libdir)/"
-+ ln -sf $(LIBTARGET)"$(DESTDIR)$(libdir)/libusockets.so"
-+ # install static library
-+ install -m 755 libusockets.a "$(DESTDIR)$(libdir)/"
-+ # we also install all the header files
-+ install src/*.h "$(DESTDIR)$(includedir)/"
-+ install -m 644 src/internal/*.h "$(DESTDIR)$(includedir)/internal/"
-+ install -m 644 src/internal/eventing/*.h "$(DESTDIR)$(includedir)/internal/eventing/"
-+ install -m 644 src/internal/networking/*.h "$(DESTDIR)$(includedir)/internal/networking/"
-
- # Builds all examples
- .PHONY: examples
-@@ -57,4 +81,5 @@ swift_examples:
- clean:
- rm -f *.o
- rm -f *.a
-+ rm -f *.so
- rm -rf .certs
diff --git a/net-libs/usockets/usockets-0.6.0-r1.ebuild b/net-libs/usockets/usockets-0.6.0-r1.ebuild
index 2da9a11a..1d42acf6 100644
--- a/net-libs/usockets/usockets-0.6.0-r1.ebuild
+++ b/net-libs/usockets/usockets-0.6.0-r1.ebuild
@@ -19,36 +19,36 @@ fi
LICENSE="Apache-2.0"
SLOT="0"
-IUSE="libuv +ssl libressl static-libs"
+IUSE="libuv +ssl static-libs"
DEPEND="ssl? (
- libressl? ( >=dev-libs/libressl-3.0.0:=[static-libs?] )
- !libressl? ( >=dev-libs/openssl-1.1.0:=[static-libs?] )
+ >=dev-libs/openssl-1.1.0:=[static-libs?]
)
libuv? ( dev-libs/libuv[static-libs?] )
"
RDEPEND="${DEPEND}"
PATCHES=(
- "${FILESDIR}/usockets-Makefile.patch"
+ "${FILESDIR}/${PN}-0.6.0-Makefile.patch"
)
src_compile() {
# the Makefile uses environment variables
- emake LIBusockets_VERSION=${PV} \
+ emake VERSION=${PV} \
+ LIB="$(get_libdir)" \
WITH_OPENSSL=$(usex ssl 1 0) \
WITH_LIBUV=$(usex libuv 1 0) \
default
}
src_install() {
- emake libdir="/usr/$(get_libdir)" \
- prefix="/usr" \
- DESTDIR="${ED}" \
- LIBusockets_VERSION=${PV} \
+ emake LIB="$(get_libdir)" \
+ prefix="${EPREFIX%/}/usr" \
+ DESTDIR="${D}" \
+ VERSION=${PV} \
install
einstalldocs
if ! use static-libs; then
- rm "${D}/usr/$(get_libdir)/libusockets.a" || die
+ rm -f "${ED}/usr/$(get_libdir)/libusockets.a" || die
fi
}
diff --git a/net-libs/usockets/usockets-9999.ebuild b/net-libs/usockets/usockets-9999.ebuild
index 2da9a11a..1d42acf6 100644
--- a/net-libs/usockets/usockets-9999.ebuild
+++ b/net-libs/usockets/usockets-9999.ebuild
@@ -19,36 +19,36 @@ fi
LICENSE="Apache-2.0"
SLOT="0"
-IUSE="libuv +ssl libressl static-libs"
+IUSE="libuv +ssl static-libs"
DEPEND="ssl? (
- libressl? ( >=dev-libs/libressl-3.0.0:=[static-libs?] )
- !libressl? ( >=dev-libs/openssl-1.1.0:=[static-libs?] )
+ >=dev-libs/openssl-1.1.0:=[static-libs?]
)
libuv? ( dev-libs/libuv[static-libs?] )
"
RDEPEND="${DEPEND}"
PATCHES=(
- "${FILESDIR}/usockets-Makefile.patch"
+ "${FILESDIR}/${PN}-0.6.0-Makefile.patch"
)
src_compile() {
# the Makefile uses environment variables
- emake LIBusockets_VERSION=${PV} \
+ emake VERSION=${PV} \
+ LIB="$(get_libdir)" \
WITH_OPENSSL=$(usex ssl 1 0) \
WITH_LIBUV=$(usex libuv 1 0) \
default
}
src_install() {
- emake libdir="/usr/$(get_libdir)" \
- prefix="/usr" \
- DESTDIR="${ED}" \
- LIBusockets_VERSION=${PV} \
+ emake LIB="$(get_libdir)" \
+ prefix="${EPREFIX%/}/usr" \
+ DESTDIR="${D}" \
+ VERSION=${PV} \
install
einstalldocs
if ! use static-libs; then
- rm "${D}/usr/$(get_libdir)/libusockets.a" || die
+ rm -f "${ED}/usr/$(get_libdir)/libusockets.a" || die
fi
}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/proj/guru:master commit in: net-libs/usockets/, net-libs/usockets/files/
@ 2021-02-15 7:11 Andrew Ammerlaan
0 siblings, 0 replies; 6+ messages in thread
From: Andrew Ammerlaan @ 2021-02-15 7:11 UTC (permalink / raw
To: gentoo-commits
commit: 5b03312f2fe5d1121be27f0f9fb8fe1fa0fcfbf3
Author: Aisha Tammy <gentoo <AT> aisha <DOT> cc>
AuthorDate: Sun Feb 14 22:17:34 2021 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
CommitDate: Sun Feb 14 22:19:55 2021 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=5b03312f
net-libs/usockets: version bump to 0.7.1
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Aisha Tammy <gentoo <AT> aisha.cc>
net-libs/usockets/Manifest | 1 +
.../usockets/files/usockets-0.7.1-Makefile.patch | 124 +++++++++++++++++++++
...{usockets-9999.ebuild => usockets-0.7.1.ebuild} | 7 +-
net-libs/usockets/usockets-9999.ebuild | 7 +-
4 files changed, 131 insertions(+), 8 deletions(-)
diff --git a/net-libs/usockets/Manifest b/net-libs/usockets/Manifest
index ffe05544..8ef09f26 100644
--- a/net-libs/usockets/Manifest
+++ b/net-libs/usockets/Manifest
@@ -1 +1,2 @@
DIST usockets-0.6.0_p20210126.tar.gz 57764 BLAKE2B 3ddcfaa684dec96a80f81424512bbd7a2fd8dd0724a0c20628aa76b5bb3e5b2177402b33feb8d046f3fa813288d3d3a5b8b18d7df8bd6a28b029162cdbe3b9ab SHA512 047b95a125b0a79ee4b301bb0c718aded6d6dbcafef64965ad6bcf14428b6569e67c2a9eb3d6d4bf3a2f4e2e46e978555507dec9047e6497823a880ae7deed03
+DIST usockets-0.7.1.tar.gz 62337 BLAKE2B 84f4274e560fae5bd12d22c87d0c44234421939ec978218b094848506448b622d32648d6f5163e95abf956f18bd6e26ffc58e27403572e49295572fd0f8eed32 SHA512 06e5ae094fd07b623d65dfcb3168cf6dcd115fc41c8af1858527be6bef08cbfa432a87021c32e7b3c87d56662a32a971b08b3b2934e91b822cf68407951015ed
diff --git a/net-libs/usockets/files/usockets-0.7.1-Makefile.patch b/net-libs/usockets/files/usockets-0.7.1-Makefile.patch
new file mode 100644
index 00000000..4d3d2045
--- /dev/null
+++ b/net-libs/usockets/files/usockets-0.7.1-Makefile.patch
@@ -0,0 +1,124 @@
+diff --git a/Makefile b/Makefile
+index 9b54cac..c31e575 100644
+--- a/Makefile
++++ b/Makefile
+@@ -1,60 +1,59 @@
++DESTDIR ?=
++
++prefix ?= /usr
++exec_prefix ?= $(prefix)
++LIB ?= lib
++libdir ?= $(exec_prefix)/$(LIB)
++includedir ?= $(exec_prefix)/include
++
++PKG_CONFIG ?= pkg-config
++
++VERSION ?= 0.0
++LIBTARGET = libusockets.so.$(VERSION)
++
++REQUIRES =
++COMMON_FLAGS = -Isrc
++
+ # WITH_OPENSSL=1 enables OpenSSL 1.1+ support or BoringSSL
+ # For now we need to link with C++ for OpenSSL support, but should be removed with time
+ ifeq ($(WITH_OPENSSL),1)
+- override CFLAGS += -DLIBUS_USE_OPENSSL
+- # With problems on macOS, make sure to pass needed LDFLAGS required to find these
+- override LDFLAGS += -lssl -lcrypto -lstdc++
+-else
+- # WITH_WOLFSSL=1 enables WolfSSL 4.2.0 support (mutually exclusive with OpenSSL)
+- ifeq ($(WITH_WOLFSSL),1)
+- # todo: change these
+- override CFLAGS += -DLIBUS_USE_WOLFSSL -I/usr/local/include
+- override LDFLAGS += -L/usr/local/lib -lwolfssl
+- else
+- override CFLAGS += -DLIBUS_NO_SSL
+- endif
++COMMON_FLAGS += -DLIBUS_USE_OPENSSL
++LDFLAGS += -lssl -lcrypto -lstdc++
++REQUIRES += libssl libcrypto
+ endif
+
+ # WITH_LIBUV=1 builds with libuv as event-loop
+ ifeq ($(WITH_LIBUV),1)
+- override CFLAGS += -DLIBUS_USE_LIBUV
+- override LDFLAGS += -luv
++COMMON_FLAGS += -DLIBUS_USE_LIBUV
++REQUIRES += libuv
+ endif
+
+-# WITH_GCD=1 builds with libdispatch as event-loop
+-ifeq ($(WITH_GCD),1)
+- override CFLAGS += -DLIBUS_USE_GCD
+- override LDFLAGS += -framework CoreFoundation
+-endif
++CFLAGS += -std=c11 $(COMMON_FLAGS)
++CXXFLAGS += -std=c++17 $(COMMON_FLAGS)
+
+-# WITH_ASAN builds with sanitizers
+-ifeq ($(WITH_ASAN),1)
+- override CFLAGS += -fsanitize=address -g
+- override LDFLAGS += -fsanitize=address
+-endif
+-
+-override CFLAGS += -std=c11 -Isrc
+-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
+-# For now we do rely on C++17 for OpenSSL support but we will be porting this work to C11
++ $(CC) $(CFLAGS) -fPIC -c src/*.c src/eventing/*.c src/crypto/*.c
+ ifeq ($(WITH_OPENSSL),1)
+- $(CXX) $(CXXFLAGS) -std=c++17 -flto -O3 -c src/crypto/*.cpp
++ $(CXX) $(CXXFLAGS) -fPIC -c src/crypto/*.cpp
+ endif
+- $(AR) rvs uSockets.a *.o
+-
+-# Builds all examples
+-.PHONY: examples
+-examples: default
+- for f in examples/*.c; do $(CC) -flto -O3 $(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
++ $(AR) rvs libusockets.a *.o
++ $(CC) -shared -o $(LIBTARGET) *.o -Wl,-soname,$(LIBTARGET) `$(PKG_CONFIG) --libs $(REQUIRES)` $(LDFLAGS)
++ sed -e "s:@PREFIX@:$(prefix):" -e "s:@REQUIRES@:$(REQUIRES):" \
++ -e "s:@LIB@:$(LIB):" -e "s:@VERSION@:$(VERSION):" libusockets.pc.in > libusockets.pc
++
++install:
++ install -d "$(DESTDIR)$(libdir)/pkgconfig" "$(DESTDIR)$(includedir)"
++ install -m 644 src/libusockets.h "$(DESTDIR)$(includedir)/"
++ install -m 755 $(LIBTARGET) "$(DESTDIR)$(libdir)"
++ ln -sf $(LIBTARGET) "$(DESTDIR)$(libdir)/libusockets.so"
++ install -m 755 libusockets.a "$(DESTDIR)$(libdir)/"
++ install -m 644 libusockets.pc "$(DESTDIR)$(libdir)/pkgconfig/"
+
+ clean:
+ rm -f *.o
+ rm -f *.a
++ rm -f *.so
+ rm -rf .certs
++ rm -f libusockets.pc
++
++.PHONY: default install clean
+diff --git a/libusockets.pc.in b/libusockets.pc.in
+new file mode 100644
+index 0000000..b818020
+--- /dev/null
++++ b/libusockets.pc.in
+@@ -0,0 +1,12 @@
++prefix=@PREFIX@
++libdir=${prefix}/@LIB@
++includedir=${prefix}/include
++
++Name: uSockets
++Version: @VERSION@
++Description: eventing, networking and crypto for async applications.
++URL: https://github.com/uNetworking/uSockets
++
++Cflags: -I${includedir}
++Libs: -L${libdir} -lusockets
++Requires.private: @REQUIRES@
diff --git a/net-libs/usockets/usockets-9999.ebuild b/net-libs/usockets/usockets-0.7.1.ebuild
similarity index 80%
copy from net-libs/usockets/usockets-9999.ebuild
copy to net-libs/usockets/usockets-0.7.1.ebuild
index 37f78076..10ce0fdd 100644
--- a/net-libs/usockets/usockets-9999.ebuild
+++ b/net-libs/usockets/usockets-0.7.1.ebuild
@@ -12,10 +12,9 @@ if [[ ${PV} == 9999 ]]; then
inherit git-r3
EGIT_REPO_URI="https://github.com/uNetworking/uSockets.git"
else
- COMMIT=45a70140b191e74c66301e5fefdacbd298b8c518
- SRC_URI="https://github.com/uNetworking/uSockets/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+ SRC_URI="https://github.com/uNetworking/uSockets/archive/v${PV}.tar.gz -> ${P}.tar.gz"
KEYWORDS="~amd64 ~arm64 ~x86"
- S="${WORKDIR}/uSockets-${COMMIT}"
+ S="${WORKDIR}/uSockets-${PV}"
fi
LICENSE="Apache-2.0"
@@ -29,7 +28,7 @@ DEPEND="
RDEPEND="${DEPEND}"
PATCHES=(
- "${FILESDIR}/${PN}-0.6.0-Makefile.patch"
+ "${FILESDIR}/${PN}-0.7.1-Makefile.patch"
)
src_configure() {
diff --git a/net-libs/usockets/usockets-9999.ebuild b/net-libs/usockets/usockets-9999.ebuild
index 37f78076..10ce0fdd 100644
--- a/net-libs/usockets/usockets-9999.ebuild
+++ b/net-libs/usockets/usockets-9999.ebuild
@@ -12,10 +12,9 @@ if [[ ${PV} == 9999 ]]; then
inherit git-r3
EGIT_REPO_URI="https://github.com/uNetworking/uSockets.git"
else
- COMMIT=45a70140b191e74c66301e5fefdacbd298b8c518
- SRC_URI="https://github.com/uNetworking/uSockets/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+ SRC_URI="https://github.com/uNetworking/uSockets/archive/v${PV}.tar.gz -> ${P}.tar.gz"
KEYWORDS="~amd64 ~arm64 ~x86"
- S="${WORKDIR}/uSockets-${COMMIT}"
+ S="${WORKDIR}/uSockets-${PV}"
fi
LICENSE="Apache-2.0"
@@ -29,7 +28,7 @@ DEPEND="
RDEPEND="${DEPEND}"
PATCHES=(
- "${FILESDIR}/${PN}-0.6.0-Makefile.patch"
+ "${FILESDIR}/${PN}-0.7.1-Makefile.patch"
)
src_configure() {
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/proj/guru:master commit in: net-libs/usockets/, net-libs/usockets/files/
@ 2021-05-11 15:21 Andrew Ammerlaan
0 siblings, 0 replies; 6+ messages in thread
From: Andrew Ammerlaan @ 2021-05-11 15:21 UTC (permalink / raw
To: gentoo-commits
commit: 351a7a9324f55ed3633ca1a3350701b188d4dabb
Author: Aisha Tammy <floss <AT> bsd <DOT> ac>
AuthorDate: Tue May 11 13:47:51 2021 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
CommitDate: Tue May 11 13:48:25 2021 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=351a7a93
net-libs/usockets: rename pkgconfig file
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Aisha Tammy <floss <AT> bsd.ac>
net-libs/usockets/files/usockets-0.7.1-Makefile.patch | 8 ++++----
...7.1_p20210214-r1.ebuild => usockets-0.7.1_p20210214-r2.ebuild} | 0
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/net-libs/usockets/files/usockets-0.7.1-Makefile.patch b/net-libs/usockets/files/usockets-0.7.1-Makefile.patch
index f1ed03b5a..2d3a47d29 100644
--- a/net-libs/usockets/files/usockets-0.7.1-Makefile.patch
+++ b/net-libs/usockets/files/usockets-0.7.1-Makefile.patch
@@ -86,7 +86,7 @@ index 9b54cac..a610bcc 100644
+ $(AR) rvs libusockets.a *.o
+ $(CC) -shared -o $(LIBTARGET) *.o -Wl,-soname,$(LIBTARGET) `$(PKG_CONFIG) --libs $(REQUIRES)` $(LDFLAGS)
+ sed -e "s:@PREFIX@:$(prefix):" -e "s:@REQUIRES@:$(REQUIRES):" \
-+ -e "s:@LIB@:$(LIB):" -e "s:@VERSION@:$(VERSION):" usockets.pc.in > usockets.pc
++ -e "s:@LIB@:$(LIB):" -e "s:@VERSION@:$(VERSION):" libusockets.pc.in > libusockets.pc
+
+install:
+ install -d "$(DESTDIR)$(libdir)/pkgconfig" "$(DESTDIR)$(includedir)"
@@ -94,7 +94,7 @@ index 9b54cac..a610bcc 100644
+ install -m 755 $(LIBTARGET) "$(DESTDIR)$(libdir)"
+ ln -sf $(LIBTARGET) "$(DESTDIR)$(libdir)/libusockets.so"
+ install -m 755 libusockets.a "$(DESTDIR)$(libdir)/"
-+ install -m 644 usockets.pc "$(DESTDIR)$(libdir)/pkgconfig/"
++ install -m 644 libusockets.pc "$(DESTDIR)$(libdir)/pkgconfig/"
clean:
rm -f *.o
@@ -104,11 +104,11 @@ index 9b54cac..a610bcc 100644
+ rm -f libusockets.pc
+
+.PHONY: default install clean
-diff --git a/usockets.pc.in b/usockets.pc.in
+diff --git a/libusockets.pc.in b/libusockets.pc.in
new file mode 100644
index 0000000..b818020
--- /dev/null
-+++ b/usockets.pc.in
++++ b/libusockets.pc.in
@@ -0,0 +1,12 @@
+prefix=@PREFIX@
+libdir=${prefix}/@LIB@
diff --git a/net-libs/usockets/usockets-0.7.1_p20210214-r1.ebuild b/net-libs/usockets/usockets-0.7.1_p20210214-r2.ebuild
similarity index 100%
rename from net-libs/usockets/usockets-0.7.1_p20210214-r1.ebuild
rename to net-libs/usockets/usockets-0.7.1_p20210214-r2.ebuild
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/proj/guru:master commit in: net-libs/usockets/, net-libs/usockets/files/
@ 2021-10-25 11:56 Andrew Ammerlaan
0 siblings, 0 replies; 6+ messages in thread
From: Andrew Ammerlaan @ 2021-10-25 11:56 UTC (permalink / raw
To: gentoo-commits
commit: 3c722132a92c17fb09e2ff5d46229c26d4caf0c6
Author: Aisha Tammy <gentoo <AT> aisha <DOT> cc>
AuthorDate: Mon Oct 25 03:51:27 2021 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Mon Oct 25 03:51:27 2021 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=3c722132
net-libs/usockets: version bump to 0.8.1
enable tests
tests fail with asio but pass with either
libuv or no flag (default epoll)
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Aisha Tammy <gentoo <AT> aisha.cc>
net-libs/usockets/Manifest | 2 +-
.../files/usockets-0.7.1_p20210909-Makefile.patch | 138 --------------------
.../files/usockets-0.8.1_p20211023-Makefile.patch | 141 +++++++++++++++++++++
.../usockets-0.8.1_p20211023-gen-ssl-config.patch | 14 ++
.../usockets-0.8.1_p20211023-hammer-test.patch | 16 +++
.../usockets-0.8.1_p20211023-pkg-config.patch | 18 +++
...0909.ebuild => usockets-0.8.1_p20211023.ebuild} | 12 +-
net-libs/usockets/usockets-9999.ebuild | 12 +-
8 files changed, 206 insertions(+), 147 deletions(-)
diff --git a/net-libs/usockets/Manifest b/net-libs/usockets/Manifest
index 84b397210..ff0b57d33 100644
--- a/net-libs/usockets/Manifest
+++ b/net-libs/usockets/Manifest
@@ -1 +1 @@
-DIST usockets-0.7.1_p20210909.tar.gz 65495 BLAKE2B 23aeb6ec3c330926aa375f0dedf4eb0e63f89fd833145cc3af47936de8ffa2139273710eee7019c2f5c12d7715746a38a6b64a3e48a349a2893599116ca623d8 SHA512 29bac37a75172cdb2881b27d142972a235470e8e0ec85e98c1bfd5f587ab1f777001e69a57bfc46b87a74bf73f4a166300e42e9f0ed908810bcf5c46290abdce
+DIST usockets-0.8.1_p20211023.tar.gz 66346 BLAKE2B 1833d1d3981fd5cf7f48794b183426341d7dd0b36654a528335c61a2495a59e54bad6f634ec14ccf8b33895091cc48306d7d7b90031888ba661a2db8019f30e9 SHA512 146c130731ac8f071f339e71c8cd45f319e837d333a36c6f578a2d7d9546267660ad0d3f82505d3f5d33b0494ec26b2d7b7eba3756d62ecc883b1afbf6c5bfb2
diff --git a/net-libs/usockets/files/usockets-0.7.1_p20210909-Makefile.patch b/net-libs/usockets/files/usockets-0.7.1_p20210909-Makefile.patch
deleted file mode 100644
index d8efed76f..000000000
--- a/net-libs/usockets/files/usockets-0.7.1_p20210909-Makefile.patch
+++ /dev/null
@@ -1,138 +0,0 @@
-diff --git a/Makefile b/Makefile
-index b809ac0..857a1f7 100644
---- a/Makefile
-+++ b/Makefile
-@@ -1,72 +1,69 @@
-+DESTDIR ?=
-+
-+prefix ?= /usr
-+exec_prefix ?= $(prefix)
-+LIB ?= lib
-+libdir ?= $(exec_prefix)/$(LIB)
-+includedir ?= $(exec_prefix)/include
-+
-+PKG_CONFIG ?= pkg-config
-+
-+VERSION ?= 0.0
-+LIBTARGET = libusockets.so.$(VERSION)
-+
-+REQUIRES =
-+COMMON_FLAGS = -fPIC -Isrc
-+
- # WITH_OPENSSL=1 enables OpenSSL 1.1+ support or BoringSSL
- # For now we need to link with C++ for OpenSSL support, but should be removed with time
- ifeq ($(WITH_OPENSSL),1)
-- override CFLAGS += -DLIBUS_USE_OPENSSL
-- # With problems on macOS, make sure to pass needed LDFLAGS required to find these
-- override LDFLAGS += -lssl -lcrypto -lstdc++
--else
-- # WITH_WOLFSSL=1 enables WolfSSL 4.2.0 support (mutually exclusive with OpenSSL)
-- ifeq ($(WITH_WOLFSSL),1)
-- # todo: change these
-- override CFLAGS += -DLIBUS_USE_WOLFSSL -I/usr/local/include
-- override LDFLAGS += -L/usr/local/lib -lwolfssl
-- else
-- override CFLAGS += -DLIBUS_NO_SSL
-- endif
-+COMMON_FLAGS += -DLIBUS_USE_OPENSSL
-+LDFLAGS += -lssl -lcrypto -lstdc++
-+REQUIRES += libssl libcrypto
- endif
-
- # WITH_LIBUV=1 builds with libuv as event-loop
- ifeq ($(WITH_LIBUV),1)
-- override CFLAGS += -DLIBUS_USE_LIBUV
-- override LDFLAGS += -luv
-+COMMON_FLAGS += -DLIBUS_USE_LIBUV
-+REQUIRES += libuv
- endif
-
--# WITH_ASIO builds with boot asio event-loop
-+# WITH_ASIO builds with boost asio event-loop
- ifeq ($(WITH_ASIO),1)
-- override CFLAGS += -DLIBUS_USE_ASIO
-- override LDFLAGS += -lstdc++ -lpthread
-- override CXXFLAGS += -pthread -DLIBUS_USE_ASIO
-+COMMON_FLAGS += -pthread -DLIBUS_USE_ASIO
- endif
-
--# WITH_GCD=1 builds with libdispatch as event-loop
--ifeq ($(WITH_GCD),1)
-- override CFLAGS += -DLIBUS_USE_GCD
-- override LDFLAGS += -framework CoreFoundation
--endif
--
--# WITH_ASAN builds with sanitizers
--ifeq ($(WITH_ASAN),1)
-- override CFLAGS += -fsanitize=address -g
-- override LDFLAGS += -fsanitize=address
--endif
--
--override CFLAGS += -std=c11 -Isrc
--override LDFLAGS += uSockets.a
-+CFLAGS += -std=c11 $(COMMON_FLAGS)
-+CXXFLAGS += -std=c++17 $(COMMON_FLAGS)
-
- # 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) -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) -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) -c src/crypto/*.cpp
- endif
-- $(AR) rvs uSockets.a *.o
--
--# Builds all examples
--.PHONY: examples
--examples: default
-- for f in examples/*.c; do $(CC) -flto -O3 $(CFLAGS) -o $$(basename "$$f" ".c") "$$f" $(LDFLAGS); done
-+ $(AR) rvs libusockets.a *.o
-+ $(CXX) $(CXXFLAGS) -shared -o $(LIBTARGET) *.o -Wl,-soname,$(LIBTARGET) `$(PKG_CONFIG) --libs $(REQUIRES)` $(LDFLAGS)
-+ sed -e "s:@PREFIX@:$(prefix):" -e "s:@REQUIRES@:$(REQUIRES):" \
-+ -e "s:@LIB@:$(LIB):" -e "s:@VERSION@:$(VERSION):" libusockets.pc.in > libusockets.pc
-
--swift_examples:
-- swiftc -O -I . examples/swift_http_server/main.swift uSockets.a -o swift_http_server
-+install:
-+ install -d "$(DESTDIR)$(libdir)/pkgconfig" "$(DESTDIR)$(includedir)"
-+ install -m 644 src/libusockets.h "$(DESTDIR)$(includedir)/"
-+ install -m 755 $(LIBTARGET) "$(DESTDIR)$(libdir)"
-+ ln -sf $(LIBTARGET) "$(DESTDIR)$(libdir)/libusockets.so"
-+ install -m 755 libusockets.a "$(DESTDIR)$(libdir)/"
-+ install -m 644 libusockets.pc "$(DESTDIR)$(libdir)/pkgconfig/"
-
- clean:
- rm -f *.o
- rm -f *.a
-+ rm -f *.so
- rm -rf .certs
-+ rm -f libusockets.pc
-+
-+.PHONY: default install clean
-diff --git a/libusockets.pc.in b/libusockets.pc.in
-new file mode 100644
-index 0000000..b818020
---- /dev/null
-+++ b/libusockets.pc.in
-@@ -0,0 +1,12 @@
-+prefix=@PREFIX@
-+libdir=${prefix}/@LIB@
-+includedir=${prefix}/include
-+
-+Name: uSockets
-+Version: @VERSION@
-+Description: eventing, networking and crypto for async applications.
-+URL: https://github.com/uNetworking/uSockets
-+
-+Cflags: -I${includedir}
-+Libs: -L${libdir} -lusockets
-+Requires.private: @REQUIRES@
diff --git a/net-libs/usockets/files/usockets-0.8.1_p20211023-Makefile.patch b/net-libs/usockets/files/usockets-0.8.1_p20211023-Makefile.patch
new file mode 100644
index 000000000..1de93a18e
--- /dev/null
+++ b/net-libs/usockets/files/usockets-0.8.1_p20211023-Makefile.patch
@@ -0,0 +1,141 @@
+diff --git a/Makefile b/Makefile
+index 16f613c..4bece6e 100644
+--- a/Makefile
++++ b/Makefile
+@@ -1,87 +1,73 @@
+-# WITH_BORINGSSL=1 enables BoringSSL support, linked statically (preferred over OpenSSL)
+-# You need to call "make boringssl" before
+-ifeq ($(WITH_BORINGSSL),1)
+- override CFLAGS += -Iboringssl/include -pthread -DLIBUS_USE_OPENSSL
+- override LDFLAGS += -pthread boringssl/build/ssl/libssl.a boringssl/build/crypto/libcrypto.a -lstdc++
+-else
+- # WITH_OPENSSL=1 enables OpenSSL 1.1+ support
+- # For now we need to link with C++ for OpenSSL support, but should be removed with time
+- ifeq ($(WITH_OPENSSL),1)
+- override CFLAGS += -DLIBUS_USE_OPENSSL
+- # With problems on macOS, make sure to pass needed LDFLAGS required to find these
+- override LDFLAGS += -lssl -lcrypto -lstdc++
+- else
+- # WITH_WOLFSSL=1 enables WolfSSL 4.2.0 support (mutually exclusive with OpenSSL)
+- ifeq ($(WITH_WOLFSSL),1)
+- # todo: change these
+- override CFLAGS += -DLIBUS_USE_WOLFSSL -I/usr/local/include
+- override LDFLAGS += -L/usr/local/lib -lwolfssl
+- else
+- override CFLAGS += -DLIBUS_NO_SSL
+- endif
+- endif
++VERSION ?= 0.0
++
++PREFIX ?= /usr
++LIB ?= lib
++LIBDIR ?= $(PREFIX)/$(LIB)
++INCDIR ?= $(PREFIX)/include
++
++PKG_CONFIG ?= pkg-config
++
++LIBTARGET = libusockets.so
++LIBTARGETV = $(LIBTARGET).$(VERSION)
++
++REQUIRES =
++COMMON_FLAGS = -fPIC -Isrc
++
++# WITH_OPENSSL=1 enables OpenSSL 1.1+ support or BoringSSL
++# For now we need to link with C++ for OpenSSL support, but should be removed with time
++ifeq ($(WITH_OPENSSL),1)
++COMMON_FLAGS += -DLIBUS_USE_OPENSSL
++REQUIRES += libssl libcrypto
+ endif
+
+ # WITH_LIBUV=1 builds with libuv as event-loop
+ ifeq ($(WITH_LIBUV),1)
+- override CFLAGS += -DLIBUS_USE_LIBUV
+- override LDFLAGS += -luv
++COMMON_FLAGS += -DLIBUS_USE_LIBUV
++REQUIRES += libuv
+ endif
+
+-# WITH_ASIO builds with boot asio event-loop
++# WITH_ASIO builds with boost asio event-loop
+ ifeq ($(WITH_ASIO),1)
+- override CFLAGS += -DLIBUS_USE_ASIO
+- override LDFLAGS += -lstdc++ -lpthread
+- override CXXFLAGS += -pthread -DLIBUS_USE_ASIO
++COMMON_FLAGS += -pthread -DLIBUS_USE_ASIO
+ endif
+
+-# WITH_GCD=1 builds with libdispatch as event-loop
+-ifeq ($(WITH_GCD),1)
+- override CFLAGS += -DLIBUS_USE_GCD
+- override LDFLAGS += -framework CoreFoundation
+-endif
+-
+-# WITH_ASAN builds with sanitizers
+-ifeq ($(WITH_ASAN),1)
+- override CFLAGS += -fsanitize=address -g
+- override LDFLAGS += -fsanitize=address
+-endif
+-
+-override CFLAGS += -std=c11 -Isrc
+-override LDFLAGS += uSockets.a
++CFLAGS += -std=c11 $(COMMON_FLAGS)
++CXXFLAGS += -std=c++17 $(COMMON_FLAGS)
+
+ # 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) -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) -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) -c src/crypto/*.cpp
+ endif
+-ifeq ($(WITH_BORINGSSL),1)
+- $(CXX) $(CXXFLAGS) -std=c++17 -flto -O3 -c src/crypto/*.cpp
+-endif
+- $(AR) rvs uSockets.a *.o
+-
+-# BoringSSL needs cmake and golang
+-.PHONY: boringssl
+-boringssl:
+- cd boringssl && mkdir -p build && cd build && cmake -DCMAKE_BUILD_TYPE=Release .. && make -j8
++ $(AR) rvs libusockets.a *.o
++ $(CXX) $(CXXFLAGS) -shared -o $(LIBTARGETV) *.o -Wl,-soname,$(LIBTARGET) `$(PKG_CONFIG) --libs $(REQUIRES)` $(LDFLAGS)
++ sed -e "s:@PREFIX@:$(PREFIX):" -e "s:@REQUIRES@:$(REQUIRES):" \
++ -e "s:@LIB@:$(LIB):" -e "s:@VERSION@:$(VERSION):" libusockets.pc.in > libusockets.pc
+
+-# Builds all examples
+-.PHONY: examples
+-examples: default
+- for f in examples/*.c; do $(CC) -flto -O3 $(CFLAGS) -o $$(basename "$$f" ".c") "$$f" $(LDFLAGS); done
++install:
++ install -d "$(DESTDIR)$(LIBDIR)/pkgconfig" "$(DESTDIR)$(INCDIR)"
++ install -m 644 src/libusockets.h "$(DESTDIR)$(INCDIR)/"
++ install -m 755 $(LIBTARGETV) "$(DESTDIR)$(LIBDIR)"
++ ln -sf $(LIBTARGETV) "$(DESTDIR)$(LIBDIR)/$(LIBTARGET)"
++ install -m 755 libusockets.a "$(DESTDIR)$(LIBDIR)/"
++ install -m 644 libusockets.pc "$(DESTDIR)$(LIBDIR)/pkgconfig/"
+
+-swift_examples:
+- swiftc -O -I . examples/swift_http_server/main.swift uSockets.a -o swift_http_server
++test:
++ rm -f localhost.pem localhost.crt
++ openssl req -x509 -out localhost.crt -keyout localhost.pem -newkey rsa:2048 -nodes -sha256 -subj '/CN=localhost' -extensions EXT -config localhost.conf
++ $(CXX) $(CXXFLAGS) examples/hammer_test.c libusockets.a -o hammer_test `$(PKG_CONFIG) --libs $(REQUIRES)` $(LDFLAGS)
++ ./hammer_test
+
+ clean:
+ rm -f *.o
+ rm -f *.a
++ rm -f *.so
+ rm -rf .certs
++ rm -f libusockets.pc
++
++.PHONY: default install clean
diff --git a/net-libs/usockets/files/usockets-0.8.1_p20211023-gen-ssl-config.patch b/net-libs/usockets/files/usockets-0.8.1_p20211023-gen-ssl-config.patch
new file mode 100644
index 000000000..47953e8e7
--- /dev/null
+++ b/net-libs/usockets/files/usockets-0.8.1_p20211023-gen-ssl-config.patch
@@ -0,0 +1,14 @@
+diff --git a/localhost.conf b/localhost.conf
+new file mode 100644
+index 0000000..415c4ff
+--- /dev/null
++++ b/localhost.conf
+@@ -0,0 +1,8 @@
++[dn]
++CN=localhost
++[req]
++distinguished_name = dn
++[EXT]
++subjectAltName=DNS:localhost
++keyUsage=digitalSignature
++extendedKeyUsage=serverAuth
diff --git a/net-libs/usockets/files/usockets-0.8.1_p20211023-hammer-test.patch b/net-libs/usockets/files/usockets-0.8.1_p20211023-hammer-test.patch
new file mode 100644
index 000000000..a69204ea3
--- /dev/null
+++ b/net-libs/usockets/files/usockets-0.8.1_p20211023-hammer-test.patch
@@ -0,0 +1,16 @@
+diff --git a/examples/hammer_test.c b/examples/hammer_test.c
+index 82cda2f..f5bbe5e 100644
+--- a/examples/hammer_test.c
++++ b/examples/hammer_test.c
+@@ -403,9 +403,8 @@ int main() {
+
+ // these are ignored for non-SSL
+ struct us_socket_context_options_t options = {};
+- options.key_file_name = "/home/alexhultman/uWebSockets.js/misc/key.pem";
+- options.cert_file_name = "/home/alexhultman/uWebSockets.js/misc/cert.pem";
+- options.passphrase = "1234";
++ options.key_file_name = "localhost.pem";
++ options.cert_file_name = "localhost.crt";
+
+ http_context = us_create_socket_context(SSL, loop, sizeof(struct http_context), options);
+
diff --git a/net-libs/usockets/files/usockets-0.8.1_p20211023-pkg-config.patch b/net-libs/usockets/files/usockets-0.8.1_p20211023-pkg-config.patch
new file mode 100644
index 000000000..7fc542fd6
--- /dev/null
+++ b/net-libs/usockets/files/usockets-0.8.1_p20211023-pkg-config.patch
@@ -0,0 +1,18 @@
+diff --git a/libusockets.pc.in b/libusockets.pc.in
+new file mode 100644
+index 0000000..b818020
+--- /dev/null
++++ b/libusockets.pc.in
+@@ -0,0 +1,12 @@
++prefix=@PREFIX@
++libdir=${prefix}/@LIB@
++includedir=${prefix}/include
++
++Name: uSockets
++Version: @VERSION@
++Description: eventing, networking and crypto for async applications.
++URL: https://github.com/uNetworking/uSockets
++
++Cflags: -I${includedir}
++Libs: -L${libdir} -lusockets
++Requires.private: @REQUIRES@
diff --git a/net-libs/usockets/usockets-0.7.1_p20210909.ebuild b/net-libs/usockets/usockets-0.8.1_p20211023.ebuild
similarity index 73%
rename from net-libs/usockets/usockets-0.7.1_p20210909.ebuild
rename to net-libs/usockets/usockets-0.8.1_p20211023.ebuild
index 5c5a33ead..58b0422a0 100644
--- a/net-libs/usockets/usockets-0.7.1_p20210909.ebuild
+++ b/net-libs/usockets/usockets-0.8.1_p20211023.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999 ]]; then
inherit git-r3
EGIT_REPO_URI="https://github.com/uNetworking/uSockets.git"
else
- COMMIT="c06112c89b4c1cf5a09b5f8daa2def756b925889"
+ COMMIT="c2c1bbfa1644f1f6eb7fc9375650f41c5f9b7b06"
SRC_URI="https://github.com/uNetworking/uSockets/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
KEYWORDS="~amd64 ~arm64 ~x86"
S="${WORKDIR}/uSockets-${COMMIT}"
@@ -20,8 +20,9 @@ fi
LICENSE="Apache-2.0"
SLOT="0"
-IUSE="asio libuv +ssl"
-REQUIRED_USE="?? ( asio libuv )"
+IUSE="asio libuv +ssl test"
+REQUIRED_USE="?? ( asio libuv ) test? ( ssl )"
+RESTRICT="!test? ( test )"
DEPEND="
asio? ( dev-cpp/asio[ssl(+)?] )
@@ -31,7 +32,10 @@ DEPEND="
RDEPEND="${DEPEND}"
PATCHES=(
- "${FILESDIR}/${PN}-0.7.1_p20210909-Makefile.patch"
+ "${FILESDIR}/${PN}-0.8.1_p20211023-Makefile.patch"
+ "${FILESDIR}/${PN}-0.8.1_p20211023-pkg-config.patch"
+ "${FILESDIR}/${PN}-0.8.1_p20211023-gen-ssl-config.patch"
+ "${FILESDIR}/${PN}-0.8.1_p20211023-hammer-test.patch"
)
src_configure() {
diff --git a/net-libs/usockets/usockets-9999.ebuild b/net-libs/usockets/usockets-9999.ebuild
index 5c5a33ead..58b0422a0 100644
--- a/net-libs/usockets/usockets-9999.ebuild
+++ b/net-libs/usockets/usockets-9999.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999 ]]; then
inherit git-r3
EGIT_REPO_URI="https://github.com/uNetworking/uSockets.git"
else
- COMMIT="c06112c89b4c1cf5a09b5f8daa2def756b925889"
+ COMMIT="c2c1bbfa1644f1f6eb7fc9375650f41c5f9b7b06"
SRC_URI="https://github.com/uNetworking/uSockets/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
KEYWORDS="~amd64 ~arm64 ~x86"
S="${WORKDIR}/uSockets-${COMMIT}"
@@ -20,8 +20,9 @@ fi
LICENSE="Apache-2.0"
SLOT="0"
-IUSE="asio libuv +ssl"
-REQUIRED_USE="?? ( asio libuv )"
+IUSE="asio libuv +ssl test"
+REQUIRED_USE="?? ( asio libuv ) test? ( ssl )"
+RESTRICT="!test? ( test )"
DEPEND="
asio? ( dev-cpp/asio[ssl(+)?] )
@@ -31,7 +32,10 @@ DEPEND="
RDEPEND="${DEPEND}"
PATCHES=(
- "${FILESDIR}/${PN}-0.7.1_p20210909-Makefile.patch"
+ "${FILESDIR}/${PN}-0.8.1_p20211023-Makefile.patch"
+ "${FILESDIR}/${PN}-0.8.1_p20211023-pkg-config.patch"
+ "${FILESDIR}/${PN}-0.8.1_p20211023-gen-ssl-config.patch"
+ "${FILESDIR}/${PN}-0.8.1_p20211023-hammer-test.patch"
)
src_configure() {
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2021-10-25 11:56 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-11-23 22:06 [gentoo-commits] repo/proj/guru:master commit in: net-libs/usockets/, net-libs/usockets/files/ Andrew Ammerlaan
-- strict thread matches above, loose matches on Subject: below --
2021-10-25 11:56 Andrew Ammerlaan
2021-05-11 15:21 Andrew Ammerlaan
2021-02-15 7:11 Andrew Ammerlaan
2020-11-23 22:06 Andrew Ammerlaan
2020-06-26 14:45 Andrew Ammerlaan
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox