From caf34deefc704aea1f0532a8e1dc6937bdc8f480 Mon Sep 17 00:00:00 2001 From: Howard Pritchard Date: Mon, 13 Nov 2023 08:12:28 -0700 Subject: [PATCH 1/2] accelerator/cuda: fix bug in makefile.am that prevents correct linkage of libcuda.so if it is in a non standard location. Related to https://github.com/spack/spack/pull/40913 Signed-off-by: Howard Pritchard (cherry picked from commit be28fa6421094fcd0c544a6d457c6d748670959a) --- opal/mca/accelerator/cuda/Makefile.am | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/opal/mca/accelerator/cuda/Makefile.am b/opal/mca/accelerator/cuda/Makefile.am index 5646890bab3..2c533ece111 100644 --- a/opal/mca/accelerator/cuda/Makefile.am +++ b/opal/mca/accelerator/cuda/Makefile.am @@ -34,11 +34,11 @@ mcacomponentdir = $(opallibdir) mcacomponent_LTLIBRARIES = $(component_install) mca_accelerator_cuda_la_SOURCES = $(sources) -mca_accelerator_cuda_la_LDFLAGS = -module -avoid-version +mca_accelerator_cuda_la_LDFLAGS = -module -avoid-version $(accelerator_cuda_LDFLAGS) mca_accelerator_cuda_la_LIBADD = $(top_builddir)/opal/lib@OPAL_LIB_NAME@.la \ $(accelerator_cuda_LIBS) noinst_LTLIBRARIES = $(component_noinst) libmca_accelerator_cuda_la_SOURCES =$(sources) -libmca_accelerator_cuda_la_LDFLAGS = -module -avoid-version +libmca_accelerator_cuda_la_LDFLAGS = -module -avoid-version $(accelerator_cuda_LDFLAGS) libmca_accelerator_cuda_la_LIBADD = $(accelerator_cuda_LIBS) From 4714e8e0e09a80f7c06b533020ca2a21c4a886c0 Mon Sep 17 00:00:00 2001 From: Howard Pritchard Date: Thu, 16 Nov 2023 07:05:01 -0700 Subject: [PATCH 2/2] btlsmcuda: fix problem with makefile when libcuda.so is in a non-standard location. also fix rcache/gpusm and rcache/rgpsum Similar fix to that in #12065 Signed-off-by: Howard Pritchard (cherry picked from commit 27672784304d4c944e2e3c7d526dfd77f021a113) --- opal/mca/btl/smcuda/Makefile.am | 4 ++-- opal/mca/rcache/gpusm/Makefile.am | 4 ++-- opal/mca/rcache/rgpusm/Makefile.am | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/opal/mca/btl/smcuda/Makefile.am b/opal/mca/btl/smcuda/Makefile.am index f1a89df8dce..8ee37addf98 100644 --- a/opal/mca/btl/smcuda/Makefile.am +++ b/opal/mca/btl/smcuda/Makefile.am @@ -51,7 +51,7 @@ endif mcacomponentdir = $(opallibdir) mcacomponent_LTLIBRARIES = $(component_install) mca_btl_smcuda_la_SOURCES = $(libmca_btl_smcuda_la_sources) -mca_btl_smcuda_la_LDFLAGS = -module -avoid-version +mca_btl_smcuda_la_LDFLAGS = -module -avoid-version $(btl_smcuda_LDFLAGS) mca_btl_smcuda_la_LIBADD = $(top_builddir)/opal/lib@OPAL_LIB_NAME@.la \ $(OPAL_TOP_BUILDDIR)/opal/mca/common/sm/lib@OPAL_LIB_NAME@mca_common_sm.la \ $(btl_smcuda_LIBS) @@ -59,6 +59,6 @@ mca_btl_smcuda_la_CPPFLAGS = $(btl_smcuda_CPPFLAGS) noinst_LTLIBRARIES = $(component_noinst) libmca_btl_smcuda_la_SOURCES = $(libmca_btl_smcuda_la_sources) -libmca_btl_smcuda_la_LDFLAGS = -module -avoid-version +libmca_btl_smcuda_la_LDFLAGS = -module -avoid-version $(btl_smcuda_LDFLAGS) libmca_btl_smcuda_la_CPPFLAGS = $(btl_smcuda_CPPFLAGS) libmca_btl_smcuda_la_LIBADD = $(btl_smcuda_LIBS) diff --git a/opal/mca/rcache/gpusm/Makefile.am b/opal/mca/rcache/gpusm/Makefile.am index 5645e5ea6b5..1ff63b35d58 100644 --- a/opal/mca/rcache/gpusm/Makefile.am +++ b/opal/mca/rcache/gpusm/Makefile.am @@ -48,11 +48,11 @@ endif mcacomponentdir = $(opallibdir) mcacomponent_LTLIBRARIES = $(component_install) mca_rcache_gpusm_la_SOURCES = $(sources) -mca_rcache_gpusm_la_LDFLAGS = -module -avoid-version +mca_rcache_gpusm_la_LDFLAGS = -module -avoid-version $(rcache_gpusm_LDFLAGS) mca_rcache_gpusm_la_LIBADD = $(top_builddir)/opal/lib@OPAL_LIB_NAME@.la \ $(rcache_gpusm_LIBS) noinst_LTLIBRARIES = $(component_noinst) libmca_rcache_gpusm_la_SOURCES = $(sources) -libmca_rcache_gpusm_la_LDFLAGS = -module -avoid-version +libmca_rcache_gpusm_la_LDFLAGS = -module -avoid-version $(rcache_gpusm_LDFLAGS) libmca_rcache_gpusm_la_LIBADD = $(rcache_gpusm_LIBS) diff --git a/opal/mca/rcache/rgpusm/Makefile.am b/opal/mca/rcache/rgpusm/Makefile.am index 6d2fdbc356d..dde814113be 100644 --- a/opal/mca/rcache/rgpusm/Makefile.am +++ b/opal/mca/rcache/rgpusm/Makefile.am @@ -46,11 +46,11 @@ endif mcacomponentdir = $(opallibdir) mcacomponent_LTLIBRARIES = $(component_install) mca_rcache_rgpusm_la_SOURCES = $(sources) -mca_rcache_rgpusm_la_LDFLAGS = -module -avoid-version +mca_rcache_rgpusm_la_LDFLAGS = -module -avoid-version $(rcache_rgpusm_LDFLAGS) mca_rcache_rgpusm_la_LIBADD = $(top_builddir)/opal/lib@OPAL_LIB_NAME@.la \ $(rcache_rgpusm_LIBS) noinst_LTLIBRARIES = $(component_noinst) libmca_rcache_rgpusm_la_SOURCES = $(sources) -libmca_rcache_rgpusm_la_LDFLAGS = -module -avoid-version +libmca_rcache_rgpusm_la_LDFLAGS = -module -avoid-version $(rcache_rgpusm_LDFLAGS) libmca_rcache_rgpusm_la_LIBADD = $(rcache_rgpusm_LIBS)