git: 074a917cec08 - 2023Q4 - www/h2o-devel: update to 20231107 snapshot
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Mon, 04 Dec 2023 21:27:45 UTC
The branch 2023Q4 has been updated by dch:
URL: https://cgit.FreeBSD.org/ports/commit/?id=074a917cec084d0e86cee1cbadcaed696c9fe98f
commit 074a917cec084d0e86cee1cbadcaed696c9fe98f
Author: Dave Cottlehuber <dch@FreeBSD.org>
AuthorDate: 2023-11-11 22:45:41 +0000
Commit: Dave Cottlehuber <dch@FreeBSD.org>
CommitDate: 2023-12-04 21:26:52 +0000
www/h2o-devel: update to 20231107 snapshot
- fix i386 builds
(cherry picked from commit 98838077216800459aa19d9954fd8fd6407cf35d)
Reported by: pkg-fallout
---
www/h2o-devel/Makefile | 17 +++++++++++------
www/h2o-devel/distinfo | 6 +++---
www/h2o-devel/files/patch-deps_quicly_lib_quicly.c | 10 ++++++++++
3 files changed, 24 insertions(+), 9 deletions(-)
diff --git a/www/h2o-devel/Makefile b/www/h2o-devel/Makefile
index 9b5433ffc2b8..49d731d58d6b 100644
--- a/www/h2o-devel/Makefile
+++ b/www/h2o-devel/Makefile
@@ -1,6 +1,6 @@
PORTNAME= h2o
DISTVERSIONPREFIX= v
-DISTVERSION= 2.3.0-dev.20230817
+DISTVERSION= 2.3.0-dev.20231107
CATEGORIES= www
PKGNAMESUFFIX= -devel
@@ -21,14 +21,14 @@ LIB_DEPENDS= libuv.so:devel/libuv
USES= cmake:noninja compiler:c11 cpe perl5 pkgconfig shebangfix ssl
CPE_VENDOR= dena
USE_GITHUB= yes
-GH_TAGNAME= 70dd2d8
+GH_TAGNAME= b15937e
+
USE_LDCONFIG= yes
USE_RC_SUBR= ${PORTNAME}
SHEBANG_FILES= share/h2o/start_server
-CMAKE_ARGS+= -DBUILD_SHARED_LIBS=OFF \
- -DWITH_BUNDLED_SSL=OFF
+CMAKE_ARGS+= -DBUILD_SHARED_LIBS=OFF
CONFLICTS= h2o
@@ -53,10 +53,15 @@ OPTIONS_DEFINE= DOCS MRUBY
OPTIONS_DEFAULT= MRUBY
OPTIONS_SUB= yes
MRUBY_DESC= Build with embedded mruby handler support
-
MRUBY_USES= bison ruby:build
MRUBY_CMAKE_BOOL= WITH_MRUBY
+.include <bsd.port.pre.mk>
+
+.if ${ARCH} == i386
+CMAKE_ARGS+= -DWITH_FUSION=OFF
+.endif
+
.include <bsd.port.options.mk>
post-install:
@@ -70,4 +75,4 @@ post-install-DOCS-on:
${MKDIR} ${STAGEDIR}${DOCSDIR}
${INSTALL_DATA} ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR}
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/www/h2o-devel/distinfo b/www/h2o-devel/distinfo
index 74dbcc4f6cff..2ba3cd8e0770 100644
--- a/www/h2o-devel/distinfo
+++ b/www/h2o-devel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1693558446
-SHA256 (h2o-h2o-v2.3.0-dev.20230817-70dd2d8_GH0.tar.gz) = 075f1da946b4fe32792b3f97e9ac44463febbef6235533d59a5c4bc53bc8c09d
-SIZE (h2o-h2o-v2.3.0-dev.20230817-70dd2d8_GH0.tar.gz) = 30555369
+TIMESTAMP = 1699740447
+SHA256 (h2o-h2o-v2.3.0-dev.20231107-b15937e_GH0.tar.gz) = 3d70ad17d24f9e8ec575c235004f22ef3cf4d2c93f95f351928d05cbc5ed0c76
+SIZE (h2o-h2o-v2.3.0-dev.20231107-b15937e_GH0.tar.gz) = 30565861
diff --git a/www/h2o-devel/files/patch-deps_quicly_lib_quicly.c b/www/h2o-devel/files/patch-deps_quicly_lib_quicly.c
new file mode 100644
index 000000000000..b105a79ab8bb
--- /dev/null
+++ b/www/h2o-devel/files/patch-deps_quicly_lib_quicly.c
@@ -0,0 +1,10 @@
+--- deps/quicly/lib/quicly.c.orig 2023-11-11 22:44:34 UTC
++++ deps/quicly/lib/quicly.c
+@@ -21,6 +21,7 @@
+ */
+ #include <assert.h>
+ #include <inttypes.h>
++#include <sys/types.h>
+ #include <netinet/in.h>
+ #include <netinet/ip.h>
+ #include <pthread.h>