commit: b118d47190724cbf7b022b8b7a1c1d5cdbdbc100 Author: orbea <orbea <AT> riseup <DOT> net> AuthorDate: Tue Apr 11 19:19:47 2023 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Fri Apr 14 00:27:59 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b118d471
www-servers/h2o: Rebase live patch Signed-off-by: orbea <orbea <AT> riseup.net> Closes: https://github.com/gentoo/gentoo/pull/30560 Signed-off-by: Sam James <sam <AT> gentoo.org> www-servers/h2o/files/h2o-2.3-mruby.patch | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) 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
