# # old_revision [94f55edb9673650b94ff7e6104dcd7fd219b7e09] # # add_file "packages/libxml/libxml2-native.inc" # content [0a554a8efe6da01b5ae2d68525932eb2d6e5a961] # # patch "packages/libxml/libxml2-native_2.6.29.bb" # from [0b126ddc4ebc9a5029e2d23e95faa5baa2c4b05b] # to [6ebe7893cb4ed475335a5d1a0a2c77e0b22369a6] # # patch "packages/libxml/libxml2-native_2.6.32.bb" # from [f6ef67f246de782a7f6bc2c228379069f24f65ca] # to [986cff3602a8b62d37b091669edad3a0ba088e64] # ============================================================ --- packages/libxml/libxml2-native.inc 0a554a8efe6da01b5ae2d68525932eb2d6e5a961 +++ packages/libxml/libxml2-native.inc 0a554a8efe6da01b5ae2d68525932eb2d6e5a961 @@ -0,0 +1,7 @@ +def libxml2_native_python_dir(d): + import os, bb + staging_incdir = bb.data.getVar( "STAGING_INCDIR", d, 1 ) + if os.path.exists( "%s/python2.5" % staging_incdir ): return "python2.5" + if os.path.exists( "%s/python2.4" % staging_incdir ): return "python2.4" + if os.path.exists( "%s/python2.3" % staging_incdir ): return "python2.3" + raise "No Python in STAGING_INCDIR. Forgot to build python-native ?" ============================================================ --- packages/libxml/libxml2-native_2.6.29.bb 0b126ddc4ebc9a5029e2d23e95faa5baa2c4b05b +++ packages/libxml/libxml2-native_2.6.29.bb 6ebe7893cb4ed475335a5d1a0a2c77e0b22369a6 @@ -8,13 +8,7 @@ inherit autotools native pkgconfig inherit autotools native pkgconfig -def libxml2_native_python_dir(d): - import os, bb - staging_incdir = bb.data.getVar( "STAGING_INCDIR", d, 1 ) - if os.path.exists( "%s/python2.5" % staging_incdir ): return "python2.5" - if os.path.exists( "%s/python2.4" % staging_incdir ): return "python2.4" - if os.path.exists( "%s/python2.3" % staging_incdir ): return "python2.3" - raise "No Python in STAGING_INCDIR. Forgot to build python-native ?" +require libxml2-native.inc EXTRA_OECONF = "--with-python=${STAGING_INCDIR}/${@libxml2_native_python_dir(d)} \ --without-debug --without-legacy --without-catalog --without-docbook --with-c14n" ============================================================ --- packages/libxml/libxml2-native_2.6.32.bb f6ef67f246de782a7f6bc2c228379069f24f65ca +++ packages/libxml/libxml2-native_2.6.32.bb 986cff3602a8b62d37b091669edad3a0ba088e64 @@ -8,13 +8,7 @@ inherit autotools native pkgconfig inherit autotools native pkgconfig -def libxml2_native_python_dir(d): - import os, bb - staging_incdir = bb.data.getVar( "STAGING_INCDIR", d, 1 ) - if os.path.exists( "%s/python2.5" % staging_incdir ): return "python2.5" - if os.path.exists( "%s/python2.4" % staging_incdir ): return "python2.4" - if os.path.exists( "%s/python2.3" % staging_incdir ): return "python2.3" - raise "No Python in STAGING_INCDIR. Forgot to build python-native ?" +require libxml2-native.inc EXTRA_OECONF = "--with-python=${STAGING_INCDIR}/${@libxml2_native_python_dir(d)} \ --without-debug --without-legacy --without-catalog --without-docbook --with-c14n"