Merge pull request #3362 from jsquyres/pr/v2.0.x/fix-static-builds

hppritcha · web-flow · commit 8f5707f2d7bd · 2017-05-11T10:33:39.000-05:00
v2.0.x: dl/dlopen: add libs to wrapper LIBS
diff --git a/opal/mca/dl/dlopen/configure.m4 b/opal/mca/dl/dlopen/configure.m4
@@ -1,6 +1,6 @@
 # -*- shell-script -*-
 #
-# Copyright (c) 2009-2015 Cisco Systems, Inc.  All rights reserved.
+# Copyright (c) 2009-2017 Cisco Systems, Inc.  All rights reserved
 #
 # $COPYRIGHT$
 #
@@ -47,7 +47,8 @@ AC_DEFUN([MCA_opal_dl_dlopen_CONFIG],[
           ])
 
     AS_IF([test "$opal_dl_dlopen_happy" = "yes"],
-          [opal_dl_dlopen_ADD_LIBS=$opal_dl_dlopen_LIBS
+          [dl_dlopen_ADD_LIBS=$opal_dl_dlopen_LIBS
+           dl_dlopen_WRAPPER_EXTRA_LIBS=$opal_dl_dlopen_LIBS
            $1],
           [$2])
 

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`# -- shell-script --`
`2`	`2`	`#`
`3`		`-# Copyright (c) 2009-2015 Cisco Systems, Inc. All rights reserved.`
	`3`	`+# Copyright (c) 2009-2017 Cisco Systems, Inc. All rights reserved`
`4`	`4`	`#`
`5`	`5`	`# $COPYRIGHT$`
`6`	`6`	`#`
`@@ -47,7 +47,8 @@ AC_DEFUN([MCA_opal_dl_dlopen_CONFIG],[`
`47`	`47`	`])`
`48`	`48`
`49`	`49`	`AS_IF([test "$opal_dl_dlopen_happy" = "yes"],`
`50`		`- [opal_dl_dlopen_ADD_LIBS=$opal_dl_dlopen_LIBS`
	`50`	`+ [dl_dlopen_ADD_LIBS=$opal_dl_dlopen_LIBS`
	`51`	`+ dl_dlopen_WRAPPER_EXTRA_LIBS=$opal_dl_dlopen_LIBS`
`51`	`52`	`$1],`
`52`	`53`	`[$2])`
`53`	`54`