From b8090a2dbf871875e61a3f20113d4af0b8a71f3f Mon Sep 17 00:00:00 2001 From: Gilles Gouaillardet Date: Wed, 19 Oct 2016 09:56:11 +0900 Subject: [PATCH 1/2] ompi_wrapper_script: fix $extra_ldflags use @OMPI_PKG_CONFIG_LDFLAGS@ instead of @OMPI_WRAPPER_EXTRA_LDFLAGS@ so @{libdir} is substitued with ${libdir} Thanks Manesh Nanavalla for the report (back-ported from commit open-mpi/ompi@cb76d93b4e616b9d1411c28fe0848cce2e374fbf) Signed-off-by: Gilles Gouaillardet --- ompi/tools/wrappers/ompi_wrapper_script.in | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ompi/tools/wrappers/ompi_wrapper_script.in b/ompi/tools/wrappers/ompi_wrapper_script.in index d87649fbb94..c3d588f2f85 100644 --- a/ompi/tools/wrappers/ompi_wrapper_script.in +++ b/ompi/tools/wrappers/ompi_wrapper_script.in @@ -6,6 +6,8 @@ # # Copyright (c) 2009-2012 Cisco Systems, Inc. All rights reserved. # Copyright (c) 2010 Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2016 Research Organization for Information Science +# and Technology (RIST). All rights reserved. # $COPYRIGHT$ # # Additional copyrights may follow @@ -40,7 +42,7 @@ my $extra_cxxflags = "@OMPI_WRAPPER_EXTRA_CXXFLAGS@"; my $extra_cxxflags_prefix = "@ORTE_WRAPPER_EXTRA_CXXFLAGS_PREFIX@"; my $extra_fcflags = "@OMPI_WRAPPER_EXTRA_FCFLAGS@"; my $extra_fcflags_prefix = "@OMPI_WRAPPER_EXTRA_FCFLAGS_PREFIX@"; -my $extra_ldflags = "@OMPI_WRAPPER_EXTRA_LDFLAGS@"; +my $extra_ldflags = "@OMPI_PKG_CONFIG_LDFLAGS@"; my $extra_libs = "@OMPI_WRAPPER_EXTRA_LIBS@"; my $cxx_lib = "@OMPI_WRAPPER_CXX_LIB@"; my $fc_module_flag = "@OMPI_FC_MODULE_FLAG@"; From 1f15e349770f7d31b95026a1543fca35f5a849aa Mon Sep 17 00:00:00 2001 From: Gilles Gouaillardet Date: Wed, 19 Oct 2016 10:06:11 +0900 Subject: [PATCH 2/2] ompi_wrapper_script: use @OMPI_*@ instead of @ORTE_*@ master and v1.10 have diverged regarding this script, so this is a one-off commit for the v1.10 branch Signed-off-by: Gilles Gouaillardet --- ompi/tools/wrappers/ompi_wrapper_script.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ompi/tools/wrappers/ompi_wrapper_script.in b/ompi/tools/wrappers/ompi_wrapper_script.in index c3d588f2f85..6c77970150e 100644 --- a/ompi/tools/wrappers/ompi_wrapper_script.in +++ b/ompi/tools/wrappers/ompi_wrapper_script.in @@ -37,9 +37,9 @@ my $FC = "@FC@"; my $extra_includes = "@OMPI_WRAPPER_EXTRA_INCLUDES@"; my $extra_cppflags = "@OMPI_WRAPPER_EXTRA_CPPFLAGS@"; my $extra_cflags = "@OMPI_WRAPPER_EXTRA_CFLAGS@"; -my $extra_cflags_prefix = "@ORTE_WRAPPER_EXTRA_CFLAGS_PREFIX@"; +my $extra_cflags_prefix = "@OMPI_WRAPPER_EXTRA_CFLAGS_PREFIX@"; my $extra_cxxflags = "@OMPI_WRAPPER_EXTRA_CXXFLAGS@"; -my $extra_cxxflags_prefix = "@ORTE_WRAPPER_EXTRA_CXXFLAGS_PREFIX@"; +my $extra_cxxflags_prefix = "@OMPI_WRAPPER_EXTRA_CXXFLAGS_PREFIX@"; my $extra_fcflags = "@OMPI_WRAPPER_EXTRA_FCFLAGS@"; my $extra_fcflags_prefix = "@OMPI_WRAPPER_EXTRA_FCFLAGS_PREFIX@"; my $extra_ldflags = "@OMPI_PKG_CONFIG_LDFLAGS@";