Attachment #249638 for bug #278101

View | Details | Raw Unified | Return to bug 278101
Collapse All | Expand All




BROKEN_armv7=	fails to compile: asm_arm.inc:139:36: '.syntax divided' arm assembly not supported

BUILD_DEPENDS=	rubygem-rake>=0:devel/rubygem-rake
LIB_DEPENDS=	libhiredis.so:databases/hiredis \
		libyaml.so:textproc/libyaml

USES=		cmake compiler:c11 cpe pathfix perl5 pkgconfig shebangfix ssl
CPE_VENDOR=	dena
SHEBANG_FILES=	share/h2o/start_server
USE_LDCONFIG=	YES

USE_GITHUB=	yes
GH_TAGNAME=	7545f5f

EXTRACT_AFTER_ARGS=	--exclude deps/hiredis \
			--exclude deps/yaml/include

SHEBANG_FILES=	share/h2o/start_server

USE_RC_SUBR=	${PORTNAME}

SUB_FILES=	${PORTNAME} ${PORTNAME}.conf.sample
SUB_LIST=	H2O_GROUP=${H2O_GROUP} \
		H2O_LOGDIR=${H2O_LOGDIR} \
		H2O_USER=${H2O_USER}


H2O_LOGDIR=	/var/log/${PORTNAME}/
.endif

#CMAKE_OFF=	BUILD_SHARED_LIBS
#CMAKE_ON=	BUILD_SHARED_LIBS WITHOUT_LIBS
CMAKE_ON=	BUILD_SHARED_LIBS

OPTIONS_DEFINE=		DOCS MRUBY
OPTIONS_DEFAULT=	MRUBY
OPTIONS_SUB=		yes
MRUBY_DESC=		Build with embedded mruby handler support
MRUBY_USES=		bison libtool ruby:build
MRUBY_CMAKE_BOOL=	WITH_MRUBY

.include <bsd.port.options.mk>

.if ${ARCH} == amd64 && defined(CPUTYPE) && ${MACHINE_CPU:Mavx2}
EXTRA_PATCHES=	${PATCHDIR}/extra-patch-cputype-defined
CMAKE_ON+=	WITH_FUSION
.else
CMAKE_OFF+=	WITH_FUSION
.endif

.include <bsd.port.options.mk>

post-install:
	${MKDIR} ${STAGEDIR}${ETCDIR} \
		${STAGEDIR}${H2O_LOGDIR}

	${MKDIR} ${STAGEDIR}${DOCSDIR}
	${INSTALL_DATA} ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR}

.include <bsd.port.mk>

Added Link Here

(-)b/www/h2o/files/extra-patch-cputype-defined (+11 lines)
1	--- CMakeLists.txt.orig 2024-03-27 17:04:02 UTC
2	+++ CMakeLists.txt
3	@@ -776,7 +776,7 @@ IF (WITH_FUSION)
4	IF (WITH_FUSION)
5	SET(STANDALONE_COMPILE_FLAGS "${STANDALONE_COMPILE_FLAGS} -DH2O_USE_FUSION=1")
6	LIST(APPEND STANDALONE_SOURCE_FILES deps/picotls/lib/fusion.c)
7	- SET_SOURCE_FILES_PROPERTIES(deps/picotls/lib/fusion.c PROPERTIES COMPILE_FLAGS "-mavx2 -maes -mpclmul -mvaes -mvpclmulqdq")
8	+ SET_SOURCE_FILES_PROPERTIES(deps/picotls/lib/fusion.c PROPERTIES COMPILE_FLAGS "")
9	ENDIF ()
10	IF (WITH_KTLS)
11	SET(STANDALONE_COMPILE_FLAGS "${STANDALONE_COMPILE_FLAGS} -DH2O_USE_KTLS=1")




