From 47af801ff0ee4a4207b36e6917b1e496354940c0 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Sat, 21 Jul 2018 19:11:44 +0100
Subject: gentoo resync : 21.07.2018

---
 www-servers/h2o/files/h2o-2.2-mruby.patch | 30 ++++++++++--------------------
 1 file changed, 10 insertions(+), 20 deletions(-)

(limited to 'www-servers/h2o/files/h2o-2.2-mruby.patch')

diff --git a/www-servers/h2o/files/h2o-2.2-mruby.patch b/www-servers/h2o/files/h2o-2.2-mruby.patch
index e542ba8b64db..92e7a8e7f1d7 100644
--- a/www-servers/h2o/files/h2o-2.2-mruby.patch
+++ b/www-servers/h2o/files/h2o-2.2-mruby.patch
@@ -1,23 +1,26 @@
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -157,6 +157,16 @@
+@@ -157,6 +157,19 @@
      SET(WSLAY_LIBRARIES -lwslay)
  ENDIF (NOT WSLAY_FOUND)
  
 +IF (PKG_CONFIG_FOUND)
-+    PKG_CHECK_MODULES(ONIG oniguruma)
++    PKG_CHECK_MODULES(ONIG onigmo)
++    IF (NOT ONIG_FOUND)
++	PKG_CHECK_MODULES(ONIG oniguruma)
++    ENDIF (NOT ONIG_FOUND)
 +    IF (ONIG_FOUND)
 +        LINK_DIRECTORIES(${ONIG_LIBRARY_DIRS})
 +    ENDIF (ONIG_FOUND)
 +ENDIF (PKG_CONFIG_FOUND)
-+IF (NOT ONIG_FOUND AND WITH_RUBY)
-+    MESSAGE(FATAL_ERROR "Oniguruma not found")
-+ENDIF (NOT ONIG_FOUND AND WITH_RUBY)
++IF (NOT ONIG_FOUND AND WITH_MRUBY)
++    MESSAGE(FATAL_ERROR "Onigmo/Oniguruma not found")
++ENDIF (NOT ONIG_FOUND AND WITH_MRUBY)
 +
  IF (ZLIB_FOUND)
      INCLUDE_DIRECTORIES(${ZLIB_INCLUDE_DIRS})
      LINK_DIRECTORIES(${ZLIB_LIBRARY_DIRS})
-@@ -460,7 +470,7 @@
+@@ -460,7 +473,7 @@
      ELSE ()
          SET(MRUBY_TOOLCHAIN "gcc")
      ENDIF ()
@@ -26,7 +29,7 @@
          WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/deps/mruby)
      LIST(APPEND STANDALONE_SOURCE_FILES
          lib/handler/mruby.c
-@@ -491,7 +501,7 @@
+@@ -491,7 +504,7 @@
      # 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"
@@ -35,19 +38,6 @@
          "m")
      ADD_DEPENDENCIES(h2o mruby)
  ENDIF (WITH_MRUBY)
---- a/deps/mruby-onig-regexp/mrbgem.rake
-+++ b/deps/mruby-onig-regexp/mrbgem.rake
-@@ -101,9 +101,7 @@
-     cc.defines += ['HAVE_ONIGMO_H']
-   end
- 
--  if spec.respond_to? :search_package and spec.search_package 'onigmo'
--    spec.cc.defines += ['HAVE_ONIGMO_H']
--  elsif spec.respond_to? :search_package and spec.search_package 'oniguruma'
-+  if spec.respond_to? :search_package and spec.search_package 'oniguruma'
-     spec.cc.defines += ['HAVE_ONIGURUMA_H']
-   elsif build.cc.respond_to? :search_header_path and build.cc.search_header_path 'oniguruma.h'
-     spec.linker.libraries << 'onig'
 --- a/misc/mruby_config.rb
 +++ b/misc/mruby_config.rb
 @@ -15,13 +15,7 @@
-- 
cgit v1.2.3