merge from master

CREDITS

@@ -362,3 +362,8 @@ I: 732, 733
 N: Visa Hankala
 E: visa@openbsd.org
 I: 741
+
+N: Sebastian-Gabriel Brestin
+C: Romania
+E: sebastianbrestin@gmail.com
+I: 704

HISTORY.rst

@@ -17,6 +17,7 @@ Bug tracker at https://github.com/giampaolo/psutil/issues
 - #737: [Windows] when the bitness of psutil and the target process was
   different cmdline() and cwd() could return a wrong result or incorrectly
   report an AccessDenied error.
+- #704: psutil does not compile/cannot be imported on solaris sparc
 
 
 3.4.2 - 2016-01-20

psutil/__init__.py

@@ -128,7 +128,7 @@
         sys.platform.startswith("netbsd"):
     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_BOUND  # NOQA
     from ._pssunos import CONN_IDLE  # NOQA

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

setup.py

@@ -71,7 +71,7 @@ def write(self, s):
     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')
@@ -202,7 +202,8 @@ def on_exit():
         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'],

test/test_psutil.py

@@ -117,7 +117,7 @@
 OPENBSD = sys.platform.startswith("openbsd")
 NETBSD = sys.platform.startswith("netbsd")
 BSD = FREEBSD or OPENBSD or NETBSD
-SUNOS = sys.platform.startswith("sunos")
+SUNOS = sys.platform.startswith("sunos") or sys.platform.startswith("solaris")
 VALID_PROC_STATUSES = [getattr(psutil, x) for x in dir(psutil)
                        if x.startswith('STATUS_')]
 # whether we're running this test suite on Travis (https://travis-ci.org/)