diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2023-04-14 05:44:50 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2023-04-14 05:44:50 +0100 |
| commit | 1d18b53ed419c49eb3f71637ccd58a431c1368d4 (patch) | |
| tree | eb3671b1209855aa64534ee96262d06bcda99d74 /www-servers/h2o | |
| parent | fdca6388cf31827202fae75cae067c695bd09339 (diff) | |
gentoo auto-resync : 14:04:2023 - 05:44:49
Diffstat (limited to 'www-servers/h2o')
| -rw-r--r-- | www-servers/h2o/Manifest | 2 | ||||
| -rw-r--r-- | www-servers/h2o/files/h2o-2.3-mruby.patch | 14 |
2 files changed, 8 insertions, 8 deletions
diff --git a/www-servers/h2o/Manifest b/www-servers/h2o/Manifest index 2d05b974301b..be5bc20ecc0f 100644 --- a/www-servers/h2o/Manifest +++ b/www-servers/h2o/Manifest @@ -1,6 +1,6 @@ AUX h2o-2.2-mruby.patch 2034 BLAKE2B 78ab2c8080c017ae03b33366aed553e8d47581bc04b274adc7a7e18bc79ddb5a95266ce13824a8286d9b52d4432b0895598301bd07aa42b1d7e4cbb4d46d98a9 SHA512 724186190756292ce9589a5aae28fd9ae089e377beccb1a2a6562d3d764777dec820413f31d820f61691a529dbdac0dcb55b2e395e46629b2656496bea9c182a AUX h2o-2.2-ruby30.patch 2452 BLAKE2B c94318a2493a6e121da571b81cd641021dea43fec30f3d9acf791e697d7daa194d2c4b8120a9281028cbb01a47b8b3ccddb6364f5e0a2004ad4a7d127276e1e1 SHA512 b44c64d5ede422a18df63dac5c9129bbc21b59179b657af09c2a6cc246247d17fee8ad1ecf4d2aec55df855bdfefcc102d07b21d8002023474df5627c9de961d -AUX h2o-2.3-mruby.patch 3078 BLAKE2B 57e7bd26056f5dade50798609ebbd8818b1277ffdfd5c62c999c41d484967640ce1a35b36b1fb04cf4bcb0d358a8676fe4e98550dda93ff06b5adf651216fbcf SHA512 3f509f6437a2e942934fab0681c889cc4dc0d6c058bf804b33d92b25d4aaa7f08ee4d9d59cba82ad5502000318b10fe55408cda0a0bbf1f3b8795fa159714051 +AUX h2o-2.3-mruby.patch 3312 BLAKE2B 987e09948ea80ca09759081f9abf84f90af0ae0593f5fe067404c5c55b066f7cdb4912431e253a3771094c62bf129059d002f6204876169a34b04a040c82341d SHA512 931ac8c43e25e6ee3c4fb5f76eae33415938eefce2220cc30edaa2f43b71fb3d8664c81cd83c718123ca3b5c5611d3719bf520d7536965ed3e38f50bd34e4cae AUX h2o.conf 350 BLAKE2B 948c90451fd76cb55f3b42eaa9ddc01564b2bd2c46437649fb639d6cee89c5adfac780e533c13793133e6798d847c1c87c631979162af9a1b7c5caebb8963b3b SHA512 b2ba08c3bcd15c3c7631913dc64006870487773f952421aec624f82dcbe836137a2b8357cbd0b8e26626f9c6f108c8aee46beb61e8649fe78fac0e31ef585b6e AUX h2o.initd 845 BLAKE2B f420962962517051c695f00e11a3b6edb899a672d0984db3d68b88545064767e7059cd9b3ec60b7cb70469b403e0927dbaea4e9f7b7a00979b4f036f945585d5 SHA512 9fdfde2857d97937939b1dd591b94f26f77b6fd6061d385c807738be508f1df740acf36c38ca95c22a36f13caed5d537b6fc1f6cceaf1beda8f8f48ef452c177 AUX h2o.logrotate 230 BLAKE2B 44eeaf3b0e60104d4f87c7110815a30f907a6fd676e75a2068fb9cddd8192d3e75729aaeabc89d6430eef7c075b21271918fd65b086de188f7df0c6ceb332141 SHA512 88d36e272c52c5df765d8ebac8f2acca378c8b096af7fa8eda68e1ec5597cba6096286f0ab634f128329148e65980128f0612e90a185de781c5d109653e096dd diff --git a/www-servers/h2o/files/h2o-2.3-mruby.patch b/www-servers/h2o/files/h2o-2.3-mruby.patch index 4f64565a675a..353af46a3af7 100644 --- a/www-servers/h2o/files/h2o-2.3-mruby.patch +++ b/www-servers/h2o/files/h2o-2.3-mruby.patch @@ -1,6 +1,6 @@ --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -237,6 +237,19 @@ +@@ -239,6 +239,19 @@ IF (NOT WSLAY_FOUND) SET(WSLAY_LIBRARIES -lwslay) ENDIF (NOT WSLAY_FOUND) @@ -20,16 +20,16 @@ IF (ZLIB_FOUND) INCLUDE_DIRECTORIES(${ZLIB_INCLUDE_DIRS}) LINK_DIRECTORIES(${ZLIB_LIBRARY_DIRS}) -@@ -743,7 +756,7 @@ +@@ -761,7 +774,7 @@ IF (WITH_MRUBY) ADD_CUSTOM_TARGET(mruby # deps/mruby/tasks/toolchains/clang.rake looks for CC, CXX and LD. # There are no C++ files in deps/mruby, use the C compiler for linking. -- MRUBY_TOOLCHAIN=${MRUBY_TOOLCHAIN} CC=${CMAKE_C_COMPILER} CXX=${CMAKE_CXX_COMPILER} LD=${CMAKE_C_COMPILER} MRUBY_CONFIG=${CMAKE_CURRENT_SOURCE_DIR}/misc/mruby_config.rb MRUBY_BUILD_DIR=${CMAKE_CURRENT_BINARY_DIR}/mruby MRUBY_ADDITIONAL_CONFIG=${MRUBY_ADDITIONAL_CONFIG} ruby minirake -+ MRUBY_TOOLCHAIN=${MRUBY_TOOLCHAIN} CC=${CMAKE_C_COMPILER} CXX=${CMAKE_CXX_COMPILER} LD=${CMAKE_C_COMPILER} MRUBY_CONFIG=${CMAKE_CURRENT_SOURCE_DIR}/misc/mruby_config.rb MRUBY_BUILD_DIR=${CMAKE_CURRENT_BINARY_DIR}/mruby MRUBY_ADDITIONAL_CONFIG=${MRUBY_ADDITIONAL_CONFIG} ruby minirake -v +- MRUBY_TOOLCHAIN=${MRUBY_TOOLCHAIN} CC=${CMAKE_C_COMPILER} CXX=${CMAKE_CXX_COMPILER} LD=${CMAKE_C_COMPILER} MRUBY_CONFIG=${CMAKE_CURRENT_SOURCE_DIR}/misc/mruby_config.rb MRUBY_BUILD_DIR=${CMAKE_CURRENT_BINARY_DIR}/mruby MRUBY_ADDITIONAL_CONFIG=${MRUBY_ADDITIONAL_CONFIG} INSTALL_DIR=${CMAKE_CURRENT_BINARY_DIR}/mruby-bin ruby minirake ++ MRUBY_TOOLCHAIN=${MRUBY_TOOLCHAIN} CC=${CMAKE_C_COMPILER} CXX=${CMAKE_CXX_COMPILER} LD=${CMAKE_C_COMPILER} MRUBY_CONFIG=${CMAKE_CURRENT_SOURCE_DIR}/misc/mruby_config.rb MRUBY_BUILD_DIR=${CMAKE_CURRENT_BINARY_DIR}/mruby MRUBY_ADDITIONAL_CONFIG=${MRUBY_ADDITIONAL_CONFIG} INSTALL_DIR=${CMAKE_CURRENT_BINARY_DIR}/mruby-bin ruby minirake -v WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/deps/mruby BYPRODUCTS "${CMAKE_CURRENT_BINARY_DIR}/mruby/host/lib/libmruby.a" "${CMAKE_CURRENT_BINARY_DIR}/mruby/host/mrbgems/mruby-onig-regexp/onigmo-6.2.0/.libs/libonigmo.a" -@@ -777,7 +790,7 @@ +@@ -795,7 +808,7 @@ IF (WITH_MRUBY) # note: the paths need to be determined before libmruby.flags.mak is generated TARGET_LINK_LIBRARIES(h2o "${CMAKE_CURRENT_BINARY_DIR}/mruby/host/lib/libmruby.a" @@ -40,7 +40,7 @@ ENDIF (WITH_MRUBY) --- a/deps/mruby-onig-regexp/mrbgem.rake +++ b/deps/mruby-onig-regexp/mrbgem.rake -@@ -108,10 +108,8 @@ +@@ -108,10 +108,8 @@ MRuby::Gem::Specification.new('mruby-onig-regexp') do |spec| if spec.respond_to? :search_package and spec.search_package 'onigmo' spec.cc.defines += ['HAVE_ONIGMO_H'] @@ -53,7 +53,7 @@ spec.linker.libraries << 'onigmo' --- a/misc/mruby_config.rb +++ b/misc/mruby_config.rb -@@ -15,13 +15,7 @@ +@@ -17,13 +17,7 @@ MRuby::Build.new do |conf| # use mrbgems Dir.glob("../mruby-*/mrbgem.rake") do |x| g = File.basename File.dirname x |