[gentoo-commits] repo/gentoo:master commit in: www-servers/h2o/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

From: "Akinori Hattori" <hattya@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: www-servers/h2o/
Date: Thu,  9 Jan 2020 13:16:49 +0000 (UTC)	[thread overview]
Message-ID: <1578575781.50241a31053044e4ab827f1f1193351891427d2c.hattya@gentoo> (raw)

commit:     50241a31053044e4ab827f1f1193351891427d2c
Author:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
AuthorDate: Thu Jan  9 13:16:21 2020 +0000
Commit:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
CommitDate: Thu Jan  9 13:16:21 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=50241a31

www-servers/h2o: add libh2o USE flag

Package-Manager: Portage-2.3.79, Repoman-2.3.16
Signed-off-by: Akinori Hattori <hattya <AT> gentoo.org>

 www-servers/h2o/h2o-2.2.5.ebuild | 9 ++++++---
 www-servers/h2o/h2o-2.2.6.ebuild | 9 ++++++---
 www-servers/h2o/h2o-9999.ebuild  | 9 ++++++---
 www-servers/h2o/metadata.xml     | 1 +
 4 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/www-servers/h2o/h2o-2.2.5.ebuild b/www-servers/h2o/h2o-2.2.5.ebuild
index afa121fe12a..090cb8025bb 100644
--- a/www-servers/h2o/h2o-2.2.5.ebuild
+++ b/www-servers/h2o/h2o-2.2.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -15,13 +15,15 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE="libressl +mruby"
+IUSE="libh2o libressl +mruby"
 
 RDEPEND="dev-lang/perl
 	sys-libs/zlib
+	libh2o? ( dev-libs/libuv )
 	!libressl? ( dev-libs/openssl:0= )
 	libressl? ( dev-libs/libressl:0= )"
 DEPEND="${RDEPEND}
