--- Python-3.4.2/setup.py.~2~	2015-02-09 18:43:32.656965175 -0800

+++ Python-3.4.2/setup.py	2015-02-09 19:28:55.015474602 -0800

@@ -447,12 +447,15 @@

             os.unlink(tmpfile)

     def detect_modules(self):

-        # Ensure that /usr/local is always used, but the local build

-        # directories (i.e. '.' and 'Include') must be first.  See issue

-        # 10520.

         if not cross_compiling:

-            add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib')

-            add_dir_to_list(self.compiler.include_dirs, '/usr/local/include')

+            if host_platform != 'sunos5':

+                # Upstream notes the following for source builds:

+                #    Ensure that /usr/local is always used, but the local build

+                #    directories (i.e. '.' and 'Include') must be first.  See

+                #    issue 10520.

+                # But we skip that for Solaris system builds.

+                add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib')

+                add_dir_to_list(self.compiler.include_dirs, '/usr/local/include')

         # only change this for cross builds for 3.3, issues on Mageia

         if cross_compiling:

             self.add_gcc_paths()

@@ -736,6 +739,13 @@

@@ -1295,6 +1305,8 @@

             curses_defines.append(('_XOPEN_SOURCE_EXTENDED', '1'))

         if curses_library.startswith('ncurses'):

+            if host_platform == 'sunos5':

+                curses_includes.append('/usr/include/ncurses')

             curses_libs = [curses_library]

             exts.append( Extension('_curses', ['_cursesmodule.c'],

                                    include_dirs=curses_includes,

@@ -1319,10 +1331,32 @@

         # If the curses module is enabled, check for the panel module

         if (module_enabled(exts, '_curses') and

             self.compiler.find_library_file(lib_dirs, panel_library)):

+            panel_lib_dirs = []

+            if host_platform == 'sunos5':

+                # Look for libpanel under /usr/gnu/lib on Solaris.

+                # os.uname() does not include the processor. platform.uname()

+                # does, but the platform module is not available in setup.

+                # Work around this by parsing os.system('uname -p') output.

+                tmpfile = os.path.join(self.build_temp, 'processor')

+                if not os.path.exists(self.build_temp):

+                    os.makedirs(self.build_temp)

+                os.system('/usr/bin/uname -p > %s 2> /dev/null' %tmpfile)

+                processor = ''

+                try:

+                    with open(tmpfile) as fp:

+                        processor = fp.readline().strip()

+                finally:

+                    os.unlink(tmpfile)

+                if processor == 'sparc':

+                    panel_lib_dirs.append('/usr/gnu/lib/sparcv9')

+                else:

+                    panel_lib_dirs.append('/usr/gnu/lib/amd64')

             exts.append( Extension('_curses_panel', ['_curses_panel.c'],

                                    include_dirs=curses_includes,

                                    define_macros=curses_defines,

-                                   libraries = [panel_library] + curses_libs) )

+                                   libraries = [panel_library] + curses_libs,

+                                   library_dirs = panel_lib_dirs,

+                                   runtime_library_dirs = panel_lib_dirs) )

         else:

             missing.append('_curses_panel')

@@ -1918,7 +1952,7 @@