1 |
commit: e1d3c9af5679ed8e493e188620dafde21c012a0f |
2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Jun 15 01:52:58 2021 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Jun 15 01:54:25 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e1d3c9af |
7 |
|
8 |
sys-cluster/ucx: drop -Werror |
9 |
|
10 |
Closes: https://bugs.gentoo.org/789762 |
11 |
Closes: https://bugs.gentoo.org/790341 |
12 |
Closes: https://bugs.gentoo.org/790332 |
13 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
14 |
|
15 |
.../ucx/files/ucx-1.10.0_rc5-drop-werror.patch | 55 ++++++++++++++++++++++ |
16 |
sys-cluster/ucx/ucx-1.10.0_rc5.ebuild | 10 ++-- |
17 |
2 files changed, 61 insertions(+), 4 deletions(-) |
18 |
|
19 |
diff --git a/sys-cluster/ucx/files/ucx-1.10.0_rc5-drop-werror.patch b/sys-cluster/ucx/files/ucx-1.10.0_rc5-drop-werror.patch |
20 |
new file mode 100644 |
21 |
index 00000000000..7a6894fe619 |
22 |
--- /dev/null |
23 |
+++ b/sys-cluster/ucx/files/ucx-1.10.0_rc5-drop-werror.patch |
24 |
@@ -0,0 +1,55 @@ |
25 |
+https://bugs.gentoo.org/789762 |
26 |
+ |
27 |
+From 18df3302b256bce6f61d83a58b2afbc8d788ad5c Mon Sep 17 00:00:00 2001 |
28 |
+From: Sam James <sam@g.o> |
29 |
+Date: Tue, 15 Jun 2021 01:40:48 +0000 |
30 |
+Subject: [PATCH] Drop -Werror |
31 |
+ |
32 |
+--- |
33 |
+ bindings/java/src/main/native/Makefile.am | 2 +- |
34 |
+ examples/Makefile.am | 2 +- |
35 |
+ test/apps/sockaddr/Makefile.am | 2 +- |
36 |
+ 3 files changed, 3 insertions(+), 3 deletions(-) |
37 |
+ |
38 |
+diff --git a/bindings/java/src/main/native/Makefile.am b/bindings/java/src/main/native/Makefile.am |
39 |
+index 73f9940..6616dae 100644 |
40 |
+--- a/bindings/java/src/main/native/Makefile.am |
41 |
++++ b/bindings/java/src/main/native/Makefile.am |
42 |
+@@ -64,7 +64,7 @@ libjucx_la_SOURCES = context.cc \ |
43 |
+ ucs_constants.cc \ |
44 |
+ worker.cc |
45 |
+ |
46 |
+-libjucx_la_CXXFLAGS = -fPIC -DPIC -Werror -std=gnu++98 |
47 |
++libjucx_la_CXXFLAGS = -fPIC -DPIC -std=gnu++98 |
48 |
+ |
49 |
+ libjucx_la_LIBADD = $(topdir)/src/ucs/libucs.la \ |
50 |
+ $(topdir)/src/uct/libuct.la \ |
51 |
+diff --git a/examples/Makefile.am b/examples/Makefile.am |
52 |
+index 05cde27..76c3b18 100644 |
53 |
+--- a/examples/Makefile.am |
54 |
++++ b/examples/Makefile.am |
55 |
+@@ -23,7 +23,7 @@ EXAMPLE_CUDA_CFLAGS = $(CFLAGS_PEDANTIC) |
56 |
+ EXAMPLE_CUDA_CPPFLAGS = |
57 |
+ endif |
58 |
+ |
59 |
+-EXAMPLE_CCLD_FLAGS = -lucs -I$(includedir) -L$(libdir) -Wall -Werror -Wl,-rpath,$(libdir) \ |
60 |
++EXAMPLE_CCLD_FLAGS = -lucs -I$(includedir) -L$(libdir) -Wall -Wl,-rpath,$(libdir) \ |
61 |
+ $(EXAMPLE_CUDA_LDFLAGS) $(EXAMPLE_CUDA_CPPFLAGS) |
62 |
+ |
63 |
+ installcheck-local: |
64 |
+diff --git a/test/apps/sockaddr/Makefile.am b/test/apps/sockaddr/Makefile.am |
65 |
+index 7ce7a01..2e4ad47 100644 |
66 |
+--- a/test/apps/sockaddr/Makefile.am |
67 |
++++ b/test/apps/sockaddr/Makefile.am |
68 |
+@@ -12,7 +12,7 @@ noinst_HEADERS = \ |
69 |
+ sa_util.h |
70 |
+ |
71 |
+ sa_CXXFLAGS = \ |
72 |
+- -std=c++11 -g -Wall -Werror |
73 |
++ -std=c++11 -Wall |
74 |
+ |
75 |
+ sa_CPPFLAGS = $(BASE_CPPFLAGS) |
76 |
+ |
77 |
+-- |
78 |
+2.32.0 |
79 |
+ |
80 |
|
81 |
diff --git a/sys-cluster/ucx/ucx-1.10.0_rc5.ebuild b/sys-cluster/ucx/ucx-1.10.0_rc5.ebuild |
82 |
index 1d3c4a64a11..b1b15f27d9e 100644 |
83 |
--- a/sys-cluster/ucx/ucx-1.10.0_rc5.ebuild |
84 |
+++ b/sys-cluster/ucx/ucx-1.10.0_rc5.ebuild |
85 |
@@ -5,14 +5,14 @@ EAPI=7 |
86 |
|
87 |
inherit autotools |
88 |
|
89 |
+MY_PV=${PV/_/-} |
90 |
DESCRIPTION="Unified Communication X" |
91 |
HOMEPAGE="https://www.openucx.org" |
92 |
- |
93 |
-MY_PV=${PV/_/-} |
94 |
SRC_URI="https://github.com/openucx/ucx/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz" |
95 |
+S="${WORKDIR}/${PN}-${MY_PV}" |
96 |
|
97 |
-SLOT="0" |
98 |
LICENSE="BSD" |
99 |
+SLOT="0" |
100 |
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" |
101 |
IUSE="+numa +openmp" |
102 |
|
103 |
@@ -22,7 +22,9 @@ RDEPEND=" |
104 |
" |
105 |
DEPEND="${RDEPEND}" |
106 |
|
107 |
-S="${WORKDIR}/${PN}-${MY_PV}" |
108 |
+PATCHES=( |
109 |
+ "${FILESDIR}"/${PN}-1.10.0_rc5-drop-werror.patch |
110 |
+) |
111 |
|
112 |
src_prepare() { |
113 |
default |