Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

www/h2o: update to 2.2.6 and make it build shared libraries #56

Closed
wants to merge 2 commits into from
Closed

www/h2o: update to 2.2.6 and make it build shared libraries #56

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
eb0c9fd
www/h2o: update to 2.2.6
Habbie Mar 21, 2020
9d10cd7
h2o: build .so instead of .a
Habbie Mar 21, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions www/h2o/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
# $NetBSD: Makefile,v 1.20 2020/01/18 21:51:07 jperkin Exp $
# $NetBSD: Makefile,v 1.19 2019/08/11 13:24:20 wiz Exp $

DISTNAME= h2o-2.2.5
PKGREVISION= 3
DISTNAME= h2o-2.2.6
CATEGORIES= www
MASTER_SITES= ${MASTER_SITE_GITHUB:=h2o/}
GITHUB_TAG= v${PKGVERSION_NOREV}
Expand All @@ -20,6 +19,7 @@ PKGCONFIG_OVERRIDE+= libh2o.pc.in
CMAKE_ARGS+= -DWITH_BUNDLED_SSL=off
# TODO: make it an option
CMAKE_ARGS+= -DWITH_MRUBY=off
CMAKE_ARGS+= -DBUILD_SHARED_LIBS=on

SUBST_CLASSES+= interp
SUBST_STAGE.interp= post-extract
Expand Down
8 changes: 6 additions & 2 deletions www/h2o/PLIST
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,12 @@ include/h2o/tunnel.h
include/h2o/url.h
include/h2o/version.h
include/h2o/websocket.h
lib/libh2o-evloop.a
lib/libh2o.a
lib/libh2o-evloop.so
lib/libh2o-evloop.so.0.13
lib/libh2o-evloop.so.0.13.6
lib/libh2o.so
lib/libh2o.so.0.13
lib/libh2o.so.0.13.6
lib/pkgconfig/libh2o-evloop.pc
lib/pkgconfig/libh2o.pc
share/doc/h2o/assets/8mbps100msec-nginx195-h2o150.png
Expand Down
9 changes: 5 additions & 4 deletions www/h2o/distinfo
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
$NetBSD: distinfo,v 1.11 2018/06/24 09:17:03 adam Exp $

SHA1 (h2o-2.2.5.tar.gz) = 188cd4792d28cd7c88a572f6a92949c6aaef5693
RMD160 (h2o-2.2.5.tar.gz) = 4036c8ec4042fd3d9191aa38cff0754072b9067f
SHA512 (h2o-2.2.5.tar.gz) = 24b07140d24fbb7796038aab44f44be5ffabc6f2841954273e2ad9f1a864e5482051dd7abfa6446297a46b6868763114695fa4f123ee3175bdac53b4c1868bc2
Size (h2o-2.2.5.tar.gz) = 16257295 bytes
SHA1 (h2o-2.2.6.tar.gz) = 5cc09af1baf35938a86d7cfafe8a0b876ff2ee81
RMD160 (h2o-2.2.6.tar.gz) = bf99a74257ccb4c9efbd7e11ce7aab2a7af01a95
SHA512 (h2o-2.2.6.tar.gz) = f2f28905c01782a0432c9dfdb2f21054e0a4741ac4c5f26802d4b439d0172840aa215aba5dc7c9af62275dcc24de105674a3819384dc38246e43ce3e8263eb20
Size (h2o-2.2.6.tar.gz) = 16257760 bytes
SHA1 (patch-wslay-link) = c4d3995bf69b52e0a60c284f0425d40ead20154b
29 changes: 29 additions & 0 deletions www/h2o/patches/patch-wslay-link
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
Via https://github.com/h2o/h2o/pull/2196 which was merged upstream
so presumably this patch can be removed when 2.3.0 comes out.

--- CMakeLists.txt 2018-05-31 13:57:10.000000000 +0000
+++ CMakeLists.txt 2020-03-21 11:01:30.722972610 +0000
@@ -386,13 +386,21 @@
OUTPUT_NAME h2o
VERSION ${LIBRARY_VERSION}
SOVERSION ${LIBRARY_SOVERSION})
-TARGET_LINK_LIBRARIES(libh2o ${LIBUV_LIBRARIES} ${EXTRA_LIBS})
+IF (WSLAY_FOUND)
+ TARGET_LINK_LIBRARIES(libh2o ${WSLAY_LIBRARIES} ${LIBUV_LIBRARIES} ${EXTRA_LIBS})
+ELSE ()
+ TARGET_LINK_LIBRARIES(libh2o ${LIBUV_LIBRARIES} ${EXTRA_LIBS})
+ENDIF (WSLAY_FOUND)
SET_TARGET_PROPERTIES(libh2o-evloop PROPERTIES
OUTPUT_NAME h2o-evloop
COMPILE_FLAGS "-DH2O_USE_LIBUV=0"
VERSION ${LIBRARY_VERSION}
SOVERSION ${LIBRARY_SOVERSION})
-TARGET_LINK_LIBRARIES(libh2o-evloop ${EXTRA_LIBS})
+IF (WSLAY_FOUND)
+ TARGET_LINK_LIBRARIES(libh2o-evloop ${WSLAY_LIBRARIES} ${EXTRA_LIBS})
+ELSE ()
+ TARGET_LINK_LIBRARIES(libh2o-evloop ${EXTRA_LIBS})
+ENDIF (WSLAY_FOUND)

IF (OPENSSL_FOUND)
TARGET_INCLUDE_DIRECTORIES(libh2o PUBLIC ${OPENSSL_INCLUDE_DIR})