shells/nsh Request update of port to reflect git commit 20210416
hello, Reuqest import of the attached diff 20210416 Compiled on AMD64 No errors no warnings Changes: 1) pulls in latest code from github (with all fixes discussed in the past 2 months 2) Chris has added in support for llprio on interfaces 3) (all previous fixes by naddy@ , tom smyth and Chris have been included 4) added Tom Smyth as MAINTAINER for nsh port No Patches necessary for the software to build. please remove any patches that might linger Thanks to Chris, Kurtm@ and Stuart for their help and feedback. Thanks again, Tom Smyth On Fri, 16 Apr 2021 at 21:38, Tom Smyth wrote: > > Hi Stuart, Chris, all, > > I'm happy help out on the port and do testing & I really like the software, > answer questions on list (ports and misc ) regarding nsh and try to > implement & test fixes... > > and track improvements in the network stack in base (as my > understanding of nsh code improves ) > > that said any of my (humble) contributions need supervision and > careful review, > > I want to see nsh more widely deployed in openBSD community and I > would like to use it as a tool > to help cisco heads use OpenBSD, > > > Thanks again, > > Tom Smyth > > > > > > > > > > > > > On Fri, 16 Apr 2021 at 20:56, Stuart Henderson wrote: > > > > This fixes build but the other part of the problem is the lack of > > maintainer, if it is reenabled I would *really* like someone who is > > willing to look at fixing it next time it needs syncing up with -current > > to take MAINTAINER please. > > > > Doesn't require catching problems as they happen (though that would be > > nice!) but at least someone that we can mail about breakages when we run > > into them in ports builds. > > > > It doesn't break all that frequently (not usually more than 1 or 2 times > > in a year, and often less than that) but it is inevitable. > > > > > > > > On 2021/04/16 02:20, Tom Smyth wrote: > > > Hello, all, > > > > > > Chris has incorporated and improved the diffs and merged them upstream, > > > > > > below is a diff for pulling the latest commit from git > > > > > > it is compiling cleanly on amd64 6.9 current (20210414 ) without > > > errors or warnings > > > > > > all the patch files in the current port can be removed also as they > > > have been included or improved upon upstream > > > > > > Thanks Chris, Kurt and everyone who helped. > > > > > > > > > > > > -- > > > Kindest regards, > > > Tom Smyth. > > > > > Index: Makefile > > > === > > > RCS file: /cvs/ports/shells/nsh/Makefile,v > > > retrieving revision 1.41 > > > diff -u -p -r1.41 Makefile > > > --- Makefile 22 Mar 2021 17:23:22 - 1.41 > > > +++ Makefile 16 Apr 2021 00:59:39 - > > > @@ -1,16 +1,15 @@ > > > # $OpenBSD: Makefile,v 1.41 2021/03/22 17:23:22 sthen Exp $ > > > > > > -BROKEN = needs adapting to changes in base\n > > > -BROKEN +=(again); this port is closely tied to interfaces in the > > > base OS and really\n > > > -BROKEN +=needs an active maintainer! > > > > > > COMMENT =network switch style shell > > > > > > -DISTNAME = nsh-1.0.20201006 > > > +DISTNAME = nsh-1.0.20210415 > > > +#REVISION = 0 > > > > > > GH_ACCOUNT = yellowman > > > GH_PROJECT = nsh > > > -GH_COMMIT = 4b92f9124641caddcce238293919b1ec45b5a20d > > > +GH_COMMIT = 8573767444bed331376e6d8edc9bd93bc091789d > > > + > > > > > > CATEGORIES = shells net > > > HOMEPAGE = http://www.nmedia.net/nsh/ > > > Index: distinfo > > > === > > > RCS file: /cvs/ports/shells/nsh/distinfo,v > > > retrieving revision 1.13 > > > diff -u -p -r1.13 distinfo > > > --- distinfo 4 Feb 2021 22:13:09 - 1.13 > > > +++ distinfo 16 Apr 2021 00:59:39 - > > > @@ -1,2 +1,2 @@ > > > -SHA256 (nsh-1.0.20201006-4b92f912.tar.gz) = > > > 4iz3xcEdK8E4I9sG51JPASuviji2O9ooO+6AI1rqQIs= > > > -SIZE (nsh-1.0.20201006-4b92f912.tar.gz) = 130053 > > > +SHA256 (nsh-1.0.20210415-85737674.tar.gz) = > > > vcNGznniC4rWLD6ULyBbGKJUvUEsNg1ylenjZBvmX4A= > > > +SIZE (nsh-1.0.20210415-85737674.tar.gz) = 130190 > > > > > > > > --
Re: audio/mumble: missing icons
Am Sat, Apr 17, 2021 at 01:16:00AM +0200 schrieb Thomas L.: > Hi, > > I noticed that recently mumble shows me no icons in the toolbar and > elsewhere. I already tried reverting the most recent changes in > audio/mumble, but it seems like something else is amiss. To rule out > broken configuration I tried creating a new user, but it shows the same > behaviour. Can someone else confirm this or has an idea what changed? > > Kind regards, > > Thomas > Hi, I heard bluhm@ talk about the same issue this week. Iirc he had to *delete* some kde port or so, don't remember. CCed him, I guess he can tell you better than me what the cause is. Patrick
audio/mumble: missing icons
Hi, I noticed that recently mumble shows me no icons in the toolbar and elsewhere. I already tried reverting the most recent changes in audio/mumble, but it seems like something else is amiss. To rule out broken configuration I tried creating a new user, but it shows the same behaviour. Can someone else confirm this or has an idea what changed? Kind regards, Thomas
Re: shells/nsh Request update of port to reflect latest git commit
Hi Stuart, Chris, all, I'm happy help out on the port and do testing & I really like the software, answer questions on list (ports and misc ) regarding nsh and try to implement & test fixes... and track improvements in the network stack in base (as my understanding of nsh code improves ) that said any of my (humble) contributions need supervision and careful review, I want to see nsh more widely deployed in openBSD community and I would like to use it as a tool to help cisco heads use OpenBSD, Thanks again, Tom Smyth On Fri, 16 Apr 2021 at 20:56, Stuart Henderson wrote: > > This fixes build but the other part of the problem is the lack of > maintainer, if it is reenabled I would *really* like someone who is > willing to look at fixing it next time it needs syncing up with -current > to take MAINTAINER please. > > Doesn't require catching problems as they happen (though that would be > nice!) but at least someone that we can mail about breakages when we run > into them in ports builds. > > It doesn't break all that frequently (not usually more than 1 or 2 times > in a year, and often less than that) but it is inevitable. > > > > On 2021/04/16 02:20, Tom Smyth wrote: > > Hello, all, > > > > Chris has incorporated and improved the diffs and merged them upstream, > > > > below is a diff for pulling the latest commit from git > > > > it is compiling cleanly on amd64 6.9 current (20210414 ) without > > errors or warnings > > > > all the patch files in the current port can be removed also as they > > have been included or improved upon upstream > > > > Thanks Chris, Kurt and everyone who helped. > > > > > > > > -- > > Kindest regards, > > Tom Smyth. > > > Index: Makefile > > === > > RCS file: /cvs/ports/shells/nsh/Makefile,v > > retrieving revision 1.41 > > diff -u -p -r1.41 Makefile > > --- Makefile 22 Mar 2021 17:23:22 - 1.41 > > +++ Makefile 16 Apr 2021 00:59:39 - > > @@ -1,16 +1,15 @@ > > # $OpenBSD: Makefile,v 1.41 2021/03/22 17:23:22 sthen Exp $ > > > > -BROKEN = needs adapting to changes in base\n > > -BROKEN +=(again); this port is closely tied to interfaces in the base > > OS and really\n > > -BROKEN +=needs an active maintainer! > > > > COMMENT =network switch style shell > > > > -DISTNAME = nsh-1.0.20201006 > > +DISTNAME = nsh-1.0.20210415 > > +#REVISION = 0 > > > > GH_ACCOUNT = yellowman > > GH_PROJECT = nsh > > -GH_COMMIT = 4b92f9124641caddcce238293919b1ec45b5a20d > > +GH_COMMIT = 8573767444bed331376e6d8edc9bd93bc091789d > > + > > > > CATEGORIES = shells net > > HOMEPAGE = http://www.nmedia.net/nsh/ > > Index: distinfo > > === > > RCS file: /cvs/ports/shells/nsh/distinfo,v > > retrieving revision 1.13 > > diff -u -p -r1.13 distinfo > > --- distinfo 4 Feb 2021 22:13:09 - 1.13 > > +++ distinfo 16 Apr 2021 00:59:39 - > > @@ -1,2 +1,2 @@ > > -SHA256 (nsh-1.0.20201006-4b92f912.tar.gz) = > > 4iz3xcEdK8E4I9sG51JPASuviji2O9ooO+6AI1rqQIs= > > -SIZE (nsh-1.0.20201006-4b92f912.tar.gz) = 130053 > > +SHA256 (nsh-1.0.20210415-85737674.tar.gz) = > > vcNGznniC4rWLD6ULyBbGKJUvUEsNg1ylenjZBvmX4A= > > +SIZE (nsh-1.0.20210415-85737674.tar.gz) = 130190 > > > -- Kindest regards, Tom Smyth.
Re: shells/nsh Request update of port to reflect latest git commit
This fixes build but the other part of the problem is the lack of maintainer, if it is reenabled I would *really* like someone who is willing to look at fixing it next time it needs syncing up with -current to take MAINTAINER please. Doesn't require catching problems as they happen (though that would be nice!) but at least someone that we can mail about breakages when we run into them in ports builds. It doesn't break all that frequently (not usually more than 1 or 2 times in a year, and often less than that) but it is inevitable. On 2021/04/16 02:20, Tom Smyth wrote: > Hello, all, > > Chris has incorporated and improved the diffs and merged them upstream, > > below is a diff for pulling the latest commit from git > > it is compiling cleanly on amd64 6.9 current (20210414 ) without > errors or warnings > > all the patch files in the current port can be removed also as they > have been included or improved upon upstream > > Thanks Chris, Kurt and everyone who helped. > > > > -- > Kindest regards, > Tom Smyth. > Index: Makefile > === > RCS file: /cvs/ports/shells/nsh/Makefile,v > retrieving revision 1.41 > diff -u -p -r1.41 Makefile > --- Makefile 22 Mar 2021 17:23:22 - 1.41 > +++ Makefile 16 Apr 2021 00:59:39 - > @@ -1,16 +1,15 @@ > # $OpenBSD: Makefile,v 1.41 2021/03/22 17:23:22 sthen Exp $ > > -BROKEN = needs adapting to changes in base\n > -BROKEN +=(again); this port is closely tied to interfaces in the base OS > and really\n > -BROKEN +=needs an active maintainer! > > COMMENT =network switch style shell > > -DISTNAME = nsh-1.0.20201006 > +DISTNAME = nsh-1.0.20210415 > +#REVISION = 0 > > GH_ACCOUNT = yellowman > GH_PROJECT = nsh > -GH_COMMIT = 4b92f9124641caddcce238293919b1ec45b5a20d > +GH_COMMIT = 8573767444bed331376e6d8edc9bd93bc091789d > + > > CATEGORIES = shells net > HOMEPAGE = http://www.nmedia.net/nsh/ > Index: distinfo > === > RCS file: /cvs/ports/shells/nsh/distinfo,v > retrieving revision 1.13 > diff -u -p -r1.13 distinfo > --- distinfo 4 Feb 2021 22:13:09 - 1.13 > +++ distinfo 16 Apr 2021 00:59:39 - > @@ -1,2 +1,2 @@ > -SHA256 (nsh-1.0.20201006-4b92f912.tar.gz) = > 4iz3xcEdK8E4I9sG51JPASuviji2O9ooO+6AI1rqQIs= > -SIZE (nsh-1.0.20201006-4b92f912.tar.gz) = 130053 > +SHA256 (nsh-1.0.20210415-85737674.tar.gz) = > vcNGznniC4rWLD6ULyBbGKJUvUEsNg1ylenjZBvmX4A= > +SIZE (nsh-1.0.20210415-85737674.tar.gz) = 130190 >
Re: [update] net/usockets 0.7.1, www/uwebsockets 19.2.0, www/purritobin 0.5.2
attaching updated versions with uwebsockets to 19.2.0
diff --git a/net/usockets/Makefile b/net/usockets/Makefile
index a484c23f93a..29a5240aea9 100644
--- a/net/usockets/Makefile
+++ b/net/usockets/Makefile
@@ -3,20 +3,18 @@
COMMENT= eventing, networking & crypto for async applications
CATEGORIES = net
-VERSION = 0.6.0
-REVISION = 1
+VERSION = 0.7.1
DISTNAME = usockets-${VERSION}
PKGNAME = ${DISTNAME:L}
-SHARED_LIBS = usockets 1.0
+SHARED_LIBS = usockets 1.1
GH_ACCOUNT = uNetworking
GH_PROJECT = uSockets
-#GH_TAGNAME = v0.6.0
-# cstdlib include error
-GH_COMMIT =7683672d87067cd75b854f4e36b9820f4809a4be
-
+#GH_TAGNAME = v0.7.1
+# socket read/write error
+GH_COMMIT =5440dbac79bd76444175b76ee95dfcade12a6aac
MAINTAINER = Aisha Tammy
@@ -30,11 +28,10 @@ COMPILER = base-clang ports-gcc
LIB_DEPENDS = devel/libuv
-USE_GMAKE = Yes
-MAKE_FLAGS = CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" \
- CC="${CC}" CXX="${CXX}" \
- LIBusockets_VERSION="${LIBusockets_VERSION}"
+MAKE_ENV = LIBusockets_VERSION="${LIBusockets_VERSION}"
NO_TEST = Yes
+FAKE_FLAGS = PREFIX=${TRUEPREFIX}
+
.include
diff --git a/net/usockets/distinfo b/net/usockets/distinfo
index 964ba508e9e..ed3dd036b68 100644
--- a/net/usockets/distinfo
+++ b/net/usockets/distinfo
@@ -1,2 +1,2 @@
-SHA256 (usockets-0.6.0-7683672d.tar.gz) =
0OooGCHD8ezNIcaB1zDPK6RQLGGYGZJb24Vemjlat7c=
-SIZE (usockets-0.6.0-7683672d.tar.gz) = 57634
+SHA256 (usockets-0.7.1-5440dbac.tar.gz) =
+pfJ3z/KBnpJ3VNxcIvxpwPuQUsJjxIeODxidvn/G3c=
+SIZE (usockets-0.7.1-5440dbac.tar.gz) = 62372
diff --git a/net/usockets/patches/patch-Makefile
b/net/usockets/patches/patch-Makefile
index e718b65a265..08e00ebc3da 100644
--- a/net/usockets/patches/patch-Makefile
+++ b/net/usockets/patches/patch-Makefile
@@ -6,7 +6,7 @@ remove -flto -O3
Index: Makefile
--- Makefile.orig
+++ Makefile
-@@ -1,60 +1,40 @@
+@@ -1,60 +1,39 @@
-# 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)
@@ -30,7 +30,7 @@ Index: Makefile
- override CFLAGS += -DLIBUS_USE_LIBUV
- override LDFLAGS += -luv
-endif
-+PREFIX ?= "/usr/local"
++PREFIX ?= /usr/local
+LIBDIR ?= "$(PREFIX)/lib"
+INCLUDEDIR ?= "$(PREFIX)/include"
@@ -39,19 +39,19 @@ Index: Makefile
- override CFLAGS += -DLIBUS_USE_GCD
- override LDFLAGS += -framework CoreFoundation
-endif
-+# OpenBSD specific library version
-+LIBTARGET ?= libusockets.so.$(LIBusockets_VERSION)
++PKG_CONFIG ?= pkg-config
-# WITH_ASAN builds with sanitizers
-ifeq ($(WITH_ASAN),1)
- override CFLAGS += -fsanitize=address -g
-- override LDFLAGS += -lasan
+- override LDFLAGS += -fsanitize=address
-endif
-+PKG_CONFIG ?= pkg-config
++LIBTARGET = libusockets.so.$(LIBusockets_VERSION)
-override CFLAGS += -std=c11 -Isrc
-override LDFLAGS += uSockets.a
-+override LDFLAGS += -lstdc++ -lcrypto -lssl `$(PKG_CONFIG) --libs libuv`
++REQUIRES =libcrypto libssl libuv
++COMMON_FLAGS =-Isrc -DLIBUS_USE_OPENSSL -DLIBUS_USE_LIBUV
`$(PKG_CONFIG) --cflags $(REQUIRES)`
-# By default we build the uSockets.a static library
-default:
@@ -62,37 +62,35 @@ Index: Makefile
- $(CXX) $(CXXFLAGS) -std=c++17 -flto -O3 -c src/crypto/*.cpp
-endif
- $(AR) rvs uSockets.a *.o
-+COMMON_FLAGS =-DLIBUS_USE_OPENSSL -DLIBUS_USE_LIBUV -Isrc
`$(PKG_CONFIG) --cflags libuv`
-+override CFLAGS +=$(COMMON_FLAGS)
-+override CXXFLAGS += $(COMMON_FLAGS)
++CFLAGS += -std=c11 $(COMMON_FLAGS)
++CXXFLAGS += -std=c++17 $(COMMON_FLAGS)
++LDFLAGS +=`$(PKG_CONFIG) --libs $(REQUIRES)`
-# Builds all examples
-.PHONY: examples
-examples: default
- for f in examples/*.c; do $(CC) -flto -O3 $(CFLAGS) -o $$(basename "$$f" ".c")
"$$f" $(LDFLAGS); done
+all:
-+ $(CC) -std=c11 -fPIC $(CFLAGS) -c src/*.c src/eventing/*.c
src/crypto/*.c
-+ $(CXX) -std=c++17 -fPIC $(CXXFLAGS) -c src/crypto/*.cpp
++ $(CC) $(CFLAGS) -fPIC -c src/*.c src/eventing/*.c src/crypto/*.c
++ $(CXX) $(CXXFLAGS) -fPIC -c src/crypto/*.cpp
+ $(AR) rvs libusockets.a *.o
+ $(CC) -shared -o $(LIBTARGET) *.o -Wl,-soname,$(LIBTARGET) $(LDFLAGS)
-+ sed -e "s:@PREFIX@:$(PREFIX):" -e "s:@VERSION@:$(LIBusockets_VERSION):"
\
-+ libusockets.pc.in > libusockets.pc
++ sed -e "s:@PREFIX@:$(PREFIX):" -e "s:@VERSION@:$(LIBusockets_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 "$(LIBDIR)/pkgconfig" "$(INCLUDEDIR)"
-+ install -m 644 src/libusockets.h "$(INCLUDEDIR)"
-+ install -m 755 $(LIBTARGET) "$(LIBDIR)"
-+ install -m 755 libusockets.a "$(LIBDIR)"
-+ install -m 644 libusockets.pc "$(LIBDIR)/pkgconfig"
++install:
Re: [update] net/usockets 0.7.1, www/uwebsockets 19.2.0, www/purritobin 0.5.2
Hi all,
I've attached the updated version for uwebsockets, usockets and
purritobin, with the comments from Gonzalo :D
to reattach the changes in the ports
uwebsockets has breaking API changes related to pub/sub model behaviour.
purritobin changes - tiny inbuilt http server (allows setting headers,
etc. like Content-Type, hsts and CORS attributes) main use for setting
default charset to UTF-8, with |-t -x "Content-Type" -v "text/plain;
charset=UTF-8" options|
- adds tests, all non-ssl tests are passing
SSL tests don't work, seems to be a problem with libressl and usockets,
am going to open bugs for that libressl/usockets
- possibly unbreak for non-clang archs, it no longer needs separate
filesystem library, but I don't have machines to check this
Cheers,
Aisha
diff --git a/net/usockets/Makefile b/net/usockets/Makefile
index a484c23f93a..29a5240aea9 100644
--- a/net/usockets/Makefile
+++ b/net/usockets/Makefile
@@ -3,20 +3,18 @@
COMMENT= eventing, networking & crypto for async applications
CATEGORIES = net
-VERSION = 0.6.0
-REVISION = 1
+VERSION = 0.7.1
DISTNAME = usockets-${VERSION}
PKGNAME = ${DISTNAME:L}
-SHARED_LIBS = usockets 1.0
+SHARED_LIBS = usockets 1.1
GH_ACCOUNT = uNetworking
GH_PROJECT = uSockets
-#GH_TAGNAME = v0.6.0
-# cstdlib include error
-GH_COMMIT =7683672d87067cd75b854f4e36b9820f4809a4be
-
+#GH_TAGNAME = v0.7.1
+# socket read/write error
+GH_COMMIT =5440dbac79bd76444175b76ee95dfcade12a6aac
MAINTAINER = Aisha Tammy
@@ -30,11 +28,10 @@ COMPILER = base-clang ports-gcc
LIB_DEPENDS = devel/libuv
-USE_GMAKE = Yes
-MAKE_FLAGS = CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" \
- CC="${CC}" CXX="${CXX}" \
- LIBusockets_VERSION="${LIBusockets_VERSION}"
+MAKE_ENV = LIBusockets_VERSION="${LIBusockets_VERSION}"
NO_TEST = Yes
+FAKE_FLAGS = PREFIX=${TRUEPREFIX}
+
.include
diff --git a/net/usockets/distinfo b/net/usockets/distinfo
index 964ba508e9e..ed3dd036b68 100644
--- a/net/usockets/distinfo
+++ b/net/usockets/distinfo
@@ -1,2 +1,2 @@
-SHA256 (usockets-0.6.0-7683672d.tar.gz) =
0OooGCHD8ezNIcaB1zDPK6RQLGGYGZJb24Vemjlat7c=
-SIZE (usockets-0.6.0-7683672d.tar.gz) = 57634
+SHA256 (usockets-0.7.1-5440dbac.tar.gz) =
+pfJ3z/KBnpJ3VNxcIvxpwPuQUsJjxIeODxidvn/G3c=
+SIZE (usockets-0.7.1-5440dbac.tar.gz) = 62372
diff --git a/net/usockets/patches/patch-Makefile
b/net/usockets/patches/patch-Makefile
index e718b65a265..08e00ebc3da 100644
--- a/net/usockets/patches/patch-Makefile
+++ b/net/usockets/patches/patch-Makefile
@@ -6,7 +6,7 @@ remove -flto -O3
Index: Makefile
--- Makefile.orig
+++ Makefile
-@@ -1,60 +1,40 @@
+@@ -1,60 +1,39 @@
-# 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)
@@ -30,7 +30,7 @@ Index: Makefile
- override CFLAGS += -DLIBUS_USE_LIBUV
- override LDFLAGS += -luv
-endif
-+PREFIX ?= "/usr/local"
++PREFIX ?= /usr/local
+LIBDIR ?= "$(PREFIX)/lib"
+INCLUDEDIR ?= "$(PREFIX)/include"
@@ -39,19 +39,19 @@ Index: Makefile
- override CFLAGS += -DLIBUS_USE_GCD
- override LDFLAGS += -framework CoreFoundation
-endif
-+# OpenBSD specific library version
-+LIBTARGET ?= libusockets.so.$(LIBusockets_VERSION)
++PKG_CONFIG ?= pkg-config
-# WITH_ASAN builds with sanitizers
-ifeq ($(WITH_ASAN),1)
- override CFLAGS += -fsanitize=address -g
-- override LDFLAGS += -lasan
+- override LDFLAGS += -fsanitize=address
-endif
-+PKG_CONFIG ?= pkg-config
++LIBTARGET = libusockets.so.$(LIBusockets_VERSION)
-override CFLAGS += -std=c11 -Isrc
-override LDFLAGS += uSockets.a
-+override LDFLAGS += -lstdc++ -lcrypto -lssl `$(PKG_CONFIG) --libs libuv`
++REQUIRES =libcrypto libssl libuv
++COMMON_FLAGS =-Isrc -DLIBUS_USE_OPENSSL -DLIBUS_USE_LIBUV
`$(PKG_CONFIG) --cflags $(REQUIRES)`
-# By default we build the uSockets.a static library
-default:
@@ -62,37 +62,35 @@ Index: Makefile
- $(CXX) $(CXXFLAGS) -std=c++17 -flto -O3 -c src/crypto/*.cpp
-endif
- $(AR) rvs uSockets.a *.o
-+COMMON_FLAGS =-DLIBUS_USE_OPENSSL -DLIBUS_USE_LIBUV -Isrc
`$(PKG_CONFIG) --cflags libuv`
-+override CFLAGS +=$(COMMON_FLAGS)
-+override CXXFLAGS += $(COMMON_FLAGS)
++CFLAGS += -std=c11 $(COMMON_FLAGS)
++CXXFLAGS += -std=c++17 $(COMMON_FLAGS)
++LDFLAGS +=`$(PKG_CONFIG) --libs $(REQUIRES)`
-# Builds all examples
-.PHONY: examples
-examples: default
- for f in examples/*.c; do $(CC) -flto -O3 $(CFLAGS) -o $$(basename "$$f" ".c")
"$$f" $(LDFLAGS); done
+all:
-+ $(CC) -std=c11 -fPIC $(CFLAGS) -c src/*.c src/eventing/*.c
src/crypto/*.c
-+ $(CXX) -std=c++17 -fPIC $(CXXFLAGS) -c src/crypto/*.cpp
++ $(CC) $(CFLAGS) -fPIC -c src/*.c src/eventing/*.c src/crypto/*.c
++ $(CXX) $(CXXFLAGS) -fPIC -c src/crypto/*.cpp
+ $(AR) rvs libusockets.a *.o
+
Re: WIP: QEMU 6.0.0-rc3
On Tue, Apr 06, 2021 at 08:22:19PM -0400, Brad Smith wrote:
> On Thu, Apr 01, 2021 at 12:43:41AM -0400, Brad Smith wrote:
> > On Sat, Mar 27, 2021 at 02:31:16PM -0400, Brad Smith wrote:
> > > Here is a work in progress update to QEMU 6.0.0-rc0.
> > >
> > > I was able to fix the library detection for a few dependencies,
> > > the optimization level being hardcoded and Meson was linking
> > > libstdc++ when utilizing Clang (proabably due to only testing
> > > on Linux).
> > >
> > > I'm really hating this conversion to Meson. It really does some
> > > oddball crap.
> > >
> > > Testing and feedback welcome.
> >
> > Updated for rc1.
>
> Updated for rc2.
Updated for rc3.
Index: Makefile
===
RCS file: /home/cvs/ports/emulators/qemu/Makefile,v
retrieving revision 1.206
diff -u -p -u -p -r1.206 Makefile
--- Makefile28 Feb 2021 18:38:41 - 1.206
+++ Makefile16 Apr 2021 05:29:21 -
@@ -6,11 +6,10 @@ DPB_PROPERTIES= parallel
COMMENT-main= multi system emulator
COMMENT-ga=QEMU guest agent
-VERSION= 5.1.0
-DISTNAME= qemu-5.1.0
-PKGNAME-main= qemu-${VERSION}
+VERSION= 6.0.0-rc3
+DISTNAME= qemu-${VERSION}
+PKGNAME-main= ${DISTNAME}
PKGNAME-ga=qemu-ga-${VERSION}
-REVISION-main= 3
CATEGORIES=emulators
MASTER_SITES= https://download.qemu.org/
EXTRACT_SUFX= .tar.xz
@@ -22,12 +21,11 @@ MAINTAINER= Brad Smith =3.5.1
RUN_DEPENDS-main= ${BUILD_PKGPATH}-ga
-LIB_DEPENDS= devel/gettext,-runtime \
- devel/glib2
+LIB_DEPENDS= devel/glib2
LIB_DEPENDS-main= ${LIB_DEPENDS} \
archivers/bzip2 \
archivers/lzo2 \
@@ -51,6 +49,7 @@ LIB_DEPENDS-main= ${LIB_DEPENDS} \
converters/libiconv \
devel/capstone/main \
devel/dtc \
+ devel/gettext,-runtime \
devel/libiscsi \
devel/libnfs \
devel/libusb1 \
@@ -70,18 +69,16 @@ LIB_DEPENDS-ga= ${LIB_DEPENDS}
MAKE_ENV= V=1
FAKE_FLAGS=qemu_confdir=${PREFIX}/share/examples/qemu
-EXTRA_CFLAGS= -I${LOCALBASE}/include -I${X11BASE}/include
-EXTRA_LDFLAGS= -L${LOCALBASE}/lib -L${X11BASE}/lib
-
-# fix build with ancient ncurses. ncurses needs to be updated to 5.9 or newer.
-EXTRA_CFLAGS+= -D_XOPEN_SOURCE_EXTENDED
+CFLAGS+= -I${LOCALBASE}/include -I${X11BASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib -L${X11BASE}/lib
# until the system headers are fixed properly.
-EXTRA_CFLAGS+= -Wno-redundant-decls
+CFLAGS+= -Wno-redundant-decls
SEPARATE_BUILD=Yes
USE_GMAKE= Yes
CONFIGURE_STYLE=simple
+CONFIGURE_ENV+=LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS=--prefix=${PREFIX} \
--sysconfdir=${SYSCONFDIR} \
--mandir=${PREFIX}/man \
@@ -90,11 +87,8 @@ CONFIGURE_ARGS= --prefix=${PREFIX} \
--cc="${CC}" \
--cxx="${CXX}" \
--host-cc="${CC}" \
- --extra-cflags="${EXTRA_CFLAGS}" \
- --extra-ldflags="${EXTRA_LDFLAGS}" \
--disable-bsd-user \
--enable-capstone=system \
- --enable-curses \
--disable-auth-pam \
--disable-gcrypt \
--disable-sdl-image \
Index: distinfo
===
RCS file: /home/cvs/ports/emulators/qemu/distinfo,v
retrieving revision 1.62
diff -u -p -u -p -r1.62 distinfo
--- distinfo17 Aug 2020 09:58:44 - 1.62
+++ distinfo16 Apr 2021 05:29:40 -
@@ -1,2 +1,2 @@
-SHA256 (qemu-5.1.0.tar.xz) = yRdOtZM9nrXmH1Qc1tEYTNMRjf5MXElVvBvcTTkPpOU=
-SIZE (qemu-5.1.0.tar.xz) = 62911540
+SHA256 (qemu-6.0.0-rc3.tar.xz) = U6V2QONl5zg3QfucHgyoBe+zRsUzQLY1NMQc2NSBl5g=
+SIZE (qemu-6.0.0-rc3.tar.xz) = 107308656
Index: patches/patch-audio_Makefile_objs
===
RCS file: patches/patch-audio_Makefile_objs
diff -N patches/patch-audio_Makefile_objs
--- patches/patch-audio_Makefile_objs 17 Aug 2020 09:58:44 - 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,19 +0,0 @@
-$OpenBSD: patch-audio_Makefile_objs,v 1.3 2020/08/17 09:58:44 sthen Exp $
-
-sndio module
-
-Index: audio/Makefile.objs
audio/Makefile.objs.orig
-+++ audio/Makefile.objs
-@@ -29,6 +29,11 @@ sdl.mo-objs = sdlaudio.o
- sdl.mo-cflags := $(SDL_CFLAGS)
- sdl.mo-libs := $(SDL_LIBS)
-
-+# sndio module
-+common-obj-$(CONFIG_AUDIO_SNDIO) += sndio.mo
-+sndio.mo-objs = sndioaudio.o
-+sndio.mo-libs := $(SNDIO_LIBS)
-+
- # jack module
- common-obj-$(CONFIG_AUDIO_JACK) += jack.mo
- jack.mo-objs = jackaudio.o
Index: patches/patch-audio_audio_c
===
RCS file: /home/cvs/ports/emulators/qemu/patches/patch-audio_audio_c,v
retrieving revision 1.8
diff -u -p -u -p -r1.8 patch-audio_audio_c
--- patches/patch-audio_audio_c 17 A
