diff --git a/meta-oe/recipes-support/libldb/libldb/do-not-import-target-module-while-cross-compile.patch b/meta-oe/recipes-support/libldb/libldb/do-not-import-target-module-while-cross-compile.patch index 06b30ec1..5e70a882 100755 --- a/meta-oe/recipes-support/libldb/libldb/do-not-import-target-module-while-cross-compile.patch +++ b/meta-oe/recipes-support/libldb/libldb/do-not-import-target-module-while-cross-compile.patch @@ -1,6 +1,5 @@ -diff -Nurp ldb-1.1.17.orig/buildtools/wafsamba/samba_bundled.py ldb-1.1.17/buildtools/wafsamba/samba_bundled.py ---- ldb-1.1.17.orig/buildtools/wafsamba/samba_bundled.py 2014-05-05 17:00:41.000000000 +0900 -+++ ldb-1.1.17/buildtools/wafsamba/samba_bundled.py 2015-07-02 11:44:20.913000246 +0900 +--- ldb-1.1.17.orig/buildtools/wafsamba/samba_bundled.py 2015-07-10 10:54:56.902199718 +0800 ++++ ldb-1.1.17/buildtools/wafsamba/samba_bundled.py 2015-07-10 10:59:15.878189598 +0800 @@ -1,7 +1,7 @@ # functions to support bundled libraries @@ -10,7 +9,7 @@ diff -Nurp ldb-1.1.17.orig/buildtools/wafsamba/samba_bundled.py ldb-1.1.17/build from samba_utils import * def PRIVATE_NAME(bld, name, private_extension, private_library): -@@ -218,17 +218,34 @@ def CHECK_BUNDLED_SYSTEM_PYTHON(conf, li +@@ -218,17 +218,42 @@ def CHECK_BUNDLED_SYSTEM_PYTHON(conf, li # versions minversion = minimum_library_version(conf, libname, minversion) @@ -22,6 +21,7 @@ diff -Nurp ldb-1.1.17.orig/buildtools/wafsamba/samba_bundled.py ldb-1.1.17/build + # Find module in PYTHONPATH + stuff = imp.find_module(modulename, [os.environ["PYTHONPATH"]]) + if stuff: ++ Logs.warn('module[%s] exists in [%s]' % (stuff[1], os.environ["PYTHONPATH"])) try: - version = m.__version__ - except AttributeError: @@ -29,6 +29,8 @@ diff -Nurp ldb-1.1.17.orig/buildtools/wafsamba/samba_bundled.py ldb-1.1.17/build + except ImportError: found = False + ++ Logs.warn('Cross module[%s] can not be loaded.' % (stuff[1])) ++ + build_arch = os.environ["BUILD_ARCH"] + host_arch = os.environ["HOST_ARCH"] + if build_arch != host_arch: @@ -38,16 +40,21 @@ diff -Nurp ldb-1.1.17.orig/buildtools/wafsamba/samba_bundled.py ldb-1.1.17/build + found = True else: - found = tuplize_version(version) >= tuplize_version(minversion) ++ Logs.warn('module[%s] which exsits in [%s] can been loaded' % (stuff[1], os.environ["PYTHONPATH"])) + try: + version = m.__version__ + except AttributeError: ++ Logs.warn('Can not get version from module[%s]' % (stuff[1])) + found = False + else: + found = tuplize_version(version) >= tuplize_version(minversion) ++ Logs.warn('module[%s] with version %s been found' % (stuff[1], version)) + finally: ++ Logs.warn('Close module[%s]. Note: maybe some exception was caught!' % (stuff[1])) + if stuff[0]: + stuff[0].close() + else: ++ Logs.warn('module[%s] does not exist in [%s]' % (stuff[1], os.environ["PYTHONPATH"])) + found = False + if not found and not conf.LIB_MAY_BE_BUNDLED(libname):