diff options
Diffstat (limited to 'meta/recipes-support')
| -rw-r--r-- | meta/recipes-support/attr/ea-acl.inc | 4 | ||||
| -rw-r--r-- | meta/recipes-support/boost/boost-36.inc | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/meta/recipes-support/attr/ea-acl.inc b/meta/recipes-support/attr/ea-acl.inc index ce98a95cdb..1fda792b77 100644 --- a/meta/recipes-support/attr/ea-acl.inc +++ b/meta/recipes-support/attr/ea-acl.inc @@ -34,8 +34,8 @@ FILES_lib${BPN}-doc = "${mandir}/man2 \ BBCLASSEXTEND = "native" # Only append ldflags for target recipe and if USE_NLS is enabled -LDFLAGS_append_libc-uclibc = "${@['', ' -lintl '][(bb.data.getVar('PN', d, True) == bb.data.getVar('BPN', d , True)) and (bb.data.getVar('USE_NLS', d, True) == 'yes')]}" -EXTRA_OECONF_append_libc-uclibc = "${@['', ' --disable-gettext '][(bb.data.getVar('PN', d, True) == bb.data.getVar('BPN', d , True)) and (bb.data.getVar('USE_NLS', d, True) == 'no')]}" +LDFLAGS_append_libc-uclibc = "${@['', ' -lintl '][(d.getVar('PN', True) == d.getVar('BPN', True)) and (d.getVar('USE_NLS', True) == 'yes')]}" +EXTRA_OECONF_append_libc-uclibc = "${@['', ' --disable-gettext '][(d.getVar('PN', True) == d.getVar('BPN', True)) and (d.getVar('USE_NLS', True) == 'no')]}" fix_symlink () { if test "${libdir}" = "${base_libdir}" ; then diff --git a/meta/recipes-support/boost/boost-36.inc b/meta/recipes-support/boost/boost-36.inc index bb267d791c..8b0622f6ba 100644 --- a/meta/recipes-support/boost/boost-36.inc +++ b/meta/recipes-support/boost/boost-36.inc @@ -11,8 +11,8 @@ LICENSE = "Boost" PR = "r4" ARM_INSTRUCTION_SET = "arm" -BOOST_VER = "${@"_".join(bb.data.getVar("PV",d,1).split("."))}" -BOOST_MAJ = "${@"_".join(bb.data.getVar("PV",d,1).split(".")[0:2])}" +BOOST_VER = "${@"_".join(d.getVar("PV",1).split("."))}" +BOOST_MAJ = "${@"_".join(d.getVar("PV",1).split(".")[0:2])}" BOOST_P = "boost_${BOOST_VER}" BOOST_LIBS = "\ @@ -46,12 +46,12 @@ python __anonymous () { packages = [] extras = [] - for lib in bb.data.getVar('BOOST_LIBS', d, 1).split( ): + for lib in d.getVar('BOOST_LIBS', 1).split( ): pkg = "boost-%s" % lib.replace("_", "-") extras.append("--with-%s" % lib) packages.append(pkg) - if not bb.data.getVar("FILES_%s" % pkg, d, 1): - bb.data.setVar("FILES_%s" % pkg, "${libdir}/libboost_%s*.so.*" % lib, d) + if not d.getVar("FILES_%s" % pkg, 1): + d.setVar("FILES_%s" % pkg, "${libdir}/libboost_%s*.so.*" % lib) bb.data.setVar("BOOST_PACKAGES", " ".join(packages), d) bb.data.setVar("BJAM_EXTRA", " ".join(extras), d) } |