public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/proj/guru:master commit in: net-libs/usockets/files/, net-libs/usockets/
@ 2020-07-30 16:16 Andrew Ammerlaan
  0 siblings, 0 replies; 5+ messages in thread
From: Andrew Ammerlaan @ 2020-07-30 16:16 UTC (permalink / raw
  To: gentoo-commits

commit:     76c4834856ed8b49748d7f2bcc844eb79d41b09e
Author:     Aisha Tammy <gentoo <AT> aisha <DOT> cc>
AuthorDate: Wed Jul 29 12:37:17 2020 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
CommitDate: Wed Jul 29 12:44:25 2020 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=76c48348

net-libs/usockets: update to 0.5.0

Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Aisha Tammy <gentoo <AT> aisha.cc>

 net-libs/usockets/Manifest                      |  1 +
 net-libs/usockets/files/usockets-Makefile.patch | 12 +++---
 net-libs/usockets/usockets-0.5.0.ebuild         | 54 +++++++++++++++++++++++++
 3 files changed, 61 insertions(+), 6 deletions(-)

diff --git a/net-libs/usockets/Manifest b/net-libs/usockets/Manifest
index 26023b0..57d722f 100644
--- a/net-libs/usockets/Manifest
+++ b/net-libs/usockets/Manifest
@@ -1 +1,2 @@
 DIST usockets-0.4.1.tar.gz 49955 BLAKE2B 581b5745c4b1562fe21ac81736ebc6db95ed9e25a47e3124fa4dbc25978cde9f901a651cbc99128952282407f506900cae79a59bb1aab8d5e951e114d1f8f3b7 SHA512 2fbb37e0d3768c4b79b100132edd4aea65c7483186394d9dd5729385031e257ebe7ba04e53cb67f796edbc035074268920a1fdb11be79a74cb83799a7b61f7c0
+DIST usockets-0.5.0.tar.gz 50852 BLAKE2B 69d36f4bad6e2bf87a8b33a023678b29d2aa2feea86ccd92d02d38e9b336d9b97a0d9709b381d7b2b1a20c86964eaa9fec8d7edaa322288b232ce7c3ea84f056 SHA512 ac734c1e6f50b0485456d5b0f06d6aeb5457b2b3cc1fc2c795773a469e0bdf7223256ba252d1f9cbead10948ca47ce8bcdbabc147fc3e6be59d1a051409375bd

diff --git a/net-libs/usockets/files/usockets-Makefile.patch b/net-libs/usockets/files/usockets-Makefile.patch
index 5be09ee..5a10570 100644
--- a/net-libs/usockets/files/usockets-Makefile.patch
+++ b/net-libs/usockets/files/usockets-Makefile.patch
@@ -1,8 +1,8 @@
 diff --git a/Makefile b/Makefile
-index fa6e2ff..ca2603f 100644
+index 7d33414..6f3e53a 100644
 --- a/Makefile
 +++ b/Makefile
-@@ -1,3 +1,14 @@
+@@ -1,3 +1,13 @@
 +DESTDIR ?=
 +
 +prefix ?=	"/usr/local"
@@ -13,11 +13,10 @@ index fa6e2ff..ca2603f 100644
 +# OpenBSD specific library version
 +LIBTARGET =	libusockets.so.$(LIBusockets_VERSION)
 +
-+
- # WITH_OPENSSL=1 enables OpenSSL 1.1+ support
+ # WITH_OPENSSL=1 enables OpenSSL 1.1+ support or BoringSSL
  ifeq ($(WITH_OPENSSL),1)
  	override CFLAGS += -DLIBUS_USE_OPENSSL
-@@ -33,13 +44,27 @@ ifeq ($(WITH_ASAN),1)
+@@ -33,13 +43,27 @@ ifeq ($(WITH_ASAN),1)
  endif
  
  override CFLAGS += -std=c11 -Isrc
@@ -49,9 +48,10 @@ index fa6e2ff..ca2603f 100644
  
  # Builds all examples
  .PHONY: examples
-@@ -52,4 +77,5 @@ swift_examples:
+@@ -52,4 +76,6 @@ swift_examples:
  clean:
  	rm -f *.o
  	rm -f *.a
 +	rm -f *.so
  	rm -rf .certs
++

diff --git a/net-libs/usockets/usockets-0.5.0.ebuild b/net-libs/usockets/usockets-0.5.0.ebuild
new file mode 100644
index 0000000..07f6828
--- /dev/null
+++ b/net-libs/usockets/usockets-0.5.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] 5+ messages in thread
* [gentoo-commits] repo/proj/guru:master commit in: net-libs/usockets/files/, net-libs/usockets/
@ 2020-09-11 16:51 Andrew Ammerlaan
  0 siblings, 0 replies; 5+ messages in thread
From: Andrew Ammerlaan @ 2020-09-11 16:51 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:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
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] 5+ messages in thread
* [gentoo-commits] repo/proj/guru:master commit in: net-libs/usockets/files/, net-libs/usockets/
@ 2021-05-09 18:13 Andrew Ammerlaan
  0 siblings, 0 replies; 5+ messages in thread
From: Andrew Ammerlaan @ 2021-05-09 18:13 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:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
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] 5+ messages in thread
* [gentoo-commits] repo/proj/guru:master commit in: net-libs/usockets/files/, net-libs/usockets/
@ 2021-09-10 10:45 Arthur Zamarin
  0 siblings, 0 replies; 5+ messages in thread
From: Arthur Zamarin @ 2021-09-10 10:45 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:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
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] 5+ messages in thread
* [gentoo-commits] repo/proj/guru:master commit in: net-libs/usockets/files/, net-libs/usockets/
@ 2021-09-10 10:45 Arthur Zamarin
  0 siblings, 0 replies; 5+ messages in thread
From: Arthur Zamarin @ 2021-09-10 10:45 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:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
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] 5+ messages in thread
end of thread, other threads:[~2021-09-10 10:45 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-07-30 16:16 [gentoo-commits] repo/proj/guru:master commit in: net-libs/usockets/files/, net-libs/usockets/ Andrew Ammerlaan
  -- strict thread matches above, loose matches on Subject: below --
2020-09-11 16:51 Andrew Ammerlaan
2021-05-09 18:13 Andrew Ammerlaan
2021-09-10 10:45 Arthur Zamarin
2021-09-10 10:45 Arthur Zamarin

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox