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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id D7E85158095 for ; Sat, 6 Aug 2022 00:46:04 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id F1A17E0FB4; Sat, 6 Aug 2022 00:46:01 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 5D64BE0FB2 for ; Sat, 6 Aug 2022 00:46:01 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 34855340D3A for ; Sat, 6 Aug 2022 00:46:00 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5E87D543 for ; Sat, 6 Aug 2022 00:45:58 +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: <1659746581.cb0e78c9a028d19e02eb696e3a85090a73887f83.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.3-mruby.patch 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: cb0e78c9a028d19e02eb696e3a85090a73887f83 X-VCS-Branch: master Date: Sat, 6 Aug 2022 00:45:58 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 44089d76-0595-4da2-840e-fa626246ef5d X-Archives-Hash: ced448f19b858a13cf0e60ab27bf4156 commit: cb0e78c9a028d19e02eb696e3a85090a73887f83 Author: Akinori Hattori gentoo org> AuthorDate: Sat Aug 6 00:43:01 2022 +0000 Commit: Akinori Hattori gentoo org> CommitDate: Sat Aug 6 00:43:01 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cb0e78c9 www-servers/h2o: update Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Akinori Hattori gentoo.org> www-servers/h2o/files/h2o-2.3-mruby.patch | 28 ++++++++++++++-------------- www-servers/h2o/h2o-9999.ebuild | 12 ++++++++---- 2 files changed, 22 insertions(+), 18 deletions(-) diff --git a/www-servers/h2o/files/h2o-2.3-mruby.patch b/www-servers/h2o/files/h2o-2.3-mruby.patch index 3db3ebae8806..4f64565a675a 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 -@@ -174,6 +174,19 @@ +@@ -237,6 +237,19 @@ SET(WSLAY_LIBRARIES -lwslay) ENDIF (NOT WSLAY_FOUND) @@ -20,31 +20,31 @@ IF (ZLIB_FOUND) INCLUDE_DIRECTORIES(${ZLIB_INCLUDE_DIRS}) LINK_DIRECTORIES(${ZLIB_LIBRARY_DIRS}) -@@ -533,7 +546,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 +573,7 @@ +@@ -743,7 +756,7 @@ + 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 + 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 @@ # 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" +- "${CMAKE_CURRENT_BINARY_DIR}/mruby/host/mrbgems/mruby-onig-regexp/onigmo-6.2.0/.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 -@@ -103,10 +103,8 @@ +@@ -108,10 +108,8 @@ if spec.respond_to? :search_package and spec.search_package 'onigmo' spec.cc.defines += ['HAVE_ONIGMO_H'] -- spec.linker.libraries << 'onig' +- spec.linker.libraries << 'onigmo' elsif spec.respond_to? :search_package and spec.search_package 'oniguruma' spec.cc.defines += ['HAVE_ONIGURUMA_H'] - spec.linker.libraries << 'onig' diff --git a/www-servers/h2o/h2o-9999.ebuild b/www-servers/h2o/h2o-9999.ebuild index cd6fd817fc38..fc47d03e7abb 100644 --- a/www-servers/h2o/h2o-9999.ebuild +++ b/www-servers/h2o/h2o-9999.ebuild @@ -1,8 +1,7 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="8" -CMAKE_MAKEFILE_GENERATOR="emake" SSL_DEPS_SKIP=1 USE_RUBY="ruby26 ruby27" @@ -20,10 +19,14 @@ IUSE="libh2o +mruby" RDEPEND="acct-group/h2o acct-user/h2o dev-lang/perl + dev-libs/openssl:0= !sci-libs/libh2o + sys-libs/libcap sys-libs/zlib - libh2o? ( dev-libs/libuv ) - dev-libs/openssl:0=" + libh2o? ( + app-arch/brotli + dev-libs/libuv + )" DEPEND="${RDEPEND} mruby? ( ${RUBY_DEPS} @@ -66,6 +69,7 @@ src_prepare() { src_configure() { local mycmakeargs=( -DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}"/etc/${PN} + -DWITH_CCACHE=OFF -DWITH_MRUBY=$(usex mruby) -DWITHOUT_LIBS=$(usex !libh2o) -DBUILD_SHARED_LIBS=$(usex libh2o)