From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id D2190138334 for ; Tue, 17 Jul 2018 13:47:30 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A89F0E07BA; Tue, 17 Jul 2018 13:47:29 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 61072E07B2 for ; Tue, 17 Jul 2018 13:47:29 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9920E335C94 for ; Tue, 17 Jul 2018 13:47:27 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id BC727349 for ; Tue, 17 Jul 2018 13:47:25 +0000 (UTC) From: "Akinori Hattori" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Akinori Hattori" Message-ID: <1531835125.eaac95bc0181fe13f08dea97c808a8548836bb17.hattya@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: www-servers/h2o/, www-servers/h2o/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: www-servers/h2o/files/h2o-2.2-mruby.patch www-servers/h2o/files/h2o-2.3-mruby.patch www-servers/h2o/h2o-2.2.5.ebuild www-servers/h2o/h2o-9999.ebuild X-VCS-Directories: www-servers/h2o/files/ www-servers/h2o/ X-VCS-Committer: hattya X-VCS-Committer-Name: Akinori Hattori X-VCS-Revision: eaac95bc0181fe13f08dea97c808a8548836bb17 X-VCS-Branch: master Date: Tue, 17 Jul 2018 13:47:25 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 0a2f13b8-29b2-47ad-ad67-cca19a97728c X-Archives-Hash: 41516384ad58f279da8f0900025ff5cb commit: eaac95bc0181fe13f08dea97c808a8548836bb17 Author: Akinori Hattori gentoo org> AuthorDate: Tue Jul 17 13:45:25 2018 +0000 Commit: Akinori Hattori gentoo 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 )"