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 427C7138334 for ; Wed, 4 Jul 2018 13:57:25 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 04688E0849; Wed, 4 Jul 2018 13:57:23 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 B2E6EE0849 for ; Wed, 4 Jul 2018 13:57:21 +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 9B504335C95 for ; Wed, 4 Jul 2018 13:57:19 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3CFB3300 for ; Wed, 4 Jul 2018 13:57:17 +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: <1530712593.56d9c51fe6a474950f04fe2597fc7d768c4c9d04.hattya@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: www-servers/h2o/files/, www-servers/h2o/ 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.4.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: 56d9c51fe6a474950f04fe2597fc7d768c4c9d04 X-VCS-Branch: master Date: Wed, 4 Jul 2018 13:57:17 +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: 52e07d3e-38e3-4575-9576-72d4f88c0b72 X-Archives-Hash: f89e1c5ad140a3a2633341c342aa0569 commit: 56d9c51fe6a474950f04fe2597fc7d768c4c9d04 Author: Akinori Hattori gentoo org> AuthorDate: Wed Jul 4 13:56:33 2018 +0000 Commit: Akinori Hattori gentoo org> CommitDate: Wed Jul 4 13:56:33 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=56d9c51f www-servers/h2o: use system oniguruma Closes: https://bugs.gentoo.org/655462 Package-Manager: Portage-2.3.40, Repoman-2.3.9 www-servers/h2o/files/h2o-2.2-mruby.patch | 67 ++++++++++++++++++++++++++++ www-servers/h2o/files/h2o-2.3-mruby.patch | 73 +++++++++++++++++++++++++++++++ www-servers/h2o/h2o-2.2.4.ebuild | 15 +++++-- www-servers/h2o/h2o-9999.ebuild | 12 ++++- 4 files changed, 162 insertions(+), 5 deletions(-) diff --git a/www-servers/h2o/files/h2o-2.2-mruby.patch b/www-servers/h2o/files/h2o-2.2-mruby.patch new file mode 100644 index 00000000000..e542ba8b64d --- /dev/null +++ b/www-servers/h2o/files/h2o-2.2-mruby.patch @@ -0,0 +1,67 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -157,6 +157,16 @@ + SET(WSLAY_LIBRARIES -lwslay) + ENDIF (NOT WSLAY_FOUND) + ++IF (PKG_CONFIG_FOUND) ++ PKG_CHECK_MODULES(ONIG oniguruma) ++ 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 (ZLIB_FOUND) + INCLUDE_DIRECTORIES(${ZLIB_INCLUDE_DIRS}) + LINK_DIRECTORIES(${ZLIB_LIBRARY_DIRS}) +@@ -460,7 +470,7 @@ + ELSE () + SET(MRUBY_TOOLCHAIN "gcc") + ENDIF () +- ADD_CUSTOM_TARGET(mruby MRUBY_TOOLCHAIN=${MRUBY_TOOLCHAIN} MRUBY_CONFIG=${CMAKE_CURRENT_SOURCE_DIR}/misc/mruby_config.rb MRUBY_BUILD_DIR=${CMAKE_CURRENT_BINARY_DIR}/mruby ruby minirake ++ ADD_CUSTOM_TARGET(mruby MRUBY_TOOLCHAIN=${MRUBY_TOOLCHAIN} MRUBY_CONFIG=${CMAKE_CURRENT_SOURCE_DIR}/misc/mruby_config.rb MRUBY_BUILD_DIR=${CMAKE_CURRENT_BINARY_DIR}/mruby ruby minirake -v + WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/deps/mruby) + LIST(APPEND STANDALONE_SOURCE_FILES + lib/handler/mruby.c +@@ -491,7 +501,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" +- "${CMAKE_CURRENT_BINARY_DIR}/mruby/host/mrbgems/mruby-onig-regexp/onigmo-6.1.1/.libs/libonigmo.a" ++ ${ONIG_LIBRARIES} + "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 @@ + # use mrbgems + Dir.glob("../mruby-*/mrbgem.rake") do |x| + g = File.basename File.dirname x +- if g == 'mruby-onig-regexp' +- conf.gem "../deps/#{g}" do |c| +- c.bundle_onigmo +- end +- else +- conf.gem "../deps/#{g}" +- end ++ conf.gem "../deps/#{g}" + end + + # include all the core GEMs diff --git a/www-servers/h2o/files/h2o-2.3-mruby.patch b/www-servers/h2o/files/h2o-2.3-mruby.patch new file mode 100644 index 00000000000..a0ad25eba27 --- /dev/null +++ b/www-servers/h2o/files/h2o-2.3-mruby.patch @@ -0,0 +1,73 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -174,6 +174,16 @@ + SET(WSLAY_LIBRARIES -lwslay) + ENDIF (NOT WSLAY_FOUND) + ++IF (PKG_CONFIG_FOUND) ++ PKG_CHECK_MODULES(ONIG oniguruma) ++ 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 (ZLIB_FOUND) + INCLUDE_DIRECTORIES(${ZLIB_INCLUDE_DIRS}) + LINK_DIRECTORIES(${ZLIB_LIBRARY_DIRS}) +@@ -533,7 +543,7 @@ + ELSE () + SET(MRUBY_TOOLCHAIN "gcc") + ENDIF () +- ADD_CUSTOM_TARGET(mruby MRUBY_TOOLCHAIN=${MRUBY_TOOLCHAIN} 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 ++ ADD_CUSTOM_TARGET(mruby MRUBY_TOOLCHAIN=${MRUBY_TOOLCHAIN} 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 + WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/deps/mruby) + LIST(APPEND STANDALONE_SOURCE_FILES + lib/handler/mruby.c +@@ -560,7 +570,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" +- "${CMAKE_CURRENT_BINARY_DIR}/mruby/host/mrbgems/mruby-onig-regexp/onigmo-6.1.2/.libs/libonigmo.a" ++ ${ONIG_LIBRARIES} + "m") + ADD_DEPENDENCIES(h2o mruby) + 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 + +- 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' + spec.cc.defines += ['HAVE_ONIGURUMA_H'] + spec.linker.libraries << 'onig' +--- a/misc/mruby_config.rb ++++ b/misc/mruby_config.rb +@@ -15,13 +15,7 @@ + # use mrbgems + Dir.glob("../mruby-*/mrbgem.rake") do |x| + g = File.basename File.dirname x +- if g == 'mruby-onig-regexp' +- conf.gem "../deps/#{g}" do |c| +- c.bundle_onigmo +- end +- else +- conf.gem "../deps/#{g}" +- end ++ conf.gem "../deps/#{g}" + end + + # include all the core GEMs diff --git a/www-servers/h2o/h2o-2.2.4.ebuild b/www-servers/h2o/h2o-2.2.4.ebuild index 449ca5e6711..25c1690eeeb 100644 --- a/www-servers/h2o/h2o-2.2.4.ebuild +++ b/www-servers/h2o/h2o-2.2.4.ebuild @@ -5,7 +5,7 @@ EAPI="6" CMAKE_MAKEFILE_GENERATOR="emake" USE_RUBY="ruby23 ruby24" -inherit cmake-utils ruby-single systemd user +inherit cmake-utils ruby-single systemd toolchain-funcs user DESCRIPTION="H2O - the optimized HTTP/1, HTTP/2 server" HOMEPAGE="https://h2o.examp1e.net/" @@ -22,11 +22,16 @@ RDEPEND="dev-lang/perl libressl? ( dev-libs/libressl:0= )" DEPEND="${RDEPEND} mruby? ( - sys-devel/bison ${RUBY_DEPS} + dev-libs/oniguruma + sys-devel/bison + virtual/pkgconfig )" -PATCHES=( "${FILESDIR}"/${P}-libressl.patch ) +PATCHES=( + "${FILESDIR}"/${PN}-2.2-mruby.patch + "${FILESDIR}"/${P}-libressl.patch +) pkg_setup() { enewgroup ${PN} @@ -50,6 +55,10 @@ src_prepare() { sed -i \ -e "s: ruby: ${ruby}:" \ CMakeLists.txt + + sed -i "s:pkg-config:$(tc-getPKG_CONFIG):g" deps/mruby/lib/mruby/gem.rb + tc-export CC + export LD="$(tc-getCC)" } src_configure() { diff --git a/www-servers/h2o/h2o-9999.ebuild b/www-servers/h2o/h2o-9999.ebuild index 0d21e4e8bee..89f63062ca9 100644 --- a/www-servers/h2o/h2o-9999.ebuild +++ b/www-servers/h2o/h2o-9999.ebuild @@ -5,7 +5,7 @@ EAPI="6" CMAKE_MAKEFILE_GENERATOR="emake" USE_RUBY="ruby23 ruby24" -inherit cmake-utils git-r3 ruby-single systemd user +inherit cmake-utils git-r3 ruby-single systemd toolchain-funcs user DESCRIPTION="H2O - the optimized HTTP/1, HTTP/2 server" HOMEPAGE="https://h2o.examp1e.net/" @@ -22,10 +22,14 @@ RDEPEND="dev-lang/perl libressl? ( dev-libs/libressl:0= )" DEPEND="${RDEPEND} mruby? ( - sys-devel/bison ${RUBY_DEPS} + dev-libs/oniguruma + sys-devel/bison + virtual/pkgconfig )" +PATCHES=( "${FILESDIR}"/${PN}-2.3-mruby.patch ) + pkg_setup() { enewgroup ${PN} enewuser ${PN} -1 -1 -1 ${PN} @@ -48,6 +52,10 @@ src_prepare() { sed -i \ -e "s: ruby: ${ruby}:" \ CMakeLists.txt + + sed -i "s:pkg-config:$(tc-getPKG_CONFIG):g" deps/mruby/lib/mruby/gem.rb + tc-export CC + export LD="$(tc-getCC)" } src_configure() {