phone/fso/patches/001-multilibc.patch

   1 diff -ruN fso-20090103.orig/framework/cxnet/common.py fso-20090103/framework/cxnet/common.py
   2 --- fso-20090103.orig/framework/cxnet/common.py 2009-01-05 10:09:43.000000000 +0100
   3 +++ fso-20090103/framework/cxnet/common.py      2009-01-07 11:10:52.000000000 +0100
   4 @@ -38,7 +38,14 @@
   5  else:
   6         cx_int = c_uint64
   7
   8 -libc = CDLL("libc.so.6")
   9 +from os import listdir
  10 +from re import compile
  11 +re = compile('^libc.so.[0-9]$')
  12 +libs = listdir('/lib')
  13 +for lib in libs:
  14 +       if re.match(lib):
  15 +               libc = CDLL(lib)
  16 +               break
  17
  18  def hdump(name,msg,size=0):
  19         """
  20 diff -ruN fso-20090103.orig/framework/patterns/kobject.py fso-20090103/framework/patterns/kobject.py
  21 --- fso-20090103.orig/framework/patterns/kobject.py     2009-01-05 10:09:43.000000000 +0100
  22 +++ fso-20090103/framework/patterns/kobject.py  2009-01-07 13:37:58.000000000 +0100
  23 @@ -88,7 +88,13 @@
  24              self._watchR = gobject.io_add_watch( self._socketR.fileno(), gobject.IO_IN, self._onActivityR )
  25
  26          # for rtnetlink assistance
  27 -        self._libc = ctypes.CDLL( "libc.so.6" )
  28 +        from re import compile
  29 +        re = compile('^libc.so.[0-9]$')
  30 +        libs = os.listdir('/lib')
  31 +        for lib in libs:
  32 +            if re.match(lib):
  33 +                self._libc = ctypes.CDLL(lib)
  34 +                break
  35          self._parser = RtNetlinkParser()
  36
  37      def __del__( self ):
  38 Binary files fso-20090103.orig/framework/patterns/.kobject.py.swp and fso-20090103/framework/patterns/.kobject.py.swp differ
  39 diff -ruN fso-20090103.orig/framework/subsystems/odeviced/pyglet/linux.py fso-20090103/framework/subsystems/odeviced/pyglet/linux.py
  40 --- fso-20090103.orig/framework/subsystems/odeviced/pyglet/linux.py     2009-01-05 10:09:43.000000000 +0100
  41 +++ fso-20090103/framework/subsystems/odeviced/pyglet/linux.py  2009-01-07 12:15:13.000000000 +0100
  42 @@ -15,7 +15,13 @@
  43  import struct
  44  import sys
  45
  46 -c = ctypes.cdll.LoadLibrary('libc.so.6')
  47 +from re import compile
  48 +re = compile('^libc.so.[0-9]$')
  49 +libs = os.listdir('/lib')
  50 +for lib in libs:
  51 +    if re.match(lib):
  52 +        c = ctypes.cdll.LoadLibrary(lib)
  53 +        break
  54
  55  _IOC_NRBITS = 8
  56  _IOC_TYPEBITS = 8