1 |
commit: 7a31eceb1d95b0a7e5c80736e56511aa59cc78c2 |
2 |
Author: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Mar 3 22:35:22 2023 +0000 |
4 |
Commit: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Mar 3 22:38:34 2023 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a31eceb |
7 |
|
8 |
net-libs/nghttp2: fix automagic deps and cross-compile failure |
9 |
|
10 |
Closes: https://bugs.gentoo.org/885485 |
11 |
Closes: https://bugs.gentoo.org/895496 |
12 |
Signed-off-by: Bernard Cafarelli <voyageur <AT> gentoo.org> |
13 |
|
14 |
net-libs/nghttp2/Manifest | 1 + |
15 |
...{nghttp2-9999.ebuild => nghttp2-1.51.0-r1.ebuild} | 20 ++++++++++++++------ |
16 |
net-libs/nghttp2/nghttp2-9999.ebuild | 9 ++++++--- |
17 |
3 files changed, 21 insertions(+), 9 deletions(-) |
18 |
|
19 |
diff --git a/net-libs/nghttp2/Manifest b/net-libs/nghttp2/Manifest |
20 |
index 56d9d6df1022..bcdf39180bbc 100644 |
21 |
--- a/net-libs/nghttp2/Manifest |
22 |
+++ b/net-libs/nghttp2/Manifest |
23 |
@@ -1,2 +1,3 @@ |
24 |
DIST nghttp2-1.48.0-pthread.patch 24917 BLAKE2B 22013d89685be603094aa82f69da8741d4c0d76aea8a01de1322c19cef053964fdf0bec937650382f85607ac74466d4d052e6d40217101bc1e40326ad0ddc003 SHA512 bdebc50f13584826d6693aae201db9be63fcadcb8a68af188e94f008e005a2fd6aa6b91b31de2f07f84b93d981a003c8752c5fb4d47502f768bd94e21635627f |
25 |
+DIST nghttp2-1.51.0-pthread.patch 24623 BLAKE2B 55c63b4851788e4e18df1f7881fc370bf901c2df2249243e18e2a49f2142454438b41ecd941ed888ca065cdb037bd52624231a97a06eae4f97ebbc24cd890a46 SHA512 eaa85373f977bd4383d11d6077d69c80cf254ec49f4686a0140765a84806f6691f435fd5d558d4642cbf4a364f274c16b50d3f63c4e9507b6dc3b1317498e15a |
26 |
DIST nghttp2-1.51.0.tar.xz 4115988 BLAKE2B ca3c5fb439b60f67ce5447c957397c16c7659432d3a3b25076b88142318675eb2af9f039a86ce88df8af3bd0167d98f14cdeb8dad2d01eda1378015acefa354e SHA512 0212680e57a15f9afca3b5226429edebd2fe8a52117480007d4472cd0c1bd3aa4d9f21269c637a11efd0f2146a3ee16c3c07ab35d9fb3d4566235d3a14268eeb |
27 |
|
28 |
diff --git a/net-libs/nghttp2/nghttp2-9999.ebuild b/net-libs/nghttp2/nghttp2-1.51.0-r1.ebuild |
29 |
similarity index 68% |
30 |
copy from net-libs/nghttp2/nghttp2-9999.ebuild |
31 |
copy to net-libs/nghttp2/nghttp2-1.51.0-r1.ebuild |
32 |
index 67529daca48f..7ea2f6f9886a 100644 |
33 |
--- a/net-libs/nghttp2/nghttp2-9999.ebuild |
34 |
+++ b/net-libs/nghttp2/nghttp2-1.51.0-r1.ebuild |
35 |
@@ -1,20 +1,21 @@ |
36 |
-# Copyright 1999-2022 Gentoo Authors |
37 |
+# Copyright 1999-2023 Gentoo Authors |
38 |
# Distributed under the terms of the GNU General Public License v2 |
39 |
|
40 |
# TODO: Add python support. |
41 |
|
42 |
EAPI=8 |
43 |
|
44 |
-inherit autotools git-r3 multilib-minimal |
45 |
+inherit autotools multilib-minimal |
46 |
|
47 |
DESCRIPTION="HTTP/2 C Library" |
48 |
HOMEPAGE="https://nghttp2.org/" |
49 |
-EGIT_REPO_URI="https://github.com/nghttp2/nghttp2.git" |
50 |
+SRC_URI="https://github.com/nghttp2/nghttp2/releases/download/v${PV}/${P}.tar.xz |
51 |
+ https://dev.gentoo.org/~voyageur/distfiles/${PN}-1.51.0-pthread.patch" |
52 |
|
53 |
LICENSE="MIT" |
54 |
SLOT="0/1.14" # <C++>.<C> SONAMEs |
55 |
-KEYWORDS="" |
56 |
-IUSE="cxx debug hpack-tools jemalloc static-libs test utils xml" |
57 |
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
58 |
+IUSE="cxx debug hpack-tools jemalloc static-libs systemd test utils xml" |
59 |
|
60 |
RESTRICT="!test? ( test )" |
61 |
|
62 |
@@ -34,11 +35,16 @@ RDEPEND=" |
63 |
>=sys-libs/zlib-1.2.3[${MULTILIB_USEDEP}] |
64 |
net-dns/c-ares:=[${MULTILIB_USEDEP}] |
65 |
) |
66 |
+ systemd? ( sys-apps/systemd ) |
67 |
xml? ( >=dev-libs/libxml2-2.7.7:2[${MULTILIB_USEDEP}] )" |
68 |
DEPEND="${RDEPEND} |
69 |
test? ( >=dev-util/cunit-2.1[${MULTILIB_USEDEP}] )" |
70 |
BDEPEND="virtual/pkgconfig" |
71 |
|
72 |
+PATCHES=( |
73 |
+ "${DISTDIR}"/${PN}-1.51.0-pthread.patch |
74 |
+ ) |
75 |
+ |
76 |
src_prepare() { |
77 |
default |
78 |
eautoreconf |
79 |
@@ -55,10 +61,12 @@ multilib_src_configure() { |
80 |
$(use_enable cxx asio-lib) |
81 |
$(use_enable debug) |
82 |
$(multilib_native_use_enable hpack-tools) |
83 |
+ $(multilib_native_use_with hpack-tools jansson) |
84 |
+ $(multilib_native_use_with jemalloc) |
85 |
$(use_enable static-libs static) |
86 |
+ $(multilib_native_use_with systemd) |
87 |
$(use_with test cunit) |
88 |
$(multilib_native_use_enable utils app) |
89 |
- $(multilib_native_use_with jemalloc) |
90 |
$(multilib_native_use_with xml libxml2) |
91 |
) |
92 |
ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" |
93 |
|
94 |
diff --git a/net-libs/nghttp2/nghttp2-9999.ebuild b/net-libs/nghttp2/nghttp2-9999.ebuild |
95 |
index 67529daca48f..b24cbd6c83f0 100644 |
96 |
--- a/net-libs/nghttp2/nghttp2-9999.ebuild |
97 |
+++ b/net-libs/nghttp2/nghttp2-9999.ebuild |
98 |
@@ -1,4 +1,4 @@ |
99 |
-# Copyright 1999-2022 Gentoo Authors |
100 |
+# Copyright 1999-2023 Gentoo Authors |
101 |
# Distributed under the terms of the GNU General Public License v2 |
102 |
|
103 |
# TODO: Add python support. |
104 |
@@ -14,7 +14,7 @@ EGIT_REPO_URI="https://github.com/nghttp2/nghttp2.git" |
105 |
LICENSE="MIT" |
106 |
SLOT="0/1.14" # <C++>.<C> SONAMEs |
107 |
KEYWORDS="" |
108 |
-IUSE="cxx debug hpack-tools jemalloc static-libs test utils xml" |
109 |
+IUSE="cxx debug hpack-tools jemalloc static-libs systemd test utils xml" |
110 |
|
111 |
RESTRICT="!test? ( test )" |
112 |
|
113 |
@@ -34,6 +34,7 @@ RDEPEND=" |
114 |
>=sys-libs/zlib-1.2.3[${MULTILIB_USEDEP}] |
115 |
net-dns/c-ares:=[${MULTILIB_USEDEP}] |
116 |
) |
117 |
+ systemd? ( sys-apps/systemd ) |
118 |
xml? ( >=dev-libs/libxml2-2.7.7:2[${MULTILIB_USEDEP}] )" |
119 |
DEPEND="${RDEPEND} |
120 |
test? ( >=dev-util/cunit-2.1[${MULTILIB_USEDEP}] )" |
121 |
@@ -55,10 +56,12 @@ multilib_src_configure() { |
122 |
$(use_enable cxx asio-lib) |
123 |
$(use_enable debug) |
124 |
$(multilib_native_use_enable hpack-tools) |
125 |
+ $(multilib_native_use_with hpack-tools jansson) |
126 |
+ $(multilib_native_use_with jemalloc) |
127 |
$(use_enable static-libs static) |
128 |
+ $(multilib_native_use_with systemd) |
129 |
$(use_with test cunit) |
130 |
$(multilib_native_use_enable utils app) |
131 |
- $(multilib_native_use_with jemalloc) |
132 |
$(multilib_native_use_with xml libxml2) |
133 |
) |
134 |
ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" |