--- CMakeLists.txt.orig	2024-03-14 06:01:10 UTC
+++ CMakeLists.txt
@@ -174,7 +174,6 @@ INCLUDE_DIRECTORIES(
     deps/cloexec
     deps/brotli/c/include
     deps/golombset
-    deps/hiredis
     deps/libgkc
     deps/libyrmcds
     deps/klib
@@ -186,7 +185,6 @@ INCLUDE_DIRECTORIES(
     deps/picotls/deps/micro-ecc
     deps/picotls/include
     deps/quicly/include
-    deps/yaml/include
     deps/yoml
     ${CMAKE_CURRENT_BINARY_DIR})
 
@@ -257,6 +255,23 @@ ENDIF (PKG_CONFIG_FOUND)
     ENDIF (LIBCAP_FOUND)
 ENDIF (PKG_CONFIG_FOUND)
 
+IF (PKG_CONFIG_FOUND)
+  PKG_CHECK_MODULES(HIREDIS hiredis)
+  IF (HIREDIS_FOUND)
+        INCLUDE_DIRECTORIES(${HIREDIS_INCLUDE_DIRS})
+        LINK_DIRECTORIES(${HIREDIS_LIBRARY_DIRS})
+    ENDIF (HIREDIS_FOUND)
+ENDIF (PKG_CONFIG_FOUND)
+
+IF (PKG_CONFIG_FOUND)
+  PKG_CHECK_MODULES(LIBYAML yaml-0.1)
+  IF (LIBYAML_FOUND)
+        INCLUDE_DIRECTORIES(${LIBYAML_INCLUDE_DIRS})
+        LINK_DIRECTORIES(${LIBYAML_LIBRARY_DIRS})
+    ENDIF (LIBYAML_FOUND)
+ENDIF (PKG_CONFIG_FOUND)
+
+
 SET(CC_WARNING_FLAGS "-Wall -Wno-unused-value -Wno-unused-function -Wno-nullability-completeness -Wno-expansion-to-defined -Werror=implicit-function-declaration -Werror=incompatible-pointer-types")
 
 IF ("${CMAKE_C_COMPILER_ID}" STREQUAL "GNU")
@@ -269,7 +284,7 @@ ENDIF ()
 ENDIF ()
 
 # setup compile flags
-SET(CMAKE_C_FLAGS "-g3 ${CC_WARNING_FLAGS} ${CMAKE_C_FLAGS} -DH2O_ROOT=\"${CMAKE_INSTALL_PREFIX}\" -DH2O_CONFIG_PATH=\"${CMAKE_INSTALL_FULL_SYSCONFDIR}/h2o.conf\"")
+SET(CMAKE_C_FLAGS "${CC_WARNING_FLAGS} ${CMAKE_C_FLAGS} -DH2O_ROOT=\"${CMAKE_INSTALL_PREFIX}\" -DH2O_CONFIG_PATH=\"${CMAKE_INSTALL_FULL_SYSCONFDIR}/h2o.conf\"")
 IF (WITH_DTRACE)
     SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DPICOTLS_USE_DTRACE=1 -DQUICLY_USE_DTRACE=1 -DH2O_USE_DTRACE=1")
 ENDIF ()
@@ -339,11 +354,6 @@ SET(LIB_SOURCE_FILES
 
 SET(LIB_SOURCE_FILES
     deps/cloexec/cloexec.c
-    deps/hiredis/async.c
-    deps/hiredis/hiredis.c
-    deps/hiredis/net.c
-    deps/hiredis/read.c
-    deps/hiredis/sds.c
     deps/libgkc/gkc.c
     deps/libyrmcds/close.c
     deps/libyrmcds/connect.c
@@ -497,7 +507,6 @@ SET(UNIT_TEST_SOURCE_FILES
 
 SET(UNIT_TEST_SOURCE_FILES
     ${LIB_SOURCE_FILES}
-    ${LIBYAML_SOURCE_FILES}
     ${BROTLI_SOURCE_FILES}
     deps/picotest/picotest.c
     t/00unit/test.c
@@ -710,6 +719,10 @@ TARGET_LINK_LIBRARIES(h2o-httpclient libh2o-evloop ${E
     COMPILE_FLAGS "-DH2O_USE_LIBUV=0")
 TARGET_LINK_LIBRARIES(h2o-httpclient libh2o-evloop ${EXTRA_LIBS})
 
+IF (HIREDIS_FOUND)
+   TARGET_LINK_LIBRARIES(h2o-httpclient ${HIREDIS_LIBRARIES})
+ENDIF (HIREDIS_FOUND)
+
 SET_TARGET_PROPERTIES(examples-socket-client-evloop PROPERTIES
     COMPILE_FLAGS "-DH2O_USE_LIBUV=0"
     EXCLUDE_FROM_ALL 1)
@@ -788,6 +801,15 @@ TARGET_LINK_LIBRARIES(h2o ${OPENSSL_LIBRARIES} ${CMAKE
 SET_TARGET_PROPERTIES(h2o PROPERTIES COMPILE_FLAGS "${STANDALONE_COMPILE_FLAGS}")
 TARGET_INCLUDE_DIRECTORIES(h2o PUBLIC ${OPENSSL_INCLUDE_DIR})
 TARGET_LINK_LIBRARIES(h2o ${OPENSSL_LIBRARIES} ${CMAKE_DL_LIBS})
+IF (HIREDIS_FOUND)
+   TARGET_INCLUDE_DIRECTORIES(h2o PUBLIC ${HIREDIS_INCLUDE_DIRS})
+   TARGET_LINK_LIBRARIES(h2o ${HIREDIS_LIBRARIES})
+ENDIF (HIREDIS_FOUND)
+
+IF (LIBYAML_FOUND)
+   TARGET_INCLUDE_DIRECTORIES(h2o PUBLIC ${LIBYXML_INCLUDE_DIRS})
+   TARGET_LINK_LIBRARIES(h2o ${LIBYAML_LIBRARIES})
+ENDIF (LIBYAML_FOUND)
 IF (WITH_MRUBY)
     TARGET_INCLUDE_DIRECTORIES(h2o BEFORE PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/deps/mruby/include ${CMAKE_CURRENT_SOURCE_DIR}/deps/mruby-input-stream/src)
     # note: the paths need to be determined before libmruby.flags.mak is generated

Lines 1-6 Link Here

(-)b/www/h2o/files/patch-src_ssl.c (-2 / +2 lines)
1	--- src/ssl.c.orig 2023-08-08 09:33:37 UTC	1	--- src/ssl.c.orig 2024-03-14 06:01:10 UTC
2	+++ src/ssl.c	2	+++ src/ssl.c
3	@@ -1182,7 +1182,9 @@ void init_openssl(void)	3	@@ -1185,7 +1185,9 @@ void init_openssl(void)
4	SSL_library_init();	4	SSL_library_init();
5	OpenSSL_add_all_algorithms();	5	OpenSSL_add_all_algorithms();
6	#if H2O_CAN_OSSL_ASYNC	6	#if H2O_CAN_OSSL_ASYNC




bin/h2o
@dir(%%H2O_USER%%,%%H2O_GROUP%%,0750) %%H2O_LOGDIR%%
@sample %%ETCDIR%%/h2o.conf.sample
include/h2o.h
include/h2o/absprio.h
include/h2o/balancer.h
include/h2o/cache.h
include/h2o/cache_digests.h
include/h2o/configurator.h
include/h2o/ebpf.h
include/h2o/file.h
include/h2o/filecache.h
include/h2o/header.h
include/h2o/hiredis_.h
include/h2o/hostinfo.h
include/h2o/hpack.h
include/h2o/http1.h
include/h2o/http2.h
include/h2o/http2_casper.h
include/h2o/http2_common.h
include/h2o/http2_internal.h
include/h2o/http2_scheduler.h
include/h2o/http3_common.h
include/h2o/http3_internal.h
include/h2o/http3_server.h
include/h2o/httpclient.h
include/h2o/linklist.h
include/h2o/memcached.h
include/h2o/memory.h
include/h2o/mruby_.h
include/h2o/multithread.h
include/h2o/openssl_backport.h
include/h2o/qpack.h
include/h2o/rand.h
include/h2o/redis.h
include/h2o/send_state.h
include/h2o/serverutil.h
include/h2o/socket.h
include/h2o/socket/evloop.h
include/h2o/socket/uv-binding.h
include/h2o/socketpool.h
include/h2o/string_.h
include/h2o/time_.h
include/h2o/timerwheel.h
include/h2o/token.h
include/h2o/token_table.h
include/h2o/url.h
include/h2o/version.h
include/h2o/websocket.h
include/picotls.h
include/picotls/asn1.h
include/picotls/certificate_compression.h
include/picotls/ffx.h
include/picotls/fusion.h
include/picotls/mbedtls.h
include/picotls/minicrypto.h
include/picotls/openssl.h
include/picotls/pembase64.h
include/picotls/ptlsbcrypt.h
include/quicly.h
include/quicly/cc.h
include/quicly/cid.h
include/quicly/constants.h
include/quicly/defaults.h
include/quicly/frame.h
include/quicly/linklist.h
include/quicly/local_cid.h
include/quicly/loss.h
include/quicly/maxsender.h
include/quicly/pacer.h
include/quicly/ranges.h
include/quicly/rate.h
include/quicly/recvstate.h
include/quicly/remote_cid.h
include/quicly/retire_cid.h
include/quicly/sendstate.h
include/quicly/sentmap.h
include/quicly/streambuf.h
libdata/pkgconfig/libh2o-evloop.pc
libdata/pkgconfig/libh2o.pc
%%PORTDOCS%%%%DOCSDIR%%/assets/8mbps100msec-nginx195-h2o150.png
%%PORTDOCS%%%%DOCSDIR%%/assets/firstpaintbench.png
%%PORTDOCS%%%%DOCSDIR%%/assets/remotebench.png

%%PORTDOCS%%%%DOCSDIR%%/configure/http1_directives.html
%%PORTDOCS%%%%DOCSDIR%%/configure/http2_directives.html
%%PORTDOCS%%%%DOCSDIR%%/configure/http3_directives.html
%%PORTDOCS%%%%DOCSDIR%%/configure/mruby_directives.html
%%PORTDOCS%%%%DOCSDIR%%/configure/mruby.html
%%PORTDOCS%%%%DOCSDIR%%/configure/mruby_directives.html
%%PORTDOCS%%%%DOCSDIR%%/configure/proxy_directives.html
%%PORTDOCS%%%%DOCSDIR%%/configure/quick_start.html
%%PORTDOCS%%%%DOCSDIR%%/configure/redirect_directives.html

%%PORTDOCS%%%%DOCSDIR%%/examples/doc_root.alternate/index.txt
%%PORTDOCS%%%%DOCSDIR%%/examples/doc_root.third/index.txt
%%PORTDOCS%%%%DOCSDIR%%/examples/doc_root/index.html
%%PORTDOCS%%%%DOCSDIR%%/examples/h2o_mruby/h2o.conf
%%PORTDOCS%%%%DOCSDIR%%/examples/h2o_mruby/hello.rb
%%PORTDOCS%%%%DOCSDIR%%/examples/h2o/alternate.crt
%%PORTDOCS%%%%DOCSDIR%%/examples/h2o/alternate.key
%%PORTDOCS%%%%DOCSDIR%%/examples/h2o/ech.key

%%PORTDOCS%%%%DOCSDIR%%/examples/h2o/server.pub
%%PORTDOCS%%%%DOCSDIR%%/examples/h2o/wildcard.crt
%%PORTDOCS%%%%DOCSDIR%%/examples/h2o/wildcard.key
%%PORTDOCS%%%%DOCSDIR%%/examples/h2o_mruby/h2o.conf
%%PORTDOCS%%%%DOCSDIR%%/examples/h2o_mruby/hello.rb
%%PORTDOCS%%%%DOCSDIR%%/examples/libh2o/latency-optimization.c
%%PORTDOCS%%%%DOCSDIR%%/examples/libh2o/redis-client.c
%%PORTDOCS%%%%DOCSDIR%%/examples/libh2o/simple.c

%%PORTDOCS%%%%DOCSDIR%%/search/oktavia-english-search.js
%%PORTDOCS%%%%DOCSDIR%%/search/oktavia-jquery-ui.js
%%PORTDOCS%%%%DOCSDIR%%/search/searchindex.js
%%DATADIR%%/annotate-backtrace-symbols
%%DATADIR%%/ca-bundle.crt
%%DATADIR%%/fastcgi-cgi
%%DATADIR%%/fetch-ocsp-response
%%DATADIR%%/kill-on-close
%%MRUBY%%%%DATADIR%%/mruby/acl.rb
%%MRUBY%%%%DATADIR%%/mruby/bootstrap.rb
%%MRUBY%%%%DATADIR%%/mruby/dos_detector.rb
%%MRUBY%%%%DATADIR%%/mruby/htpasswd.rb
%%MRUBY%%%%DATADIR%%/mruby/lru_cache.rb
%%MRUBY%%%%DATADIR%%/mruby/preloads.rb
%%MRUBY%%%%DATADIR%%/mruby/prometheus.rb
%%MRUBY%%%%DATADIR%%/mruby/trie_addr.rb
%%DATADIR%%/setuidgid
%%DATADIR%%/start_server
%%DATADIR%%/status/index.html
include/h2o/http2_common.h
include/h2o/http2_internal.h
include/h2o/http2_scheduler.h
include/h2o/http2.h
include/h2o/http3_common.h
include/h2o/http3_internal.h
include/h2o/http3_server.h
include/h2o/httpclient.h
include/h2o/linklist.h
include/h2o/memcached.h
include/h2o/memory.h
include/h2o/mruby_.h
include/h2o/multithread.h
include/h2o/openssl_backport.h
include/h2o/qpack.h
include/h2o/rand.h
include/h2o/redis.h
include/h2o/send_state.h
include/h2o/serverutil.h
include/h2o/socket.h
include/h2o/socket/evloop.h
include/h2o/socket/uv-binding.h
include/h2o/socketpool.h
include/h2o/string_.h
include/h2o/time_.h
include/h2o/timerwheel.h
include/h2o/token_table.h
include/h2o/token.h
include/h2o/url.h
include/h2o/version.h
include/h2o/websocket.h
libdata/pkgconfig/libh2o-evloop.pc
libdata/pkgconfig/libh2o.pc
share/man/man5/h2o.conf.5.gz
share/man/man8/h2o.8.gz
@dir(%%H2O_USER%%,%%H2O_GROUP%%,0750) %%H2O_LOGDIR%%

Return to bug 278101

Lines 14-35 BROKEN_armv6= fails to compile: asm_arm.inc:139:36: '.syntax divided' arm assemb Link Here

(-)b/www/h2o/Makefile (-15 / +22 lines)
14	BROKEN_armv7= fails to compile: asm_arm.inc:139:36: '.syntax divided' arm assembly not supported	14	BROKEN_armv7= fails to compile: asm_arm.inc:139:36: '.syntax divided' arm assembly not supported
15		15
16	BUILD_DEPENDS= rubygem-rake>=0:devel/rubygem-rake	16	BUILD_DEPENDS= rubygem-rake>=0:devel/rubygem-rake
17	LIB_DEPENDS= libuv.so:devel/libuv	17	LIB_DEPENDS= libhiredis.so:databases/hiredis \
		18	libyaml.so:textproc/libyaml
18		19
19	USES= cmake:noninja compiler:c11 cpe perl5 pkgconfig shebangfix ssl	20	USES= cmake compiler:c11 cpe pathfix perl5 pkgconfig shebangfix ssl
20	CPE_VENDOR= dena	21	CPE_VENDOR= dena
		22	SHEBANG_FILES= share/h2o/start_server
		23	USE_LDCONFIG= YES
		24
21	USE_GITHUB= yes	25	USE_GITHUB= yes
22	GH_TAGNAME= 7545f5f	26	GH_TAGNAME= 7545f5f
23		27
24	USE_LDCONFIG= yes	28	EXTRACT_AFTER_ARGS= --exclude deps/hiredis \
25	USE_RC_SUBR= ${PORTNAME}	29	--exclude deps/yaml/include
26
27	SHEBANG_FILES= share/h2o/start_server
28		30
29	CMAKE_ARGS+= -DBUILD_SHARED_LIBS=OFF	31	USE_RC_SUBR= ${PORTNAME}
30		32
31	SUB_FILES= ${PORTNAME} ${PORTNAME}.conf.sample	33	SUB_FILES= ${PORTNAME} ${PORTNAME}.conf.sample
32	SUB_LIST+= H2O_GROUP=${H2O_GROUP} \	34	SUB_LIST= H2O_GROUP=${H2O_GROUP} \
33	H2O_LOGDIR=${H2O_LOGDIR} \	35	H2O_LOGDIR=${H2O_LOGDIR} \
34	H2O_USER=${H2O_USER}	36	H2O_USER=${H2O_USER}
35		37
Lines 45-65 H2O_GROUP?= www Link Here
45	H2O_LOGDIR= /var/log/${PORTNAME}/	47	H2O_LOGDIR= /var/log/${PORTNAME}/
46	.endif	48	.endif
47		49
		50	#CMAKE_OFF= BUILD_SHARED_LIBS
		51	#CMAKE_ON= BUILD_SHARED_LIBS WITHOUT_LIBS
		52	CMAKE_ON= BUILD_SHARED_LIBS
		53
48	OPTIONS_DEFINE= DOCS MRUBY	54	OPTIONS_DEFINE= DOCS MRUBY
49	OPTIONS_DEFAULT= MRUBY	55	OPTIONS_DEFAULT= MRUBY
50	OPTIONS_SUB= yes	56	OPTIONS_SUB= yes
51	MRUBY_DESC= Build with embedded mruby handler support	57	MRUBY_DESC= Build with embedded mruby handler support
52	MRUBY_USES= bison ruby:build	58	MRUBY_USES= bison libtool ruby:build
53	MRUBY_CMAKE_BOOL= WITH_MRUBY	59	MRUBY_CMAKE_BOOL= WITH_MRUBY
54		60
55	.include <bsd.port.pre.mk>	61	.include <bsd.port.options.mk>
56		62
57	.if ${ARCH} == i386	63	.if ${ARCH} == amd64 && defined(CPUTYPE) && ${MACHINE_CPU:Mavx2}
58	CMAKE_ARGS+= -DWITH_FUSION=OFF	64	EXTRA_PATCHES= ${PATCHDIR}/extra-patch-cputype-defined
		65	CMAKE_ON+= WITH_FUSION
		66	.else
		67	CMAKE_OFF+= WITH_FUSION
59	.endif	68	.endif
60		69
61	.include <bsd.port.options.mk>
62
63	post-install:	70	post-install:
64	${MKDIR} ${STAGEDIR}${ETCDIR} \	71	${MKDIR} ${STAGEDIR}${ETCDIR} \
65	${STAGEDIR}${H2O_LOGDIR}	72	${STAGEDIR}${H2O_LOGDIR}
Lines 71-74 post-install-DOCS-on: Link Here
71	${MKDIR} ${STAGEDIR}${DOCSDIR}	78	${MKDIR} ${STAGEDIR}${DOCSDIR}
72	${INSTALL_DATA} ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR}	79	${INSTALL_DATA} ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR}
73		80
74	.include <bsd.port.post.mk>	81	.include <bsd.port.mk>

Added Link Here

(-)b/www/h2o/files/patch-CMakeLists.txt (+98 lines)
1	--- CMakeLists.txt.orig 2024-03-14 06:01:10 UTC
2	+++ CMakeLists.txt
3	@@ -174,7 +174,6 @@ INCLUDE_DIRECTORIES(
4	deps/cloexec
5	deps/brotli/c/include
6	deps/golombset
7	- deps/hiredis
8	deps/libgkc
9	deps/libyrmcds
10	deps/klib
11	@@ -186,7 +185,6 @@ INCLUDE_DIRECTORIES(
12	deps/picotls/deps/micro-ecc
13	deps/picotls/include
14	deps/quicly/include
15	- deps/yaml/include
16	deps/yoml
17	${CMAKE_CURRENT_BINARY_DIR})
18
19	@@ -257,6 +255,23 @@ ENDIF (PKG_CONFIG_FOUND)
20	ENDIF (LIBCAP_FOUND)
21	ENDIF (PKG_CONFIG_FOUND)
22
23	+IF (PKG_CONFIG_FOUND)
24	+ PKG_CHECK_MODULES(HIREDIS hiredis)
25	+ IF (HIREDIS_FOUND)
26	+ INCLUDE_DIRECTORIES(${HIREDIS_INCLUDE_DIRS})
27	+ LINK_DIRECTORIES(${HIREDIS_LIBRARY_DIRS})
28	+ ENDIF (HIREDIS_FOUND)
29	+ENDIF (PKG_CONFIG_FOUND)
30	+
31	+IF (PKG_CONFIG_FOUND)
32	+ PKG_CHECK_MODULES(LIBYAML yaml-0.1)
33	+ IF (LIBYAML_FOUND)
34	+ INCLUDE_DIRECTORIES(${LIBYAML_INCLUDE_DIRS})
35	+ LINK_DIRECTORIES(${LIBYAML_LIBRARY_DIRS})
36	+ ENDIF (LIBYAML_FOUND)
37	+ENDIF (PKG_CONFIG_FOUND)
38	+
39	+
40	SET(CC_WARNING_FLAGS "-Wall -Wno-unused-value -Wno-unused-function -Wno-nullability-completeness -Wno-expansion-to-defined -Werror=implicit-function-declaration -Werror=incompatible-pointer-types")
41
42	IF ("${CMAKE_C_COMPILER_ID}" STREQUAL "GNU")
43	@@ -269,7 +284,7 @@ ENDIF ()
44	ENDIF ()
45
46	# setup compile flags
47	-SET(CMAKE_C_FLAGS "-g3 ${CC_WARNING_FLAGS} ${CMAKE_C_FLAGS} -DH2O_ROOT=\"${CMAKE_INSTALL_PREFIX}\" -DH2O_CONFIG_PATH=\"${CMAKE_INSTALL_FULL_SYSCONFDIR}/h2o.conf\"")
48	+SET(CMAKE_C_FLAGS "${CC_WARNING_FLAGS} ${CMAKE_C_FLAGS} -DH2O_ROOT=\"${CMAKE_INSTALL_PREFIX}\" -DH2O_CONFIG_PATH=\"${CMAKE_INSTALL_FULL_SYSCONFDIR}/h2o.conf\"")
49	IF (WITH_DTRACE)
50	SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DPICOTLS_USE_DTRACE=1 -DQUICLY_USE_DTRACE=1 -DH2O_USE_DTRACE=1")
51	ENDIF ()
52	@@ -339,11 +354,6 @@ SET(LIB_SOURCE_FILES
53
54	SET(LIB_SOURCE_FILES
55	deps/cloexec/cloexec.c
56	- deps/hiredis/async.c
57	- deps/hiredis/hiredis.c
58	- deps/hiredis/net.c
59	- deps/hiredis/read.c
60	- deps/hiredis/sds.c
61	deps/libgkc/gkc.c
62	deps/libyrmcds/close.c
63	deps/libyrmcds/connect.c
64	@@ -497,7 +507,6 @@ SET(UNIT_TEST_SOURCE_FILES
65
66	SET(UNIT_TEST_SOURCE_FILES
67	${LIB_SOURCE_FILES}
68	- ${LIBYAML_SOURCE_FILES}
69	${BROTLI_SOURCE_FILES}
70	deps/picotest/picotest.c
71	t/00unit/test.c
72	@@ -710,6 +719,10 @@ TARGET_LINK_LIBRARIES(h2o-httpclient libh2o-evloop ${E
73	COMPILE_FLAGS "-DH2O_USE_LIBUV=0")
74	TARGET_LINK_LIBRARIES(h2o-httpclient libh2o-evloop ${EXTRA_LIBS})
75
76	+IF (HIREDIS_FOUND)
77	+ TARGET_LINK_LIBRARIES(h2o-httpclient ${HIREDIS_LIBRARIES})
78	+ENDIF (HIREDIS_FOUND)
79	+
80	SET_TARGET_PROPERTIES(examples-socket-client-evloop PROPERTIES
81	COMPILE_FLAGS "-DH2O_USE_LIBUV=0"
82	EXCLUDE_FROM_ALL 1)
83	@@ -788,6 +801,15 @@ TARGET_LINK_LIBRARIES(h2o ${OPENSSL_LIBRARIES} ${CMAKE
84	SET_TARGET_PROPERTIES(h2o PROPERTIES COMPILE_FLAGS "${STANDALONE_COMPILE_FLAGS}")
85	TARGET_INCLUDE_DIRECTORIES(h2o PUBLIC ${OPENSSL_INCLUDE_DIR})
86	TARGET_LINK_LIBRARIES(h2o ${OPENSSL_LIBRARIES} ${CMAKE_DL_LIBS})
87	+IF (HIREDIS_FOUND)
88	+ TARGET_INCLUDE_DIRECTORIES(h2o PUBLIC ${HIREDIS_INCLUDE_DIRS})
89	+ TARGET_LINK_LIBRARIES(h2o ${HIREDIS_LIBRARIES})
90	+ENDIF (HIREDIS_FOUND)
91	+
92	+IF (LIBYAML_FOUND)
93	+ TARGET_INCLUDE_DIRECTORIES(h2o PUBLIC ${LIBYXML_INCLUDE_DIRS})
94	+ TARGET_LINK_LIBRARIES(h2o ${LIBYAML_LIBRARIES})
95	+ENDIF (LIBYAML_FOUND)
96	IF (WITH_MRUBY)
97	TARGET_INCLUDE_DIRECTORIES(h2o BEFORE PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/deps/mruby/include ${CMAKE_CURRENT_SOURCE_DIR}/deps/mruby-input-stream/src)
98	# note: the paths need to be determined before libmruby.flags.mak is generated

Lines 1-22 Link Here

(-)b/www/h2o/pkg-plist (-70 / +98 lines)
1	@comment bin/h2o-httpclient	1	bin/h2o
2	@dir(%%H2O_USER%%,%%H2O_GROUP%%,0750) %%H2O_LOGDIR%%
3	@sample %%ETCDIR%%/h2o.conf.sample	2	@sample %%ETCDIR%%/h2o.conf.sample
4	%%DATADIR%%/annotate-backtrace-symbols	3	include/h2o.h
5	%%DATADIR%%/ca-bundle.crt	4	include/h2o/absprio.h
6	%%DATADIR%%/fastcgi-cgi	5	include/h2o/balancer.h
7	%%DATADIR%%/fetch-ocsp-response	6	include/h2o/cache.h
8	%%DATADIR%%/kill-on-close	7	include/h2o/cache_digests.h
9	%%DATADIR%%/setuidgid	8	include/h2o/configurator.h
10	%%DATADIR%%/start_server	9	include/h2o/ebpf.h
11	%%DATADIR%%/status/index.html	10	include/h2o/file.h
12	%%MRUBY%%%%DATADIR%%/mruby/acl.rb	11	include/h2o/filecache.h
13	%%MRUBY%%%%DATADIR%%/mruby/bootstrap.rb	12	include/h2o/header.h
14	%%MRUBY%%%%DATADIR%%/mruby/dos_detector.rb	13	include/h2o/hiredis_.h
15	%%MRUBY%%%%DATADIR%%/mruby/htpasswd.rb	14	include/h2o/hostinfo.h
16	%%MRUBY%%%%DATADIR%%/mruby/lru_cache.rb	15	include/h2o/hpack.h
17	%%MRUBY%%%%DATADIR%%/mruby/preloads.rb	16	include/h2o/http1.h
18	%%MRUBY%%%%DATADIR%%/mruby/prometheus.rb	17	include/h2o/http2.h
19	%%MRUBY%%%%DATADIR%%/mruby/trie_addr.rb	18	include/h2o/http2_casper.h
		19	include/h2o/http2_common.h
		20	include/h2o/http2_internal.h
		21	include/h2o/http2_scheduler.h
		22	include/h2o/http3_common.h
		23	include/h2o/http3_internal.h
		24	include/h2o/http3_server.h
		25	include/h2o/httpclient.h
		26	include/h2o/linklist.h
		27	include/h2o/memcached.h
		28	include/h2o/memory.h
		29	include/h2o/mruby_.h
		30	include/h2o/multithread.h
		31	include/h2o/openssl_backport.h
		32	include/h2o/qpack.h
		33	include/h2o/rand.h
		34	include/h2o/redis.h
		35	include/h2o/send_state.h
		36	include/h2o/serverutil.h
		37	include/h2o/socket.h
		38	include/h2o/socket/evloop.h
		39	include/h2o/socket/uv-binding.h
		40	include/h2o/socketpool.h
		41	include/h2o/string_.h
		42	include/h2o/time_.h
		43	include/h2o/timerwheel.h
		44	include/h2o/token.h
		45	include/h2o/token_table.h
		46	include/h2o/url.h
		47	include/h2o/version.h
		48	include/h2o/websocket.h
		49	include/picotls.h
		50	include/picotls/asn1.h
		51	include/picotls/certificate_compression.h
		52	include/picotls/ffx.h
		53	include/picotls/fusion.h
		54	include/picotls/mbedtls.h
		55	include/picotls/minicrypto.h
		56	include/picotls/openssl.h
		57	include/picotls/pembase64.h
		58	include/picotls/ptlsbcrypt.h
		59	include/quicly.h
		60	include/quicly/cc.h
		61	include/quicly/cid.h
		62	include/quicly/constants.h
		63	include/quicly/defaults.h
		64	include/quicly/frame.h
		65	include/quicly/linklist.h
		66	include/quicly/local_cid.h
		67	include/quicly/loss.h
		68	include/quicly/maxsender.h
		69	include/quicly/pacer.h
		70	include/quicly/ranges.h
		71	include/quicly/rate.h
		72	include/quicly/recvstate.h
		73	include/quicly/remote_cid.h
		74	include/quicly/retire_cid.h
		75	include/quicly/sendstate.h
		76	include/quicly/sentmap.h
		77	include/quicly/streambuf.h
		78	libdata/pkgconfig/libh2o-evloop.pc
		79	libdata/pkgconfig/libh2o.pc
20	%%PORTDOCS%%%%DOCSDIR%%/assets/8mbps100msec-nginx195-h2o150.png	80	%%PORTDOCS%%%%DOCSDIR%%/assets/8mbps100msec-nginx195-h2o150.png
21	%%PORTDOCS%%%%DOCSDIR%%/assets/firstpaintbench.png	81	%%PORTDOCS%%%%DOCSDIR%%/assets/firstpaintbench.png
22	%%PORTDOCS%%%%DOCSDIR%%/assets/remotebench.png	82	%%PORTDOCS%%%%DOCSDIR%%/assets/remotebench.png
Lines 42-49 Link Here
42	%%PORTDOCS%%%%DOCSDIR%%/configure/http1_directives.html	102	%%PORTDOCS%%%%DOCSDIR%%/configure/http1_directives.html
43	%%PORTDOCS%%%%DOCSDIR%%/configure/http2_directives.html	103	%%PORTDOCS%%%%DOCSDIR%%/configure/http2_directives.html
44	%%PORTDOCS%%%%DOCSDIR%%/configure/http3_directives.html	104	%%PORTDOCS%%%%DOCSDIR%%/configure/http3_directives.html
45	%%PORTDOCS%%%%DOCSDIR%%/configure/mruby_directives.html
46	%%PORTDOCS%%%%DOCSDIR%%/configure/mruby.html	105	%%PORTDOCS%%%%DOCSDIR%%/configure/mruby.html
		106	%%PORTDOCS%%%%DOCSDIR%%/configure/mruby_directives.html
47	%%PORTDOCS%%%%DOCSDIR%%/configure/proxy_directives.html	107	%%PORTDOCS%%%%DOCSDIR%%/configure/proxy_directives.html
48	%%PORTDOCS%%%%DOCSDIR%%/configure/quick_start.html	108	%%PORTDOCS%%%%DOCSDIR%%/configure/quick_start.html
49	%%PORTDOCS%%%%DOCSDIR%%/configure/redirect_directives.html	109	%%PORTDOCS%%%%DOCSDIR%%/configure/redirect_directives.html
Lines 55-62 Link Here
55	%%PORTDOCS%%%%DOCSDIR%%/examples/doc_root.alternate/index.txt	115	%%PORTDOCS%%%%DOCSDIR%%/examples/doc_root.alternate/index.txt
56	%%PORTDOCS%%%%DOCSDIR%%/examples/doc_root.third/index.txt	116	%%PORTDOCS%%%%DOCSDIR%%/examples/doc_root.third/index.txt
57	%%PORTDOCS%%%%DOCSDIR%%/examples/doc_root/index.html	117	%%PORTDOCS%%%%DOCSDIR%%/examples/doc_root/index.html
58	%%PORTDOCS%%%%DOCSDIR%%/examples/h2o_mruby/h2o.conf
59	%%PORTDOCS%%%%DOCSDIR%%/examples/h2o_mruby/hello.rb
60	%%PORTDOCS%%%%DOCSDIR%%/examples/h2o/alternate.crt	118	%%PORTDOCS%%%%DOCSDIR%%/examples/h2o/alternate.crt
61	%%PORTDOCS%%%%DOCSDIR%%/examples/h2o/alternate.key	119	%%PORTDOCS%%%%DOCSDIR%%/examples/h2o/alternate.key
62	%%PORTDOCS%%%%DOCSDIR%%/examples/h2o/ech.key	120	%%PORTDOCS%%%%DOCSDIR%%/examples/h2o/ech.key
Lines 66-71 Link Here
66	%%PORTDOCS%%%%DOCSDIR%%/examples/h2o/server.pub	124	%%PORTDOCS%%%%DOCSDIR%%/examples/h2o/server.pub
67	%%PORTDOCS%%%%DOCSDIR%%/examples/h2o/wildcard.crt	125	%%PORTDOCS%%%%DOCSDIR%%/examples/h2o/wildcard.crt
68	%%PORTDOCS%%%%DOCSDIR%%/examples/h2o/wildcard.key	126	%%PORTDOCS%%%%DOCSDIR%%/examples/h2o/wildcard.key
		127	%%PORTDOCS%%%%DOCSDIR%%/examples/h2o_mruby/h2o.conf
		128	%%PORTDOCS%%%%DOCSDIR%%/examples/h2o_mruby/hello.rb
69	%%PORTDOCS%%%%DOCSDIR%%/examples/libh2o/latency-optimization.c	129	%%PORTDOCS%%%%DOCSDIR%%/examples/libh2o/latency-optimization.c
70	%%PORTDOCS%%%%DOCSDIR%%/examples/libh2o/redis-client.c	130	%%PORTDOCS%%%%DOCSDIR%%/examples/libh2o/redis-client.c
71	%%PORTDOCS%%%%DOCSDIR%%/examples/libh2o/simple.c	131	%%PORTDOCS%%%%DOCSDIR%%/examples/libh2o/simple.c
Lines 79-132 Link Here
79	%%PORTDOCS%%%%DOCSDIR%%/search/oktavia-english-search.js	139	%%PORTDOCS%%%%DOCSDIR%%/search/oktavia-english-search.js
80	%%PORTDOCS%%%%DOCSDIR%%/search/oktavia-jquery-ui.js	140	%%PORTDOCS%%%%DOCSDIR%%/search/oktavia-jquery-ui.js
81	%%PORTDOCS%%%%DOCSDIR%%/search/searchindex.js	141	%%PORTDOCS%%%%DOCSDIR%%/search/searchindex.js
82	bin/h2o	142	%%DATADIR%%/annotate-backtrace-symbols
83	include/h2o.h	143	%%DATADIR%%/ca-bundle.crt
84	include/h2o/absprio.h	144	%%DATADIR%%/fastcgi-cgi
85	include/h2o/balancer.h	145	%%DATADIR%%/fetch-ocsp-response
86	include/h2o/cache_digests.h	146	%%DATADIR%%/kill-on-close
87	include/h2o/cache.h	147	%%MRUBY%%%%DATADIR%%/mruby/acl.rb
88	include/h2o/configurator.h	148	%%MRUBY%%%%DATADIR%%/mruby/bootstrap.rb
89	include/h2o/ebpf.h	149	%%MRUBY%%%%DATADIR%%/mruby/dos_detector.rb
90	include/h2o/file.h	150	%%MRUBY%%%%DATADIR%%/mruby/htpasswd.rb
91	include/h2o/filecache.h	151	%%MRUBY%%%%DATADIR%%/mruby/lru_cache.rb
92	include/h2o/header.h	152	%%MRUBY%%%%DATADIR%%/mruby/preloads.rb
93	include/h2o/hiredis_.h	153	%%MRUBY%%%%DATADIR%%/mruby/prometheus.rb
94	include/h2o/hostinfo.h	154	%%MRUBY%%%%DATADIR%%/mruby/trie_addr.rb
95	include/h2o/hpack.h	155	%%DATADIR%%/setuidgid
96	include/h2o/http1.h	156	%%DATADIR%%/start_server
97	include/h2o/http2_casper.h	157	%%DATADIR%%/status/index.html
98	include/h2o/http2_common.h
99	include/h2o/http2_internal.h
100	include/h2o/http2_scheduler.h
101	include/h2o/http2.h
102	include/h2o/http3_common.h
103	include/h2o/http3_internal.h
104	include/h2o/http3_server.h
105	include/h2o/httpclient.h
106	include/h2o/linklist.h
107	include/h2o/memcached.h
108	include/h2o/memory.h
109	include/h2o/mruby_.h
110	include/h2o/multithread.h
111	include/h2o/openssl_backport.h
112	include/h2o/qpack.h
113	include/h2o/rand.h
114	include/h2o/redis.h
115	include/h2o/send_state.h
116	include/h2o/serverutil.h
117	include/h2o/socket.h
118	include/h2o/socket/evloop.h
119	include/h2o/socket/uv-binding.h
120	include/h2o/socketpool.h
121	include/h2o/string_.h
122	include/h2o/time_.h
123	include/h2o/timerwheel.h
124	include/h2o/token_table.h
125	include/h2o/token.h
126	include/h2o/url.h
127	include/h2o/version.h
128	include/h2o/websocket.h
129	libdata/pkgconfig/libh2o-evloop.pc
130	libdata/pkgconfig/libh2o.pc
131	share/man/man5/h2o.conf.5.gz	158	share/man/man5/h2o.conf.5.gz
132	share/man/man8/h2o.8.gz	159	share/man/man8/h2o.8.gz
		160	@dir(%%H2O_USER%%,%%H2O_GROUP%%,0750) %%H2O_LOGDIR%%