commit: eaac95bc0181fe13f08dea97c808a8548836bb17
Author: Akinori Hattori <hattya <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 17 13:45:25 2018 +0000
Commit: Akinori Hattori <hattya <AT> gentoo <DOT> org>
CommitDate: Tue Jul 17 13:45:25 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eaac95bc
www-servers/h2o: add dev-libs/onigmo dependency
Package-Manager: Portage-2.3.40, Repoman-2.3.9
www-servers/h2o/files/h2o-2.2-mruby.patch | 30 ++++++++----------------
www-servers/h2o/files/h2o-2.3-mruby.patch | 39 ++++++++++++++-----------------
www-servers/h2o/h2o-2.2.5.ebuild | 5 +++-
www-servers/h2o/h2o-9999.ebuild | 5 +++-
4 files changed, 36 insertions(+), 43 deletions(-)
diff --git a/www-servers/h2o/files/h2o-2.2-mruby.patch
b/www-servers/h2o/files/h2o-2.2-mruby.patch
index e542ba8b64d..92e7a8e7f1d 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 @@
diff --git a/www-servers/h2o/files/h2o-2.3-mruby.patch
b/www-servers/h2o/files/h2o-2.3-mruby.patch
index a0ad25eba27..3db3ebae880 100644
--- a/www-servers/h2o/files/h2o-2.3-mruby.patch
+++ b/www-servers/h2o/files/h2o-2.3-mruby.patch
@@ -1,23 +1,26 @@
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -174,6 +174,16 @@
+@@ -174,6 +174,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})
-@@ -533,7 +543,7 @@
+@@ -533,7 +546,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
-@@ -560,7 +570,7 @@
+@@ -560,7 +573,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"
@@ -37,23 +40,17 @@
ENDIF (WITH_MRUBY)
--- a/deps/mruby-onig-regexp/mrbgem.rake
+++ b/deps/mruby-onig-regexp/mrbgem.rake
-@@ -101,15 +101,9 @@
- file "#{dir}/src/mruby_onig_regexp.c" =>
[:mruby_onig_regexp_with_compile_option, oniguruma_lib]
- end
+@@ -103,10 +103,8 @@
-- if spec.respond_to? :search_package and spec.search_package 'onigmo'
-- spec.cc.defines += ['HAVE_ONIGMO_H']
+ if spec.respond_to? :search_package and spec.search_package 'onigmo'
+ spec.cc.defines += ['HAVE_ONIGMO_H']
- spec.linker.libraries << 'onig'
-- 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']
- spec.linker.libraries << 'onig'
-- elsif build.cc.respond_to? :search_header_path and
build.cc.search_header_path 'onigmo.h'
-- spec.cc.defines += ['HAVE_ONIGMO_H']
-- spec.linker.libraries << 'onigmo'
- elsif build.cc.respond_to? :search_header_path and
build.cc.search_header_path 'oniguruma.h'
+ elsif spec.respond_to? :search_package and spec.search_package 'oniguruma'
spec.cc.defines += ['HAVE_ONIGURUMA_H']
- spec.linker.libraries << 'onig'
+- spec.linker.libraries << 'onig'
+ elsif build.cc.respond_to? :search_header_path and
build.cc.search_header_path 'onigmo.h'
+ spec.cc.defines += ['HAVE_ONIGMO_H']
+ spec.linker.libraries << 'onigmo'
--- a/misc/mruby_config.rb
+++ b/misc/mruby_config.rb
@@ -15,13 +15,7 @@
diff --git a/www-servers/h2o/h2o-2.2.5.ebuild b/www-servers/h2o/h2o-2.2.5.ebuild
index 91c20bba627..3d4d736c3e8 100644
--- a/www-servers/h2o/h2o-2.2.5.ebuild
+++ b/www-servers/h2o/h2o-2.2.5.ebuild
@@ -24,7 +24,10 @@ RDEPEND="dev-lang/perl
DEPEND="${RDEPEND}
mruby? (
${RUBY_DEPS}
- dev-libs/oniguruma
+ || (
+ dev-libs/onigmo
+ dev-libs/oniguruma
+ )
sys-devel/bison
virtual/pkgconfig
)"
diff --git a/www-servers/h2o/h2o-9999.ebuild b/www-servers/h2o/h2o-9999.ebuild
index e1d9604c4b4..b43017863ba 100644
--- a/www-servers/h2o/h2o-9999.ebuild
+++ b/www-servers/h2o/h2o-9999.ebuild
@@ -24,7 +24,10 @@ RDEPEND="dev-lang/perl
DEPEND="${RDEPEND}
mruby? (
${RUBY_DEPS}
- dev-libs/oniguruma
+ || (
+ dev-libs/onigmo
+ dev-libs/oniguruma
+ )
sys-devel/bison
virtual/pkgconfig
)"