+	libh2o? ( virtual/pkgconfig )
 	mruby? (
 		${RUBY_DEPS}
 		|| (
@@ -71,7 +73,8 @@ src_configure() {
 	local mycmakeargs=(
 		-DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}"/etc/${PN}
 		-DWITH_MRUBY=$(usex mruby)
-		-DWITHOUT_LIBS=ON
+		-DWITHOUT_LIBS=$(usex !libh2o)
+		-DBUILD_SHARED_LIBS=$(usex libh2o)
 	)
 	cmake-utils_src_configure
 }

diff --git a/www-servers/h2o/h2o-2.2.6.ebuild b/www-servers/h2o/h2o-2.2.6.ebuild
index 58660077497..b059185c8fb 100644
--- a/www-servers/h2o/h2o-2.2.6.ebuild
+++ b/www-servers/h2o/h2o-2.2.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -15,13 +15,15 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="libressl +mruby"
+IUSE="libh2o libressl +mruby"
 
 RDEPEND="dev-lang/perl
 	sys-libs/zlib
+	libh2o? ( dev-libs/libuv )
 	!libressl? ( dev-libs/openssl:0= )
 	libressl? ( dev-libs/libressl:0= )"
 DEPEND="${RDEPEND}
+	libh2o? ( virtual/pkgconfig )
 	mruby? (
 		${RUBY_DEPS}
 		|| (
@@ -71,7 +73,8 @@ src_configure() {
 	local mycmakeargs=(
 		-DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}"/etc/${PN}
 		-DWITH_MRUBY=$(usex mruby)
-		-DWITHOUT_LIBS=ON
+		-DWITHOUT_LIBS=$(usex !libh2o)
+		-DBUILD_SHARED_LIBS=$(usex libh2o)
 	)
 	cmake-utils_src_configure
 }

diff --git a/www-servers/h2o/h2o-9999.ebuild b/www-servers/h2o/h2o-9999.ebuild
index 54be51dba8f..473f4d671cb 100644
--- a/www-servers/h2o/h2o-9999.ebuild
+++ b/www-servers/h2o/h2o-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -15,13 +15,15 @@ EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS=""
-IUSE="libressl +mruby"
+IUSE="libh2o libressl +mruby"
 
 RDEPEND="dev-lang/perl
 	sys-libs/zlib
+	libh2o? ( dev-libs/libuv )
 	!libressl? ( dev-libs/openssl:0= )
 	libressl? ( dev-libs/libressl:0= )"
 DEPEND="${RDEPEND}
+	libh2o? ( virtual/pkgconfig )
 	mruby? (
 		${RUBY_DEPS}
 		|| (
@@ -68,7 +70,8 @@ src_configure() {
 	local mycmakeargs=(
 		-DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}"/etc/${PN}
 		-DWITH_MRUBY=$(usex mruby)
-		-DWITHOUT_LIBS=ON
+		-DWITHOUT_LIBS=$(usex !libh2o)
+		-DBUILD_SHARED_LIBS=$(usex libh2o)
 	)
 	cmake-utils_src_configure
 }

diff --git a/www-servers/h2o/metadata.xml b/www-servers/h2o/metadata.xml
index 6a34529b48f..dab1128615a 100644
--- a/www-servers/h2o/metadata.xml
+++ b/www-servers/h2o/metadata.xml
@@ -11,6 +11,7 @@
 		when compared to older generations of HTTP servers.
 	</longdescription>
 	<use>
+		<flag name="libh2o">Build and install libh2o</flag>
 		<flag name="mruby">Enable support for mruby</flag>
 	</use>
 	<upstream>

next             reply	other threads:[~2020-01-09 13:16 UTC|newest]

Thread overview: 36+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-01-09 13:16 Akinori Hattori [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-06-05 19:59 [gentoo-commits] repo/gentoo:master commit in: www-servers/h2o/ Arthur Zamarin
2024-06-05 19:59 Arthur Zamarin
2024-01-08 12:28 Sam James
2023-10-22 13:44 Akinori Hattori
2023-03-18  2:21 Akinori Hattori
2022-12-07 17:57 Hans de Graaff
2022-08-06  0:45 Akinori Hattori
2021-10-30  7:16 Akinori Hattori
2021-10-30  7:16 Akinori Hattori
2021-07-23 20:37 Conrad Kostecki
2021-07-23 20:37 Conrad Kostecki
2021-05-02 20:26 Mikle Kolyada
2020-09-20  8:35 Michał Górny
2020-04-30 13:07 Akinori Hattori
2020-04-30 13:07 Akinori Hattori
2019-10-03 12:19 Akinori Hattori
2019-10-03 12:19 Akinori Hattori
2019-10-03 12:19 Akinori Hattori
2018-07-13 14:14 Akinori Hattori
2018-07-11 13:24 Akinori Hattori
2018-07-04 13:24 Akinori Hattori
2018-07-04 13:24 Akinori Hattori
2018-06-30  2:36 Akinori Hattori
2018-06-27 21:59 Patrice Clement
2018-05-24  5:20 Michał Górny
2018-04-29  7:35 Michał Górny
2017-12-20 19:31 Craig Andrews
2017-12-20 19:31 Craig Andrews
2017-10-27 21:02 Patrice Clement
2017-10-27 21:02 Patrice Clement
2017-10-27 21:02 Patrice Clement
2017-10-16  3:34 David Seifert
2017-08-27 15:36 Michael Palimaka
2017-07-30  9:44 Michał Górny
2017-07-20 21:43 Patrice Clement

find likely ancestor, descendant, or conflicting patches for this message:
( dfblob:afa121fe12 dfblob:090cb8025b dfblob:5866007749
dfblob:b059185c8f dfblob:54be51dba8 dfblob:473f4d671c dfblob:6a34529b48
dfblob:dab1128615 )
 OR (
bs:"[gentoo-commits] repo/gentoo:master commit in: www-servers/h2o/" )
	(help)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1578575781.50241a31053044e4ab827f1f1193351891427d2c.hattya@gentoo \
    --to=hattya@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Be sure your reply has a Subject: header at the top and a blank line before the message body.

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox