* [gentoo-commits] repo/proj/guru:dev commit in: net-libs/usockets/files/, net-libs/usockets/
@ 2020-09-08 20:33 Aisha Tammy
0 siblings, 0 replies; 8+ messages in thread
From: Aisha Tammy @ 2020-09-08 20:33 UTC (permalink / raw
To: gentoo-commits
commit: 1713cdefbadcab1daa9340c5fd13611d7e7454a9
Author: Aisha Tammy <gentoo <AT> aisha <DOT> cc>
AuthorDate: Tue Sep 8 20:33:25 2020 +0000
Commit: Aisha Tammy <gentoo <AT> aisha <DOT> cc>
CommitDate: Tue Sep 8 20:33:25 2020 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=1713cdef
net-libs/usockets: version bump
Package-Manager: Portage-3.0.5, Repoman-3.0.1
Signed-off-by: Aisha Tammy <gentoo <AT> aisha.cc>
net-libs/usockets/Manifest | 1 +
net-libs/usockets/files/usockets-Makefile.patch | 24 ++++++-----
net-libs/usockets/usockets-0.6.0.ebuild | 54 +++++++++++++++++++++++++
3 files changed, 69 insertions(+), 10 deletions(-)
diff --git a/net-libs/usockets/Manifest b/net-libs/usockets/Manifest
index 8d649f4a..af6d36e3 100644
--- a/net-libs/usockets/Manifest
+++ b/net-libs/usockets/Manifest
@@ -1 +1,2 @@
DIST usockets-0.5.0.tar.gz 50852 BLAKE2B 69d36f4bad6e2bf87a8b33a023678b29d2aa2feea86ccd92d02d38e9b336d9b97a0d9709b381d7b2b1a20c86964eaa9fec8d7edaa322288b232ce7c3ea84f056 SHA512 ac734c1e6f50b0485456d5b0f06d6aeb5457b2b3cc1fc2c795773a469e0bdf7223256ba252d1f9cbead10948ca47ce8bcdbabc147fc3e6be59d1a051409375bd
+DIST usockets-0.6.0.tar.gz 57590 BLAKE2B 8438a3d2a1861d995410fcda8b888d561de2fb51af319e58c529f1113cb8e4d0f821b1649618c28d43dbc64f28b6b4e90f7e0bd51fcabc5afdc8318ca8f21448 SHA512 0803a117334d4dc38b4936e6f1d34984a9fba30da1c360c3ff3d7ce14275a4ac9c4a4e7b407791fc3661c50be6b6a8335d26f808b21d0ade5f85ab721b14a500
diff --git a/net-libs/usockets/files/usockets-Makefile.patch b/net-libs/usockets/files/usockets-Makefile.patch
index 5a105704..c641db0b 100644
--- a/net-libs/usockets/files/usockets-Makefile.patch
+++ b/net-libs/usockets/files/usockets-Makefile.patch
@@ -1,31 +1,36 @@
diff --git a/Makefile b/Makefile
-index 7d33414..6f3e53a 100644
+index 27f97ce..1a01539 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"
++prefix ?= "/usr/local"
++exec_prefix ?= "$(prefix)"
++libdir ?= "$(exec_prefix)/lib"
++includedir?= "$(exec_prefix)/include/uSockets"
+
+# OpenBSD specific library version
-+LIBTARGET = libusockets.so.$(LIBusockets_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)
- override CFLAGS += -DLIBUS_USE_OPENSSL
-@@ -33,13 +43,27 @@ ifeq ($(WITH_ASAN),1)
+@@ -34,17 +44,28 @@ 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
+-ifeq ($(WITH_OPENSSL),1)
+- $(CXX) $(CXXFLAGS) -std=c++17 -flto -O3 -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
@@ -48,10 +53,9 @@ index 7d33414..6f3e53a 100644
# Builds all examples
.PHONY: examples
-@@ -52,4 +76,6 @@ swift_examples:
+@@ -57,4 +78,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.ebuild b/net-libs/usockets/usockets-0.6.0.ebuild
new file mode 100644
index 00000000..07f68285
--- /dev/null
+++ b/net-libs/usockets/usockets-0.6.0.ebuild
@@ -0,0 +1,54 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib
+
+DESCRIPTION="tiny eventing, networking & crypto for async applications"
+HOMEPAGE="https://github.com/uNetworking/uSockets"
+
+if [[ ${PV} == 9999 ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/uNetworking/uSockets.git"
+else
+ SRC_URI="https://github.com/uNetworking/uSockets/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~arm64 ~x86"
+ S="${WORKDIR}/uSockets-${PV}"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="libuv +ssl libressl static-libs"
+
+DEPEND="ssl? (
+ libressl? ( >=dev-libs/libressl-3.0.0:=[static-libs?] )
+ !libressl? ( >=dev-libs/openssl-1.1.0:=[static-libs?] )
+ )
+ libuv? ( dev-libs/libuv[static-libs?] )
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+ "${FILESDIR}/usockets-Makefile.patch"
+)
+
+src_compile() {
+ # the Makefile uses environment variables
+ emake LIBusockets_VERSION=${PV} \
+ WITH_OPENSSL=$(usex ssl 1 0) \
+ WITH_LIBUV=$(usex libuv 1 0) \
+ default
+}
+
+src_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
+ fi
+}
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: net-libs/usockets/files/, net-libs/usockets/
@ 2020-11-22 23:33 Aisha Tammy
0 siblings, 0 replies; 8+ messages in thread
From: Aisha Tammy @ 2020-11-22 23:33 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: Aisha Tammy <gentoo <AT> aisha <DOT> cc>
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] 8+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: net-libs/usockets/files/, net-libs/usockets/
@ 2020-11-23 2:49 Aisha Tammy
0 siblings, 0 replies; 8+ messages in thread
From: Aisha Tammy @ 2020-11-23 2:49 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: Aisha Tammy <gentoo <AT> aisha <DOT> cc>
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] 8+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: net-libs/usockets/files/, net-libs/usockets/
@ 2021-04-10 22:13 Aisha Tammy
0 siblings, 0 replies; 8+ messages in thread
From: Aisha Tammy @ 2021-04-10 22:13 UTC (permalink / raw
To: gentoo-commits
commit: c078876d094b5299a501b9cc05eadc9e284d6f64
Author: Aisha Tammy <gentoo <AT> aisha <DOT> cc>
AuthorDate: Sat Apr 10 22:08:47 2021 +0000
Commit: Aisha Tammy <gentoo <AT> aisha <DOT> cc>
CommitDate: Sat Apr 10 22:08:47 2021 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=c078876d
net-libs/usockets: drop old version
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Aisha Tammy <gentoo <AT> aisha.cc>
net-libs/usockets/Manifest | 1 -
.../usockets/files/usockets-0.6.0-Makefile.patch | 124 ---------------------
net-libs/usockets/usockets-0.6.0_p20210126.ebuild | 50 ---------
3 files changed, 175 deletions(-)
diff --git a/net-libs/usockets/Manifest b/net-libs/usockets/Manifest
index 8ef09f26e..5637694ac 100644
--- a/net-libs/usockets/Manifest
+++ b/net-libs/usockets/Manifest
@@ -1,2 +1 @@
-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.6.0-Makefile.patch b/net-libs/usockets/files/usockets-0.6.0-Makefile.patch
deleted file mode 100644
index 4994b29d9..000000000
--- a/net-libs/usockets/files/usockets-0.6.0-Makefile.patch
+++ /dev/null
@@ -1,124 +0,0 @@
-diff --git a/Makefile b/Makefile
-index 27f97ce..f8bf8d7 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 += -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 += -lasan
--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-0.6.0_p20210126.ebuild b/net-libs/usockets/usockets-0.6.0_p20210126.ebuild
deleted file mode 100644
index 37f780764..000000000
--- a/net-libs/usockets/usockets-0.6.0_p20210126.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="tiny eventing, networking & crypto for async applications"
-HOMEPAGE="https://github.com/uNetworking/uSockets"
-
-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"
- KEYWORDS="~amd64 ~arm64 ~x86"
- S="${WORKDIR}/uSockets-${COMMIT}"
-fi
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="libuv +ssl static-libs"
-
-DEPEND="
- libuv? ( dev-libs/libuv[static-libs?] )
- ssl? ( >=dev-libs/openssl-1.1.0[static-libs?] )
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
- "${FILESDIR}/${PN}-0.6.0-Makefile.patch"
-)
-
-src_configure() {
- tc-export CC CXX
- export VERSION="${PV%_*}" \
- LIB="$(get_libdir)" \
- WITH_OPENSSL="$(usex ssl 1 0)"
- WITH_LIBUV="$(usex libuv 1 0)"
- default
-}
-
-src_install() {
- default
- einstalldocs
- if ! use static-libs; then
- rm -f "${ED}/usr/$(get_libdir)/libusockets.a" || die
- fi
-}
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: net-libs/usockets/files/, net-libs/usockets/
@ 2021-05-09 12:23 Aisha Tammy
0 siblings, 0 replies; 8+ messages in thread
From: Aisha Tammy @ 2021-05-09 12:23 UTC (permalink / raw
To: gentoo-commits
commit: 835fcaa403c4a2d86d4fac4a3b312d87b1049bfa
Author: Aisha Tammy <gentoo <AT> aisha <DOT> cc>
AuthorDate: Sun May 9 11:58:16 2021 +0000
Commit: Aisha Tammy <gentoo <AT> aisha <DOT> cc>
CommitDate: Sun May 9 12:09:34 2021 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=835fcaa4
net-libs/usockets: rename pkgconfig file
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Aisha Tammy <gentoo <AT> aisha.cc>
net-libs/usockets/files/usockets-0.7.1-Makefile.patch | 10 +++++-----
...7.1_p20210214.ebuild => usockets-0.7.1_p20210214-r1.ebuild} | 0
2 files changed, 5 insertions(+), 5 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 4d3d2045e..f1ed03b5a 100644
--- a/net-libs/usockets/files/usockets-0.7.1-Makefile.patch
+++ b/net-libs/usockets/files/usockets-0.7.1-Makefile.patch
@@ -1,5 +1,5 @@
diff --git a/Makefile b/Makefile
-index 9b54cac..c31e575 100644
+index 9b54cac..a610bcc 100644
--- a/Makefile
+++ b/Makefile
@@ -1,60 +1,59 @@
@@ -86,7 +86,7 @@ index 9b54cac..c31e575 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):" libusockets.pc.in > libusockets.pc
++ -e "s:@LIB@:$(LIB):" -e "s:@VERSION@:$(VERSION):" usockets.pc.in > usockets.pc
+
+install:
+ install -d "$(DESTDIR)$(libdir)/pkgconfig" "$(DESTDIR)$(includedir)"
@@ -94,7 +94,7 @@ index 9b54cac..c31e575 100644
+ 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/"
++ install -m 644 usockets.pc "$(DESTDIR)$(libdir)/pkgconfig/"
clean:
rm -f *.o
@@ -104,11 +104,11 @@ index 9b54cac..c31e575 100644
+ rm -f libusockets.pc
+
+.PHONY: default install clean
-diff --git a/libusockets.pc.in b/libusockets.pc.in
+diff --git a/usockets.pc.in b/usockets.pc.in
new file mode 100644
index 0000000..b818020
--- /dev/null
-+++ b/libusockets.pc.in
++++ b/usockets.pc.in
@@ -0,0 +1,12 @@
+prefix=@PREFIX@
+libdir=${prefix}/@LIB@
diff --git a/net-libs/usockets/usockets-0.7.1_p20210214.ebuild b/net-libs/usockets/usockets-0.7.1_p20210214-r1.ebuild
similarity index 100%
rename from net-libs/usockets/usockets-0.7.1_p20210214.ebuild
rename to net-libs/usockets/usockets-0.7.1_p20210214-r1.ebuild
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: net-libs/usockets/files/, net-libs/usockets/
@ 2021-09-09 16:14 Aisha Tammy
0 siblings, 0 replies; 8+ messages in thread
From: Aisha Tammy @ 2021-09-09 16:14 UTC (permalink / raw
To: gentoo-commits
commit: c28c5380044fd703e28d2a45b18ef9e078551db9
Author: Aisha Tammy <gentoo <AT> aisha <DOT> cc>
AuthorDate: Thu Sep 9 16:12:44 2021 +0000
Commit: Aisha Tammy <gentoo <AT> aisha <DOT> cc>
CommitDate: Thu Sep 9 16:12:44 2021 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=c28c5380
net-libs/usockets: version bump to latest commit
adds new optional dependency on dev-cpp/asio
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Aisha Tammy <gentoo <AT> aisha.cc>
net-libs/usockets/Manifest | 1 +
.../files/usockets-0.7.1_p20210909-Makefile.patch | 138 +++++++++++++++++++++
net-libs/usockets/metadata.xml | 1 +
...9999.ebuild => usockets-0.7.1_p20210909.ebuild} | 16 ++-
net-libs/usockets/usockets-9999.ebuild | 16 ++-
5 files changed, 160 insertions(+), 12 deletions(-)
diff --git a/net-libs/usockets/Manifest b/net-libs/usockets/Manifest
index aef4019f1..7f03a5189 100644
--- a/net-libs/usockets/Manifest
+++ b/net-libs/usockets/Manifest
@@ -1 +1,2 @@
DIST usockets-0.7.1_p20210214.tar.gz 62372 BLAKE2B 2853792af6f86954d7920cd33936ddd586cdeb9149dbffd0687b3bbc0965526d28c363864398d17182df9e038c35dc384271f01e72f7a60189319b9e820de3cb SHA512 d4827982a288c81edfcb167cfa6ee8fe11bbae90d25ed9086c006cf6098dfad8b6b910f8fb93ecc67fbea76452627dd4666c7ae3d74fb20112f8e22f7091ec11
+DIST usockets-0.7.1_p20210909.tar.gz 65495 BLAKE2B 23aeb6ec3c330926aa375f0dedf4eb0e63f89fd833145cc3af47936de8ffa2139273710eee7019c2f5c12d7715746a38a6b64a3e48a349a2893599116ca623d8 SHA512 29bac37a75172cdb2881b27d142972a235470e8e0ec85e98c1bfd5f587ab1f777001e69a57bfc46b87a74bf73f4a166300e42e9f0ed908810bcf5c46290abdce
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
new file mode 100644
index 000000000..d8efed76f
--- /dev/null
+++ b/net-libs/usockets/files/usockets-0.7.1_p20210909-Makefile.patch
@@ -0,0 +1,138 @@
+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/metadata.xml b/net-libs/usockets/metadata.xml
index 4e3422276..f4d5bd540 100644
--- a/net-libs/usockets/metadata.xml
+++ b/net-libs/usockets/metadata.xml
@@ -6,6 +6,7 @@
<name>Aisha Tammy</name>
</maintainer>
<use>
+ <flag name="asio">Enable bindings to use the boost asio dispatcher</flag>
<flag name="libuv">Enable bindings to use the libuv dispatcher</flag>
</use>
</pkgmetadata>
diff --git a/net-libs/usockets/usockets-9999.ebuild b/net-libs/usockets/usockets-0.7.1_p20210909.ebuild
similarity index 63%
copy from net-libs/usockets/usockets-9999.ebuild
copy to net-libs/usockets/usockets-0.7.1_p20210909.ebuild
index c08a9ad93..3de0636c4 100644
--- a/net-libs/usockets/usockets-9999.ebuild
+++ b/net-libs/usockets/usockets-0.7.1_p20210909.ebuild
@@ -12,31 +12,35 @@ if [[ ${PV} == 9999 ]]; then
inherit git-r3
EGIT_REPO_URI="https://github.com/uNetworking/uSockets.git"
else
- SRC_URI="https://github.com/uNetworking/uSockets/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+ COMMIT="c06112c89b4c1cf5a09b5f8daa2def756b925889"
+ SRC_URI="https://github.com/uNetworking/uSockets/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
KEYWORDS="~amd64 ~arm64 ~x86"
- S="${WORKDIR}/uSockets-${PV}"
+ S="${WORKDIR}/uSockets-${COMMIT}"
fi
LICENSE="Apache-2.0"
SLOT="0"
-IUSE="libuv +ssl"
+IUSE="asio libuv +ssl"
+REQUIRED_USE="?? ( asio libuv )"
DEPEND="
+ asio? ( dev-cpp/asio[ssl?] )
libuv? ( dev-libs/libuv )
ssl? ( >=dev-libs/openssl-1.1.0 )
"
RDEPEND="${DEPEND}"
PATCHES=(
- "${FILESDIR}/${PN}-0.7.1-Makefile.patch"
+ "${FILESDIR}/${PN}-0.7.1_p20210909-Makefile.patch"
)
src_configure() {
tc-export CC CXX AR
export VERSION="${PV%_*}" \
LIB="$(get_libdir)" \
- WITH_OPENSSL="$(usex ssl 1 0)"
- WITH_LIBUV="$(usex libuv 1 0)"
+ WITH_OPENSSL="$(usex ssl 1 0)" \
+ WITH_LIBUV="$(usex libuv 1 0)" \
+ WITH_ASIO="$(usex asio 1 0)"
default
}
diff --git a/net-libs/usockets/usockets-9999.ebuild b/net-libs/usockets/usockets-9999.ebuild
index c08a9ad93..3de0636c4 100644
--- a/net-libs/usockets/usockets-9999.ebuild
+++ b/net-libs/usockets/usockets-9999.ebuild
@@ -12,31 +12,35 @@ if [[ ${PV} == 9999 ]]; then
inherit git-r3
EGIT_REPO_URI="https://github.com/uNetworking/uSockets.git"
else
- SRC_URI="https://github.com/uNetworking/uSockets/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+ COMMIT="c06112c89b4c1cf5a09b5f8daa2def756b925889"
+ SRC_URI="https://github.com/uNetworking/uSockets/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
KEYWORDS="~amd64 ~arm64 ~x86"
- S="${WORKDIR}/uSockets-${PV}"
+ S="${WORKDIR}/uSockets-${COMMIT}"
fi
LICENSE="Apache-2.0"
SLOT="0"
-IUSE="libuv +ssl"
+IUSE="asio libuv +ssl"
+REQUIRED_USE="?? ( asio libuv )"
DEPEND="
+ asio? ( dev-cpp/asio[ssl?] )
libuv? ( dev-libs/libuv )
ssl? ( >=dev-libs/openssl-1.1.0 )
"
RDEPEND="${DEPEND}"
PATCHES=(
- "${FILESDIR}/${PN}-0.7.1-Makefile.patch"
+ "${FILESDIR}/${PN}-0.7.1_p20210909-Makefile.patch"
)
src_configure() {
tc-export CC CXX AR
export VERSION="${PV%_*}" \
LIB="$(get_libdir)" \
- WITH_OPENSSL="$(usex ssl 1 0)"
- WITH_LIBUV="$(usex libuv 1 0)"
+ WITH_OPENSSL="$(usex ssl 1 0)" \
+ WITH_LIBUV="$(usex libuv 1 0)" \
+ WITH_ASIO="$(usex asio 1 0)"
default
}
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: net-libs/usockets/files/, net-libs/usockets/
@ 2021-09-09 16:14 Aisha Tammy
0 siblings, 0 replies; 8+ messages in thread
From: Aisha Tammy @ 2021-09-09 16:14 UTC (permalink / raw
To: gentoo-commits
commit: 23815a296438a9a87459b086bafcfed6d66e696d
Author: Aisha Tammy <gentoo <AT> aisha <DOT> cc>
AuthorDate: Thu Sep 9 16:13:12 2021 +0000
Commit: Aisha Tammy <gentoo <AT> aisha <DOT> cc>
CommitDate: Thu Sep 9 16:13:12 2021 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=23815a29
net-libs/usockets: drop old version
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Aisha Tammy <gentoo <AT> aisha.cc>
net-libs/usockets/Manifest | 1 -
.../usockets/files/usockets-0.7.1-Makefile.patch | 124 ---------------------
.../usockets/usockets-0.7.1_p20210214-r2.ebuild | 48 --------
3 files changed, 173 deletions(-)
diff --git a/net-libs/usockets/Manifest b/net-libs/usockets/Manifest
index 7f03a5189..84b397210 100644
--- a/net-libs/usockets/Manifest
+++ b/net-libs/usockets/Manifest
@@ -1,2 +1 @@
-DIST usockets-0.7.1_p20210214.tar.gz 62372 BLAKE2B 2853792af6f86954d7920cd33936ddd586cdeb9149dbffd0687b3bbc0965526d28c363864398d17182df9e038c35dc384271f01e72f7a60189319b9e820de3cb SHA512 d4827982a288c81edfcb167cfa6ee8fe11bbae90d25ed9086c006cf6098dfad8b6b910f8fb93ecc67fbea76452627dd4666c7ae3d74fb20112f8e22f7091ec11
DIST usockets-0.7.1_p20210909.tar.gz 65495 BLAKE2B 23aeb6ec3c330926aa375f0dedf4eb0e63f89fd833145cc3af47936de8ffa2139273710eee7019c2f5c12d7715746a38a6b64a3e48a349a2893599116ca623d8 SHA512 29bac37a75172cdb2881b27d142972a235470e8e0ec85e98c1bfd5f587ab1f777001e69a57bfc46b87a74bf73f4a166300e42e9f0ed908810bcf5c46290abdce
diff --git a/net-libs/usockets/files/usockets-0.7.1-Makefile.patch b/net-libs/usockets/files/usockets-0.7.1-Makefile.patch
deleted file mode 100644
index 2d3a47d29..000000000
--- a/net-libs/usockets/files/usockets-0.7.1-Makefile.patch
+++ /dev/null
@@ -1,124 +0,0 @@
-diff --git a/Makefile b/Makefile
-index 9b54cac..a610bcc 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-0.7.1_p20210214-r2.ebuild b/net-libs/usockets/usockets-0.7.1_p20210214-r2.ebuild
deleted file mode 100644
index 0e1f15d5b..000000000
--- a/net-libs/usockets/usockets-0.7.1_p20210214-r2.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="tiny eventing, networking & crypto for async applications"
-HOMEPAGE="https://github.com/uNetworking/uSockets"
-
-if [[ ${PV} == 9999 ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/uNetworking/uSockets.git"
-else
- COMMIT=5440dbac79bd76444175b76ee95dfcade12a6aac
- SRC_URI="https://github.com/uNetworking/uSockets/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64 ~arm64 ~x86"
- S="${WORKDIR}/uSockets-${COMMIT}"
-fi
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="libuv +ssl"
-
-DEPEND="
- libuv? ( dev-libs/libuv )
- ssl? ( >=dev-libs/openssl-1.1.0 )
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
- "${FILESDIR}/${PN}-0.7.1-Makefile.patch"
-)
-
-src_configure() {
- tc-export CC CXX AR
- export VERSION="${PV%_*}" \
- LIB="$(get_libdir)" \
- WITH_OPENSSL="$(usex ssl 1 0)"
- WITH_LIBUV="$(usex libuv 1 0)"
- default
-}
-
-src_install() {
- default
- einstalldocs
- rm -f "${ED}/usr/$(get_libdir)/libusockets.a" || die
-}
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: net-libs/usockets/files/, net-libs/usockets/
@ 2021-10-25 3:51 Aisha Tammy
0 siblings, 0 replies; 8+ messages in thread
From: Aisha Tammy @ 2021-10-25 3:51 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: Aisha Tammy <gentoo <AT> aisha <DOT> cc>
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] 8+ messages in thread
end of thread, other threads:[~2021-10-25 3:51 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-09-09 16:14 [gentoo-commits] repo/proj/guru:dev commit in: net-libs/usockets/files/, net-libs/usockets/ Aisha Tammy
-- strict thread matches above, loose matches on Subject: below --
2021-10-25 3:51 Aisha Tammy
2021-09-09 16:14 Aisha Tammy
2021-05-09 12:23 Aisha Tammy
2021-04-10 22:13 Aisha Tammy
2020-11-23 2:49 Aisha Tammy
2020-11-22 23:33 Aisha Tammy
2020-09-08 20:33 Aisha Tammy
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox