summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-devtools')
-rw-r--r--meta/recipes-devtools/gdb/gdb_7.12.1.bb2
-rw-r--r--meta/recipes-devtools/mtd/mtd-utils_git.bb2
-rw-r--r--meta/recipes-devtools/patch/patch_2.7.5.bb2
-rw-r--r--meta/recipes-devtools/pax-utils/pax-utils_1.2.2.bb2
-rw-r--r--meta/recipes-devtools/python/python-smartpm_git.bb4
-rw-r--r--meta/recipes-devtools/qemu/qemu.inc3
-rw-r--r--meta/recipes-devtools/rsync/rsync_2.6.9.bb2
-rw-r--r--meta/recipes-devtools/rsync/rsync_3.1.2.bb2
-rw-r--r--meta/recipes-devtools/ruby/ruby_2.3.3.bb2
9 files changed, 10 insertions, 11 deletions
diff --git a/meta/recipes-devtools/gdb/gdb_7.12.1.bb b/meta/recipes-devtools/gdb/gdb_7.12.1.bb
index 4fddf81ffa..ea8fef122c 100644
--- a/meta/recipes-devtools/gdb/gdb_7.12.1.bb
+++ b/meta/recipes-devtools/gdb/gdb_7.12.1.bb
@@ -10,7 +10,7 @@ EXTRA_OEMAKE_append_libc-musl = "\
10 " 10 "
11 11
12do_configure_prepend() { 12do_configure_prepend() {
13 if [ -n "${@bb.utils.contains('PACKAGECONFIG', 'python', 'python', '', d)}" ]; then 13 if [ "${@bb.utils.filter('PACKAGECONFIG', 'python', d)}" ]; then
14 cat > ${WORKDIR}/python << EOF 14 cat > ${WORKDIR}/python << EOF
15#!/bin/sh 15#!/bin/sh
16case "\$2" in 16case "\$2" in
diff --git a/meta/recipes-devtools/mtd/mtd-utils_git.bb b/meta/recipes-devtools/mtd/mtd-utils_git.bb
index d09ac841ec..30cf13c0dd 100644
--- a/meta/recipes-devtools/mtd/mtd-utils_git.bb
+++ b/meta/recipes-devtools/mtd/mtd-utils_git.bb
@@ -26,7 +26,7 @@ S = "${WORKDIR}/git/"
26# xattr support creates an additional compile-time dependency on acl because 26# xattr support creates an additional compile-time dependency on acl because
27# the sys/acl.h header is needed. libacl is not needed and thus enabling xattr 27# the sys/acl.h header is needed. libacl is not needed and thus enabling xattr
28# regardless whether acl is enabled or disabled in the distro should be okay. 28# regardless whether acl is enabled or disabled in the distro should be okay.
29PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'xattr', 'xattr', '', d)}" 29PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'xattr', d)}"
30PACKAGECONFIG[xattr] = ",,acl," 30PACKAGECONFIG[xattr] = ",,acl,"
31 31
32EXTRA_OEMAKE = "'CC=${CC}' 'RANLIB=${RANLIB}' 'AR=${AR}' 'CFLAGS=${CFLAGS} ${@bb.utils.contains('PACKAGECONFIG', 'xattr', '', '-DWITHOUT_XATTR', d)} -I${S}/include' 'BUILDDIR=${S}'" 32EXTRA_OEMAKE = "'CC=${CC}' 'RANLIB=${RANLIB}' 'AR=${AR}' 'CFLAGS=${CFLAGS} ${@bb.utils.contains('PACKAGECONFIG', 'xattr', '', '-DWITHOUT_XATTR', d)} -I${S}/include' 'BUILDDIR=${S}'"
diff --git a/meta/recipes-devtools/patch/patch_2.7.5.bb b/meta/recipes-devtools/patch/patch_2.7.5.bb
index f3fcf5e86d..151f021b2c 100644
--- a/meta/recipes-devtools/patch/patch_2.7.5.bb
+++ b/meta/recipes-devtools/patch/patch_2.7.5.bb
@@ -10,6 +10,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
10 10
11acpaths = "-I ${S}/m4 " 11acpaths = "-I ${S}/m4 "
12 12
13PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'xattr', 'xattr', '', d)}" 13PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'xattr', d)}"
14PACKAGECONFIG[xattr] = "--enable-xattr,--disable-xattr,attr," 14PACKAGECONFIG[xattr] = "--enable-xattr,--disable-xattr,attr,"
15 15
diff --git a/meta/recipes-devtools/pax-utils/pax-utils_1.2.2.bb b/meta/recipes-devtools/pax-utils/pax-utils_1.2.2.bb
index a032a22c22..dabb4db382 100644
--- a/meta/recipes-devtools/pax-utils/pax-utils_1.2.2.bb
+++ b/meta/recipes-devtools/pax-utils/pax-utils_1.2.2.bb
@@ -29,7 +29,7 @@ BBCLASSEXTEND = "native"
29 29
30inherit autotools pkgconfig 30inherit autotools pkgconfig
31 31
32PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'largefile', 'largefile', '', d)} \ 32PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'largefile', d)} \
33" 33"
34PACKAGECONFIG[libcap] = "--with-caps, --without-caps, libcap" 34PACKAGECONFIG[libcap] = "--with-caps, --without-caps, libcap"
35PACKAGECONFIG[libseccomp] = "--with-seccomp, --without-seccomp, libseccomp" 35PACKAGECONFIG[libseccomp] = "--with-seccomp, --without-seccomp, libseccomp"
diff --git a/meta/recipes-devtools/python/python-smartpm_git.bb b/meta/recipes-devtools/python/python-smartpm_git.bb
index 6daabf49a6..31c273deaf 100644
--- a/meta/recipes-devtools/python/python-smartpm_git.bb
+++ b/meta/recipes-devtools/python/python-smartpm_git.bb
@@ -81,12 +81,12 @@ do_install_append() {
81 # Disable zypper channel support 81 # Disable zypper channel support
82 rm -f ${D}${PYTHON_SITEPACKAGES_DIR}/smart/plugins/zyppchannelsync.py* 82 rm -f ${D}${PYTHON_SITEPACKAGES_DIR}/smart/plugins/zyppchannelsync.py*
83 83
84 if [ -z "${@bb.utils.contains('PACKAGECONFIG', 'rpm', 'rpm', '', d)}" ]; then 84 if [ -z "${@bb.utils.filter('PACKAGECONFIG', 'rpm', d)}" ]; then
85 rm -f ${D}${PYTHON_SITEPACKAGES_DIR}/smart/plugins/rpmdir.py* 85 rm -f ${D}${PYTHON_SITEPACKAGES_DIR}/smart/plugins/rpmdir.py*
86 rm -rf ${D}${PYTHON_SITEPACKAGES_DIR}/smart/backends/rpm 86 rm -rf ${D}${PYTHON_SITEPACKAGES_DIR}/smart/backends/rpm
87 fi 87 fi
88 88
89 if [ -z "${@bb.utils.contains('PACKAGECONFIG', 'qt4', 'qt4', '', d)}" ]; then 89 if [ -z "${@bb.utils.filter('PACKAGECONFIG', 'qt4', d)}" ]; then
90 rm -rf ${D}${PYTHON_SITEPACKAGES_DIR}/smart/interfaces/qt4 90 rm -rf ${D}${PYTHON_SITEPACKAGES_DIR}/smart/interfaces/qt4
91 fi 91 fi
92 92
diff --git a/meta/recipes-devtools/qemu/qemu.inc b/meta/recipes-devtools/qemu/qemu.inc
index cdbb7f1671..2b82e8fd02 100644
--- a/meta/recipes-devtools/qemu/qemu.inc
+++ b/meta/recipes-devtools/qemu/qemu.inc
@@ -100,8 +100,7 @@ do_install_append() {
100 100
101PACKAGECONFIG ??= " \ 101PACKAGECONFIG ??= " \
102 fdt sdl \ 102 fdt sdl \
103 ${@bb.utils.contains('DISTRO_FEATURES', 'alsa', 'alsa', '', d)} \ 103 ${@bb.utils.filter('DISTRO_FEATURES', 'alsa xen', d)} \
104 ${@bb.utils.contains('DISTRO_FEATURES', 'xen', 'xen', '', d)} \
105 " 104 "
106PACKAGECONFIG_class-native ??= "fdt alsa uuid" 105PACKAGECONFIG_class-native ??= "fdt alsa uuid"
107PACKAGECONFIG_class-nativesdk ??= "fdt sdl" 106PACKAGECONFIG_class-nativesdk ??= "fdt sdl"
diff --git a/meta/recipes-devtools/rsync/rsync_2.6.9.bb b/meta/recipes-devtools/rsync/rsync_2.6.9.bb
index efdf255a07..17f1d31945 100644
--- a/meta/recipes-devtools/rsync/rsync_2.6.9.bb
+++ b/meta/recipes-devtools/rsync/rsync_2.6.9.bb
@@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=6d5a9d4c4d3af25cd68fd83e8a8cb09c"
12 12
13PR = "r4" 13PR = "r4"
14 14
15PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ipv6', '', d)}" 15PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}"
diff --git a/meta/recipes-devtools/rsync/rsync_3.1.2.bb b/meta/recipes-devtools/rsync/rsync_3.1.2.bb
index c6cb3310fc..103198487b 100644
--- a/meta/recipes-devtools/rsync/rsync_3.1.2.bb
+++ b/meta/recipes-devtools/rsync/rsync_3.1.2.bb
@@ -10,7 +10,7 @@ LICENSE = "GPLv3+"
10LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" 10LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
11 11
12PACKAGECONFIG ??= "acl attr \ 12PACKAGECONFIG ??= "acl attr \
13 ${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ipv6', '', d)} \ 13 ${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)} \
14" 14"
15PACKAGECONFIG[acl] = "--enable-acl-support,--disable-acl-support,acl," 15PACKAGECONFIG[acl] = "--enable-acl-support,--disable-acl-support,acl,"
16PACKAGECONFIG[attr] = "--enable-xattr-support,--disable-xattr-support,attr," 16PACKAGECONFIG[attr] = "--enable-xattr-support,--disable-xattr-support,attr,"
diff --git a/meta/recipes-devtools/ruby/ruby_2.3.3.bb b/meta/recipes-devtools/ruby/ruby_2.3.3.bb
index 7ba9b46a17..e460139a65 100644
--- a/meta/recipes-devtools/ruby/ruby_2.3.3.bb
+++ b/meta/recipes-devtools/ruby/ruby_2.3.3.bb
@@ -9,7 +9,7 @@ SRC_URI[sha256sum] = "241408c8c555b258846368830a06146e4849a1d58dcaf6b14a3b6a7305
9UNKNOWN_CONFIGURE_WHITELIST += "--enable-wide-getaddrinfo" 9UNKNOWN_CONFIGURE_WHITELIST += "--enable-wide-getaddrinfo"
10 10
11PACKAGECONFIG ??= "" 11PACKAGECONFIG ??= ""
12PACKAGECONFIG += "${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ipv6', '', d)}" 12PACKAGECONFIG += "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}"
13 13
14PACKAGECONFIG[valgrind] = "--with-valgrind=yes, --with-valgrind=no, valgrind" 14PACKAGECONFIG[valgrind] = "--with-valgrind=yes, --with-valgrind=no, valgrind"
15PACKAGECONFIG[gpm] = "--with-gmp=yes, --with-gmp=no, gmp" 15PACKAGECONFIG[gpm] = "--with-gmp=yes, --with-gmp=no, gmp"