ilyakooo0/urbit
1
0
Fork 0
mirror of https://github.com/ilyakooo0/urbit.git synced 2024-12-27 00:44:27 +03:00
Code Issues Packages Projects Releases Wiki Activity

adds libh2o to meson build, removes http-parser

Browse Source 
with submodule fallback to a fork in the urbit organization
This commit is contained in:
Joseph Bryan 2018-03-19 18:07:39 -04:00 committed by Joe Bryan
parent 6c36594f6f
commit fa152f639b
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.gitmodules vendored
View File

@ -4,9 +4,6 @@
[submodule "subprojects/commonmark-legacy"]
path = subprojects/commonmark-legacy
url = https://github.com/urbit/commonmark-legacy.git
[submodule "subprojects/http-parser-legacy"]
path = subprojects/http-parser-legacy
url = https://github.com/urbit/http-parser-legacy.git
[submodule "subprojects/ed25519"]
path = subprojects/ed25519
url = https://github.com/urbit/ed25519.git
@ -19,3 +16,6 @@
[submodule "subprojects/libuv"]
path = subprojects/libuv
url = https://github.com/urbit/libuv.git
[submodule "subprojects/h2o"]
path = subprojects/libh2o
url = https://github.com/urbit/h2o.git

4
meson.build
View File

@ -302,9 +302,9 @@ urbitscrypt_dep = dependency('libscrypt', version: '>=0.1.21', fallback: ['libsc
ed25519_dep = dependency('ed25519', version: '>=0.1.0', fallback: ['ed25519', 'ed25519_dep'])
murmur3_dep = dependency('murmur3', version: '>=0.1.0', fallback: ['murmur3', 'murmur3_dep'])
http_parser_dep = dependency('http-parser', version: '0.1.0', fallback: ['http-parser-legacy', 'http_parser_dep'])
softfloat3_dep = dependency('softfloat3', version: '>=3.0.0', fallback: ['softfloat3', 'softfloat3_dep'])
libuv_dep = dependency('libuv', version: '>=1.8.0', fallback:['libuv', 'libuv_dep'])
libh2o_dep = dependency('libh2o', version: '>=0.13.3', fallback: ['libh2o', 'libh2o_dep'])
opt_flags = []
if get_option('debug')
@ -321,12 +321,12 @@ link_args: os_link_flags,
dependencies: [openssl_dep,
curl_dep,
libuv_dep,
libh2o_dep,
cmark_dep,
gmp_dep,
sigsegv_dep,
urbitscrypt_dep,
ed25519_dep,
murmur3_dep,
http_parser_dep,
softfloat3_dep] + os_deps,
install: true)

1
subprojects/http-parser-legacy

@ -1 +0,0 @@
Subproject commit 90d2cd1a9049a93c291b604fc3c9c4c84cf9bfe2

1
subprojects/libh2o Submodule

@ -0,0 +1 @@
Subproject commit fcf8df4af0c31477e05c55c380c4d7324311368d