7003742 some python libraries contain incorrect RPATH and RUNPATH
authorRich Burridge <rich.burridge@oracle.com>
Wed, 26 Oct 2011 19:15:27 -0700
changeset 544 649f9883f9d5
parent 543 407986f44d70
child 545 2ace9bdbc05e
7003742 some python libraries contain incorrect RPATH and RUNPATH
components/python/python26/patches/Python26-01-solaris-lib-dirs.patch
--- a/components/python/python26/patches/Python26-01-solaris-lib-dirs.patch	Wed Oct 26 19:11:53 2011 -0700
+++ b/components/python/python26/patches/Python26-01-solaris-lib-dirs.patch	Wed Oct 26 19:15:27 2011 -0700
@@ -78,7 +78,7 @@
                                     libraries = ['ssl', 'crypto'],
                                     depends = ['socketmodule.h']), )
          else:
-@@ -1079,6 +1095,14 @@
+@@ -1079,6 +1095,16 @@
  
          # Curses support, requiring the System V version of curses, often
          # provided by the ncurses library.
@@ -88,8 +88,10 @@
 +            # look for ncurses in /usr/gnu on Solaris
 +            curses_inc_dirs.append('/usr/include/ncurses')
 +            curses_lib_dirs.append('/usr/gnu/lib')
-+            curses_lib_dirs.append('/usr/gnu/lib/amd64')
-+            curses_lib_dirs.append('/usr/gnu/lib/sparcv9')
++            if os.path.exists('/usr/gnu/lib/sparcv9'):
++                curses_lib_dirs.append('/usr/gnu/lib/sparcv9')
++            else:
++                curses_lib_dirs.append('/usr/gnu/lib/amd64')
          panel_library = 'panel'
          if (self.compiler.find_library_file(lib_dirs, 'ncursesw')):
              curses_libs = ['ncursesw']