diff options
| -rw-r--r-- | recipes/boost/boost-36.inc | 24 | ||||
| -rw-r--r-- | recipes/gstreamer/gst-plugins-ugly-sid_0.10.7.bb | 8 | ||||
| -rw-r--r-- | recipes/gstreamer/gst-plugins-ugly_0.10.10.bb | 8 |
3 files changed, 20 insertions, 20 deletions
diff --git a/recipes/boost/boost-36.inc b/recipes/boost/boost-36.inc index 5a4faaf1d6..4bd065f13a 100644 --- a/recipes/boost/boost-36.inc +++ b/recipes/boost/boost-36.inc @@ -43,18 +43,18 @@ S = "${WORKDIR}/${BOOST_P}" # Make a package for each library, plus -dev PACKAGES = "${PN}-dbg ${BOOST_PACKAGES}" python __anonymous () { - import bb - - packages = [] - extras = [] - for lib in bb.data.getVar('BOOST_LIBS', d, 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) - bb.data.setVar("BOOST_PACKAGES", " ".join(packages), d) - bb.data.setVar("BJAM_EXTRA", " ".join(extras), d) + import bb + + packages = [] + extras = [] + for lib in bb.data.getVar('BOOST_LIBS', d, 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) + bb.data.setVar("BOOST_PACKAGES", " ".join(packages), d) + bb.data.setVar("BJAM_EXTRA", " ".join(extras), d) } # Override the contents of specific packages diff --git a/recipes/gstreamer/gst-plugins-ugly-sid_0.10.7.bb b/recipes/gstreamer/gst-plugins-ugly-sid_0.10.7.bb index 77c4184c29..545a43a494 100644 --- a/recipes/gstreamer/gst-plugins-ugly-sid_0.10.7.bb +++ b/recipes/gstreamer/gst-plugins-ugly-sid_0.10.7.bb @@ -10,8 +10,8 @@ SRC_URI = "\ S = "${WORKDIR}/gst-plugins-ugly-${PV}" python() { - # Don't build, if we are building an ENTERPRISE distro - enterprise = bb.data.getVar("ENTERPRISE_DISTRO", d, 1) - if enterprise != "1": - raise bb.parse.SkipPackage("gst-plugins-ugly-sid will only build if ENTERPRISE_DISTRO == 1") + # Don't build, if we are building an ENTERPRISE distro + enterprise = bb.data.getVar("ENTERPRISE_DISTRO", d, 1) + if enterprise != "1": + raise bb.parse.SkipPackage("gst-plugins-ugly-sid will only build if ENTERPRISE_DISTRO == 1") } diff --git a/recipes/gstreamer/gst-plugins-ugly_0.10.10.bb b/recipes/gstreamer/gst-plugins-ugly_0.10.10.bb index 0678e229f8..49350ed641 100644 --- a/recipes/gstreamer/gst-plugins-ugly_0.10.10.bb +++ b/recipes/gstreamer/gst-plugins-ugly_0.10.10.bb @@ -10,9 +10,9 @@ SRC_URI += "\ " python() { - # Don't build, if we are building an ENTERPRISE distro - enterprise = bb.data.getVar("ENTERPRISE_DISTRO", d, 1) - if enterprise == "1": - raise bb.parse.SkipPackage("gst-plugins-ugly will only build if ENTERPRISE_DISTRO != 1") + # Don't build, if we are building an ENTERPRISE distro + enterprise = bb.data.getVar("ENTERPRISE_DISTRO", d, 1) + if enterprise == "1": + raise bb.parse.SkipPackage("gst-plugins-ugly will only build if ENTERPRISE_DISTRO != 1") } |