From 6e5e5aad1c4320afee9cc0649d887933c9fbddaa Mon Sep 17 00:00:00 2001 From: Gilles Gouaillardet Date: Tue, 5 Mar 2019 09:47:38 +0900 Subject: [PATCH 1/2] btl/usnic: fix usnic_btl_run_tests CPPFLAGS do define the OMPI_LIBMPI_NAME macro via the CPPFLAGS. The issue occurs when Open MPI is configured with --enable-opal-btl-usnic-unit-tests Thanks George Marselis for reporting this issue Refs. open-mpi/ompi#6441 Signed-off-by: Gilles Gouaillardet (cherry picked from commit b4097626ab256d2ace27a99b7fd174cd2709533e) --- opal/mca/btl/usnic/Makefile.am | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/opal/mca/btl/usnic/Makefile.am b/opal/mca/btl/usnic/Makefile.am index 9a270c043b0..59f80df8b72 100644 --- a/opal/mca/btl/usnic/Makefile.am +++ b/opal/mca/btl/usnic/Makefile.am @@ -16,6 +16,8 @@ # Copyright (c) 2016-2017 IBM Corporation. All rights reserved. # Copyright (c) 2017 Los Alamos National Security, LLC. All rights # reserved. +# Copyright (c) 2019 Research Organization for Information Science +# and Technology (RIST). All rights reserved. # $COPYRIGHT$ # # Additional copyrights may follow @@ -103,7 +105,8 @@ libmca_btl_usnic_la_LIBADD = $(opal_ofi_LIBS) if OPAL_BTL_USNIC_BUILD_UNIT_TESTS usnic_btl_run_tests_CPPFLAGS = \ - -DBTL_USNIC_RUN_TESTS_SYMBOL=\"opal_btl_usnic_run_tests\" + -DBTL_USNIC_RUN_TESTS_SYMBOL=\"opal_btl_usnic_run_tests\" \ + -DOMPI_LIBMPI_NAME=\"$(OMPI_LIBMPI_NAME)\" usnic_btl_run_tests_SOURCES = test/usnic_btl_run_tests.c usnic_btl_run_tests_LDADD = -ldl bin_PROGRAMS = usnic_btl_run_tests From 0c8e9036ea3cdf4e81dca9a56dee109a75fc47e1 Mon Sep 17 00:00:00 2001 From: Jeff Squyres Date: Tue, 5 Mar 2019 09:30:21 -0800 Subject: [PATCH 2/2] btl/usnic: amend Makefile.am fix from b4097626ab Use $(AM_CPPFLAGS) in $(usnic_btl_run_tests_CPPFLAGS) so that we don't have to replicate hard-coded values. Signed-off-by: Jeff Squyres (cherry picked from commit 14563770a1d64c465ee1f205c9981de39970bb33) --- opal/mca/btl/usnic/Makefile.am | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/opal/mca/btl/usnic/Makefile.am b/opal/mca/btl/usnic/Makefile.am index 59f80df8b72..17d62cc429e 100644 --- a/opal/mca/btl/usnic/Makefile.am +++ b/opal/mca/btl/usnic/Makefile.am @@ -104,9 +104,8 @@ libmca_btl_usnic_la_LDFLAGS = \ libmca_btl_usnic_la_LIBADD = $(opal_ofi_LIBS) if OPAL_BTL_USNIC_BUILD_UNIT_TESTS -usnic_btl_run_tests_CPPFLAGS = \ - -DBTL_USNIC_RUN_TESTS_SYMBOL=\"opal_btl_usnic_run_tests\" \ - -DOMPI_LIBMPI_NAME=\"$(OMPI_LIBMPI_NAME)\" +usnic_btl_run_tests_CPPFLAGS = $(AM_CPPFLAGS) \ + -DBTL_USNIC_RUN_TESTS_SYMBOL=\"opal_btl_usnic_run_tests\" usnic_btl_run_tests_SOURCES = test/usnic_btl_run_tests.c usnic_btl_run_tests_LDADD = -ldl bin_PROGRAMS = usnic_btl_run_tests