Fixes #3517: Move hwloc libpci fix to v1.7 v1.7
authorjsquyres
Tue Feb 19 16:26:22 2013 +0000 (3 months ago)
branchv1.7
changeset 2141493cbd0edb73f
parent 21412 b3e45ef43a82
child 21416 01bbea512249
Fixes #3517: Move hwloc libpci fix to v1.7

---svn-pre-commit-ignore-below---

r28076 [[BR]]
Work around issue shown in #3505 by not linking against libpci by default.
opal/mca/hwloc/configure.m4
     1.1 --- a/opal/mca/hwloc/configure.m4	Tue Feb 19 15:58:30 2013 +0000
     1.2 +++ b/opal/mca/hwloc/configure.m4	Tue Feb 19 16:26:22 2013 +0000
     1.3 @@ -74,6 +74,10 @@
     1.4      # broken, and will disable it by default.  I hate making tests
     1.5      # based on specific version numbers, but I'm out of ideas here.
     1.6      # :-(
     1.7 +    #
     1.8 +    # hwloc currently links against libpci, which is GPL (not LGPL),
     1.9 +    # so disable it by default for now.  This needs to be revisited at
    1.10 +    # some point.
    1.11      AC_MSG_CHECKING([whether to enable hwloc PCI device support])
    1.12      AS_IF([test "$enable_hwloc_pci" = "yes"],
    1.13            [AC_MSG_RESULT([yes (--enable-hwloc-pci specified)])
    1.14 @@ -85,8 +89,8 @@
    1.15                    AS_IF([test "$hwloc_base_pci" != "" -a "$ac_cv_sizeof_void_p" = "8"],
    1.16                          [AC_MSG_RESULT([no (SuSE 10/64 bit)])
    1.17                           enable_pci=no],
    1.18 -                        [AC_MSG_RESULT([defer (default)])
    1.19 -                         enable_pci=])
    1.20 +                        [AC_MSG_RESULT([no (default)])
    1.21 +                         enable_pci=no])
    1.22                   ])
    1.23            ])
    1.24