Skip to content

Commit 402b3bf

Browse files
committed
recipe: Patch after open-mpi/ompi#12067
1 parent f482f85 commit 402b3bf

File tree

2 files changed

+38
-0
lines changed

2 files changed

+38
-0
lines changed

recipe/meta.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ source:
1616
fn: openmpi-{{ version }}.tar.bz2
1717
url: https://www.open-mpi.org/software/ompi/v{{ major }}/downloads/openmpi-{{ version }}.tar.bz2
1818
sha256: 9d845ca94bc1aeb445f83d98d238cd08f6ec7ad0f73b0f79ec1668dbfdacd613
19+
patches:
20+
- opal_mca_accelerator_cuda.patch
1921

2022
build:
2123
number: {{ build }}
Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
diff -ur openmpi-5.0.0-old/opal/mca/accelerator/cuda/Makefile.am openmpi-5.0.0-new/opal/mca/accelerator/cuda/Makefile.am
2+
--- openmpi-5.0.0-old/opal/mca/accelerator/cuda/Makefile.am 2023-10-26 16:16:50.000000000 +0300
3+
+++ openmpi-5.0.0-new/opal/mca/accelerator/cuda/Makefile.am 2023-11-16 15:01:27.359845456 +0300
4+
@@ -34,11 +34,11 @@
5+
mcacomponent_LTLIBRARIES = $(component_install)
6+
7+
mca_accelerator_cuda_la_SOURCES = $(sources)
8+
-mca_accelerator_cuda_la_LDFLAGS = -module -avoid-version
9+
+mca_accelerator_cuda_la_LDFLAGS = -module -avoid-version $(accelerator_cuda_LDFLAGS)
10+
mca_accelerator_cuda_la_LIBADD = $(top_builddir)/opal/lib@[email protected] \
11+
$(accelerator_cuda_LIBS)
12+
13+
noinst_LTLIBRARIES = $(component_noinst)
14+
libmca_accelerator_cuda_la_SOURCES =$(sources)
15+
-libmca_accelerator_cuda_la_LDFLAGS = -module -avoid-version
16+
+libmca_accelerator_cuda_la_LDFLAGS = -module -avoid-version $(accelerator_cuda_LDFLAGS)
17+
libmca_accelerator_cuda_la_LIBADD = $(accelerator_cuda_LIBS)
18+
diff -ur openmpi-5.0.0-old/opal/mca/accelerator/cuda/Makefile.in openmpi-5.0.0-new/opal/mca/accelerator/cuda/Makefile.in
19+
--- openmpi-5.0.0-old/opal/mca/accelerator/cuda/Makefile.in 2023-10-26 16:20:19.000000000 +0300
20+
+++ openmpi-5.0.0-new/opal/mca/accelerator/cuda/Makefile.in 2023-11-16 15:08:47.098054276 +0300
21+
@@ -1414,13 +1414,13 @@
22+
mcacomponentdir = $(opallibdir)
23+
mcacomponent_LTLIBRARIES = $(component_install)
24+
mca_accelerator_cuda_la_SOURCES = $(sources)
25+
-mca_accelerator_cuda_la_LDFLAGS = -module -avoid-version
26+
+mca_accelerator_cuda_la_LDFLAGS = -module -avoid-version $(accelerator_cuda_LDFLAGS)
27+
mca_accelerator_cuda_la_LIBADD = $(top_builddir)/opal/lib@[email protected] \
28+
$(accelerator_cuda_LIBS)
29+
30+
noinst_LTLIBRARIES = $(component_noinst)
31+
libmca_accelerator_cuda_la_SOURCES = $(sources)
32+
-libmca_accelerator_cuda_la_LDFLAGS = -module -avoid-version
33+
+libmca_accelerator_cuda_la_LDFLAGS = -module -avoid-version $(accelerator_cuda_LDFLAGS)
34+
libmca_accelerator_cuda_la_LIBADD = $(accelerator_cuda_LIBS)
35+
all: all-am
36+

0 commit comments

Comments
 (0)