X-Git-Url: http://code.vuplus.com/gitweb/?a=blobdiff_plain;f=meta-openvuplus%2Frecipes-enigma2%2Fpython%2Fpython%2Fno-ldconfig.patch;fp=meta-openvuplus%2Frecipes-enigma2%2Fpython%2Fpython%2Fno-ldconfig.patch;h=0000000000000000000000000000000000000000;hb=0e6c5d97c12ae5eb100dc835a2ec6df30c9ebb95;hp=fff1ccd3bd0b306e89832895ab6edf0561f6f627;hpb=e56f897c120c6a2c70e6b3129dde975f92d105cc;p=vuplus_openvuplus_3.0 diff --git a/meta-openvuplus/recipes-enigma2/python/python/no-ldconfig.patch b/meta-openvuplus/recipes-enigma2/python/python/no-ldconfig.patch deleted file mode 100644 index fff1ccd..0000000 --- a/meta-openvuplus/recipes-enigma2/python/python/no-ldconfig.patch +++ /dev/null @@ -1,23 +0,0 @@ -Fixes exception on 'import uuid' if ldconfig is unavailable. - -diff -Naur Python-2.6.7.orig/Lib/ctypes/util.py Python-2.6.7/Lib/ctypes/util.py ---- Python-2.6.7.orig/Lib/ctypes/util.py 2010-03-20 03:11:16.000000000 +0100 -+++ Python-2.6.7/Lib/ctypes/util.py 2012-01-12 15:26:37.562726637 +0100 -@@ -204,7 +204,16 @@ - return res.group(1) - - def find_library(name): -- return _findSoname_ldconfig(name) or _get_soname(_findLib_gcc(name)) -+ from glob import glob -+ paths = ['/lib', '/usr/lib'] -+ if os.environ.has_key('LD_LIBRARY_PATH'): -+ paths = os.environ['LD_LIBRARY_PATH'].split(':') + paths -+ for path in paths: -+ for lib in glob("%s/lib%s.so.*" % (path, name)): -+ rpath = os.path.realpath(lib) -+ if os.path.isfile(rpath): -+ return rpath -+ return None - - ################################################################ - # test code