Bring r4182 from the hwloc v1.3 branch: fix static linking issues with

libhwloc_embedded.la.

This commit was SVN r25760.

The following SVN revision numbers were found above:
  r4182 --> open-mpi/ompi@b240395d9a

opal/mca/hwloc/hwloc131/README-ompi.txt

@@ -5,3 +5,4 @@ hwloc 1.3.1 distribution:
 - https://svn.open-mpi.org/trac/hwloc/changeset/4100
 - https://svn.open-mpi.org/trac/hwloc/changeset/4102
 - https://svn.open-mpi.org/trac/hwloc/changeset/4104
+- https://svn.open-mpi.org/trac/hwloc/changeset/4183

opal/mca/hwloc/hwloc131/hwloc/config/hwloc.m4

@@ -515,6 +515,7 @@ EOF])
     fi
     AC_SUBST(HWLOC_LINUX_LIBNUMA_LIBS)
     # If we asked for Linux libnuma support but couldn't deliver, fail
+    HWLOC_LIBS="$HWLOC_LIBS $HWLOC_LINUX_LIBNUMA_LIBS"
     AS_IF([test "$enable_libnuma" = "yes" -a "$hwloc_linux_libnuma_happy" = "no"],
           [AC_MSG_WARN([Specified --enable-libnuma switch, but could not])
            AC_MSG_WARN([find appropriate support])
@@ -659,14 +660,21 @@ EOF])
 
     # Set these values explicitly for embedded builds.  Exporting
     # these values through *_EMBEDDED_* values gives us the freedom to
-    # do something different someday if we ever need to.
-    HWLOC_EMBEDDED_CFLAGS=$HWLOC_CFLAGS
+    # do something different someday if we ever need to.  There's no
+    # need to fill these values in unless we're in embedded mode.
+    # Indeed, if we're building in embedded mode, we want HWLOC_LIBS
+    # to be empty so that nothing is linked into libhwloc_embedded.la
+    # itself -- only the upper-layer will link in anything required.
+
+    AS_IF([test "$hwloc_mode" = "embedded"],
+          [HWLOC_EMBEDDED_CFLAGS=$HWLOC_CFLAGS
+           HWLOC_EMBEDDED_CPPFLAGS=$HWLOC_CPPFLAGS
+           HWLOC_EMBEDDED_LDADD='$(HWLOC_top_builddir)/src/libhwloc_embedded.la'
+           HWLOC_EMBEDDED_LIBS=$HWLOC_LIBS
+           HWLOC_LIBS=])
     AC_SUBST(HWLOC_EMBEDDED_CFLAGS)
-    HWLOC_EMBEDDED_CPPFLAGS=$HWLOC_CPPFLAGS
     AC_SUBST(HWLOC_EMBEDDED_CPPFLAGS)
-    HWLOC_EMBEDDED_LDADD='$(HWLOC_top_builddir)/src/libhwloc_embedded.la'
     AC_SUBST(HWLOC_EMBEDDED_LDADD)
-    HWLOC_EMBEDDED_LIBS=$HWLOC_LIBS
     AC_SUBST(HWLOC_EMBEDDED_LIBS)
 
     # Try to compile the cpuid inlines

opal/mca/hwloc/hwloc131/hwloc/src/Makefile.am

@@ -105,10 +105,11 @@ libhwloc_la_SOURCES = $(sources)
 libhwloc_la_LDFLAGS = $(ldflags) -version-number $(libhwloc_so_version) $(HWLOC_LIBXML2_LIBS) $(HWLOC_LINUX_LIBNUMA_LIBS) $(HWLOC_PCI_LIBS)
 
 # Embedded library (note the lack of a .so version number -- that
-# intentionally only appears in the installable library)
+# intentionally only appears in the installable library).  Also note
+# the lack of _LDFLAGS -- all libs are added by the upper layer (via
+# HWLOC_EMBEDDED_LIBS).
 
 libhwloc_embedded_la_SOURCES = $(sources)
-libhwloc_embedded_la_LDFLAGS = $(ldflags) $(HWLOC_LIBXML2_LIBS) $(HWLOC_LINUX_LIBNUMA_LIBS) $(HWLOC_PCI_LIBS)
 
 # XML data (only install if we're building in standalone mode)