diff options
| author | bsebi <sebastianbrestin@gmail.com> | 2015-10-28 18:50:41 +0200 |
|---|---|---|
| committer | bsebi <sebastianbrestin@gmail.com> | 2015-10-28 18:50:41 +0200 |
| commit | f89aec2e56e1e1e503a6292850048bbea6de31a1 (patch) | |
| tree | a8011a0d369c78b935e939290a5173d647d5200d | |
| parent | 36316de315a55dece354cf98533e647d7f62c49b (diff) | |
| download | psutil-f89aec2e56e1e1e503a6292850048bbea6de31a1.tar.gz | |
#704: psutil does not compile/cannot be imported on solaris sparc
| -rw-r--r-- | CREDITS | 5 | ||||
| -rw-r--r-- | HISTORY.rst | 8 | ||||
| -rw-r--r-- | psutil/__init__.py | 2 | ||||
| -rw-r--r-- | psutil/_psutil_posix.c | 2 | ||||
| -rw-r--r-- | setup.py | 4 |
5 files changed, 17 insertions, 4 deletions
@@ -337,3 +337,8 @@ I: 541 N: Mike Sarahan W: https://github.com/msarahan I: 688 + +N: Sebastian-Gabriel Brestin +C: Romania +E: sebastianbrestin@gmail.com +I: 704
\ No newline at end of file diff --git a/HISTORY.rst b/HISTORY.rst index 7deb5d32..e231f6e4 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -1,5 +1,13 @@ Bug tracker at https://github.com/giampaolo/psutil/issues +3.2.3 - 3015-10-28 +================== + +**Bug fixes** + +- #704: psutil does not compile/cannot be imported on solaris sparc + + 3.2.3 - XXXX-XX-XX ================== diff --git a/psutil/__init__.py b/psutil/__init__.py index 1a75a9f9..2343391c 100644 --- a/psutil/__init__.py +++ b/psutil/__init__.py @@ -121,7 +121,7 @@ elif sys.platform.startswith("darwin"): elif sys.platform.startswith("freebsd"): from . import _psbsd as _psplatform -elif sys.platform.startswith("sunos"): +elif sys.platform.startswith("sunos") or sys.platform.startswith("solaris"): from . import _pssunos as _psplatform from ._pssunos import (CONN_IDLE, # NOQA CONN_BOUND) diff --git a/psutil/_psutil_posix.c b/psutil/_psutil_posix.c index 1e27cdb0..1dfbcf45 100644 --- a/psutil/_psutil_posix.c +++ b/psutil/_psutil_posix.c @@ -16,7 +16,7 @@ #include <net/if.h> #ifdef PSUTIL_SUNOS10 -#include "arch/solaris10/ifaddrs.h" +#include "arch/solaris/v10/ifaddrs.h" #else #include <ifaddrs.h> #endif @@ -71,7 +71,7 @@ if os.name == 'posix': posix_extension = Extension( 'psutil._psutil_posix', sources=['psutil/_psutil_posix.c']) - if sys.platform.startswith("sunos"): + if sys.platform.startswith("sunos") or sys.platform.startswith("solaris"): posix_extension.libraries.append('socket') if platform.release() == '5.10': posix_extension.sources.append('psutil/arch/solaris/v10/ifaddrs.c') @@ -175,7 +175,7 @@ elif sys.platform.startswith("linux"): define_macros=macros) extensions = [ext, posix_extension] # Solaris -elif sys.platform.lower().startswith('sunos'): +elif sys.platform.lower().startswith('sunos') or sys.platform.lower().startswith('solaris'): ext = Extension( 'psutil._psutil_sunos', sources=['psutil/_psutil_sunos.c'], |