public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Patrick Lauer" <patrick@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-cluster/ucx/, sys-cluster/ucx/files/
Date: Fri, 16 May 2025 10:23:42 +0000 (UTC)	[thread overview]
Message-ID: <1747391020.d21e89177c6edb66dc39bd3f7bda1d3a9cd2de7c.patrick@gentoo> (raw)

commit:     d21e89177c6edb66dc39bd3f7bda1d3a9cd2de7c
Author:     Patrick Lauer <patrick <AT> gentoo <DOT> org>
AuthorDate: Fri May 16 10:22:21 2025 +0000
Commit:     Patrick Lauer <patrick <AT> gentoo <DOT> org>
CommitDate: Fri May 16 10:23:40 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d21e8917

sys-cluster/ucx: Fix build failure

USE="openmp" was broken, patch from upstream

Signed-off-by: Patrick Lauer <patrick <AT> gentoo.org>

 sys-cluster/ucx/files/ucx-1.13.1-openmp.patch | 38 +++++++++++++++++++++++++++
 sys-cluster/ucx/ucx-1.13.1.ebuild             |  1 +
 2 files changed, 39 insertions(+)

diff --git a/sys-cluster/ucx/files/ucx-1.13.1-openmp.patch b/sys-cluster/ucx/files/ucx-1.13.1-openmp.patch
new file mode 100644
index 000000000000..362f98834f13
--- /dev/null
+++ b/sys-cluster/ucx/files/ucx-1.13.1-openmp.patch
@@ -0,0 +1,38 @@
+From 2e6f69db88da2c38c89c688a932817b6b4912920 Mon Sep 17 00:00:00 2001
+From: Thomas Vegas <tvegas@nvidia.com>
+Date: Tue, 29 Apr 2025 05:22:28 +0000
+Subject: [PATCH] TOOLS/PERF: Include omp.h outside of extern C declarations
+
+---
+ src/tools/perf/lib/libperf_int.h | 11 ++++++-----
+ 1 file changed, 6 insertions(+), 5 deletions(-)
+
+diff --git a/src/tools/perf/lib/libperf_int.h b/src/tools/perf/lib/libperf_int.h
+index 3e6d9f77f53..ae3f489f2df 100644
+--- a/src/tools/perf/lib/libperf_int.h
++++ b/src/tools/perf/lib/libperf_int.h
+@@ -11,6 +11,12 @@
+ 
+ #include <tools/perf/api/libperf.h>
+ 
++
++#if _OPENMP
++#include <omp.h>
++#endif
++
++
+ BEGIN_C_DECLS
+ 
+ /** @file libperf_int.h */
+@@ -20,11 +26,6 @@ BEGIN_C_DECLS
+ #include <ucs/sys/math.h>
+ 
+ 
+-#if _OPENMP
+-#include <omp.h>
+-#endif
+-
+-
+ #define TIMING_QUEUE_SIZE    2048
+ #define UCT_PERF_TEST_AM_ID  5
+ #define ADDR_BUF_SIZE        4096

diff --git a/sys-cluster/ucx/ucx-1.13.1.ebuild b/sys-cluster/ucx/ucx-1.13.1.ebuild
index 0a80a4093313..677b5ad95f6b 100644
--- a/sys-cluster/ucx/ucx-1.13.1.ebuild
+++ b/sys-cluster/ucx/ucx-1.13.1.ebuild
@@ -29,6 +29,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-1.13.0-cstdint-include.patch
 	"${FILESDIR}"/${PN}-1.13.0-binutils-2.39-ptr-typedef.patch
 	"${FILESDIR}"/${PN}-1.13.0-no-rpm-sandbox.patch
+	"${FILESDIR}"/${PN}-1.13.1-openmp.patch
 )
 
 pkg_pretend() {


             reply	other threads:[~2025-05-16 10:23 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-05-16 10:23 Patrick Lauer [this message]
  -- strict thread matches above, loose matches on Subject: below --
2025-08-06 12:00 [gentoo-commits] repo/gentoo:master commit in: sys-cluster/ucx/, sys-cluster/ucx/files/ David Seifert
2022-09-09 10:56 Sam James
2022-09-03  0:08 Sam James

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=1747391020.d21e89177c6edb66dc39bd3f7bda1d3a9cd2de7c.patrick@gentoo \
    --to=patrick@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