diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-05-22 10:59:33 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-06-16 15:31:40 +0100 |
commit | 3476a49b10093c58b2f89e3d9a8527224f1bd7f6 (patch) | |
tree | 369d23a1d434e43284ea2bdffa318f5408b13014 | |
parent | 3a88df915831f2fd5e46ed71b21190398d1de0f1 (diff) | |
download | poky-3476a49b10093c58b2f89e3d9a8527224f1bd7f6.tar.gz |
binconfig-disabled: Add class and use
This adds a binconfig-disabled class which can be used by recipes where
a -config file is installed but we wish to disable it and just rely on
the .pc files instead.
Rather than simply deleting it, we make the script "exit 1" so that it
can be found in PATH and raise a build error rather than something
silently falling back to the build system for example.
Rather than randomly finding -config files, this adds in the
specification of a list of binconfig scripts which is more deterministic
and maintainable moving forward.
This patch converts various users in OE-Core to use this, a world build
of OE-Core tests out ok with this change. There will likely be issues in
other layers however, hence this being a RFT.
(From OE-Core rev: 5870bd272b0b077d0826fb900b251884c1c05061)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
21 files changed, 71 insertions, 19 deletions
diff --git a/meta/classes/binconfig-disabled.bbclass b/meta/classes/binconfig-disabled.bbclass new file mode 100644 index 0000000000..1308358fec --- /dev/null +++ b/meta/classes/binconfig-disabled.bbclass | |||
@@ -0,0 +1,12 @@ | |||
1 | # | ||
2 | # Class to disable binconfig files instead of installing them | ||
3 | # | ||
4 | |||
5 | FILES_${PN}-dev += "${bindir}/*-config" | ||
6 | |||
7 | do_install_append () { | ||
8 | for x in ${BINCONFIG}; do | ||
9 | echo "#!/bin/sh" > ${D}$x | ||
10 | echo "exit 1" >> ${D}$x | ||
11 | done | ||
12 | } | ||
diff --git a/meta/recipes-connectivity/libpcap/libpcap.inc b/meta/recipes-connectivity/libpcap/libpcap.inc index 177b70f27a..8a9fa9eca1 100644 --- a/meta/recipes-connectivity/libpcap/libpcap.inc +++ b/meta/recipes-connectivity/libpcap/libpcap.inc | |||
@@ -19,7 +19,9 @@ INC_PR = "r5" | |||
19 | 19 | ||
20 | SRC_URI = "http://www.tcpdump.org/release/libpcap-${PV}.tar.gz" | 20 | SRC_URI = "http://www.tcpdump.org/release/libpcap-${PV}.tar.gz" |
21 | 21 | ||
22 | inherit autotools binconfig | 22 | BINCONFIG = "${bindir}/pcap-config" |
23 | |||
24 | inherit autotools binconfig-disabled | ||
23 | 25 | ||
24 | EXTRA_OECONF = "--with-pcap=linux" | 26 | EXTRA_OECONF = "--with-pcap=linux" |
25 | 27 | ||
diff --git a/meta/recipes-core/libxml/libxml2.inc b/meta/recipes-core/libxml/libxml2.inc index 1401c731b8..e0b50cf207 100644 --- a/meta/recipes-core/libxml/libxml2.inc +++ b/meta/recipes-core/libxml/libxml2.inc | |||
@@ -22,7 +22,9 @@ SRC_URI = "ftp://xmlsoft.org/libxml2/libxml2-${PV}.tar.gz;name=libtar \ | |||
22 | file://python-sitepackages-dir.patch \ | 22 | file://python-sitepackages-dir.patch \ |
23 | " | 23 | " |
24 | 24 | ||
25 | inherit autotools pkgconfig binconfig pythonnative ptest | 25 | BINCONFIG = "${bindir}/xml2-config" |
26 | |||
27 | inherit autotools pkgconfig binconfig-disabled pythonnative ptest | ||
26 | 28 | ||
27 | RDEPENDS_${PN}-ptest_append_libc-glibc += "eglibc-gconv-ebcdic-us eglibc-gconv-ibm1141" | 29 | RDEPENDS_${PN}-ptest_append_libc-glibc += "eglibc-gconv-ebcdic-us eglibc-gconv-ibm1141" |
28 | 30 | ||
diff --git a/meta/recipes-core/ncurses/ncurses.inc b/meta/recipes-core/ncurses/ncurses.inc index f0a4044345..521d0e435c 100644 --- a/meta/recipes-core/ncurses/ncurses.inc +++ b/meta/recipes-core/ncurses/ncurses.inc | |||
@@ -8,7 +8,9 @@ DEPENDS = "ncurses-native" | |||
8 | DEPENDS_class-native = "" | 8 | DEPENDS_class-native = "" |
9 | INC_PR = "r15" | 9 | INC_PR = "r15" |
10 | 10 | ||
11 | inherit autotools binconfig multilib_header | 11 | BINCONFIG = "${bindir}/ncurses-config" |
12 | |||
13 | inherit autotools binconfig-disabled multilib_header | ||
12 | 14 | ||
13 | # Upstream has useful patches at times at ftp://invisible-island.net/ncurses/ | 15 | # Upstream has useful patches at times at ftp://invisible-island.net/ncurses/ |
14 | SRC_URI = "${GNU_MIRROR}/ncurses/ncurses-${PV}.tar.gz" | 16 | SRC_URI = "${GNU_MIRROR}/ncurses/ncurses-${PV}.tar.gz" |
diff --git a/meta/recipes-graphics/directfb/directfb.inc b/meta/recipes-graphics/directfb/directfb.inc index f2518e9396..51dc09bc10 100644 --- a/meta/recipes-graphics/directfb/directfb.inc +++ b/meta/recipes-graphics/directfb/directfb.inc | |||
@@ -19,7 +19,9 @@ S = "${WORKDIR}/DirectFB-${PV}" | |||
19 | 19 | ||
20 | LDFLAGS_append =" -lts -lm" | 20 | LDFLAGS_append =" -lts -lm" |
21 | 21 | ||
22 | inherit autotools binconfig pkgconfig | 22 | BINCONFIG = "${bindir}/directfb-config" |
23 | |||
24 | inherit autotools binconfig-disabled pkgconfig | ||
23 | 25 | ||
24 | PACKAGECONFIG ??= "" | 26 | PACKAGECONFIG ??= "" |
25 | PACKAGECONFIG[jpeg2000] = "--enable-jpeg2000,--disable-jpeg2000,jasper" | 27 | PACKAGECONFIG[jpeg2000] = "--enable-jpeg2000,--disable-jpeg2000,jasper" |
diff --git a/meta/recipes-graphics/freetype/freetype_2.5.3.bb b/meta/recipes-graphics/freetype/freetype_2.5.3.bb index 122b8c04da..2c861de63a 100644 --- a/meta/recipes-graphics/freetype/freetype_2.5.3.bb +++ b/meta/recipes-graphics/freetype/freetype_2.5.3.bb | |||
@@ -17,7 +17,9 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/freetype/freetype-${PV}.tar.bz2" | |||
17 | SRC_URI[md5sum] = "d6b60f06bfc046e43ab2a6cbfd171d65" | 17 | SRC_URI[md5sum] = "d6b60f06bfc046e43ab2a6cbfd171d65" |
18 | SRC_URI[sha256sum] = "c0848b29d52ef3ca27ad92e08351f023c5e24ce8cea7d8fe69fc96358e65f75e" | 18 | SRC_URI[sha256sum] = "c0848b29d52ef3ca27ad92e08351f023c5e24ce8cea7d8fe69fc96358e65f75e" |
19 | 19 | ||
20 | inherit autotools-brokensep pkgconfig binconfig multilib_header | 20 | BINCONFIG = "${bindir}/freetype-config" |
21 | |||
22 | inherit autotools-brokensep pkgconfig binconfig-disabled multilib_header | ||
21 | 23 | ||
22 | LIBTOOL = "${S}/builds/unix/${HOST_SYS}-libtool" | 24 | LIBTOOL = "${S}/builds/unix/${HOST_SYS}-libtool" |
23 | EXTRA_OEMAKE = "'LIBTOOL=${LIBTOOL}'" | 25 | EXTRA_OEMAKE = "'LIBTOOL=${LIBTOOL}'" |
diff --git a/meta/recipes-graphics/libsdl/libsdl_1.2.15.bb b/meta/recipes-graphics/libsdl/libsdl_1.2.15.bb index 4a7712116f..f81d862cdc 100644 --- a/meta/recipes-graphics/libsdl/libsdl_1.2.15.bb +++ b/meta/recipes-graphics/libsdl/libsdl_1.2.15.bb | |||
@@ -30,7 +30,9 @@ S = "${WORKDIR}/SDL-${PV}" | |||
30 | SRC_URI[md5sum] = "9d96df8417572a2afb781a7c4c811a85" | 30 | SRC_URI[md5sum] = "9d96df8417572a2afb781a7c4c811a85" |
31 | SRC_URI[sha256sum] = "d6d316a793e5e348155f0dd93b979798933fb98aa1edebcc108829d6474aad00" | 31 | SRC_URI[sha256sum] = "d6d316a793e5e348155f0dd93b979798933fb98aa1edebcc108829d6474aad00" |
32 | 32 | ||
33 | inherit autotools lib_package binconfig pkgconfig | 33 | BINCONFIG = "${bindir}/sdl-config" |
34 | |||
35 | inherit autotools lib_package binconfig-disabled pkgconfig | ||
34 | 36 | ||
35 | EXTRA_OECONF = "--disable-static --enable-cdrom --enable-threads --enable-timers \ | 37 | EXTRA_OECONF = "--disable-static --enable-cdrom --enable-threads --enable-timers \ |
36 | --enable-file --disable-oss --disable-esd --disable-arts \ | 38 | --enable-file --disable-oss --disable-esd --disable-arts \ |
diff --git a/meta/recipes-multimedia/libpng/libpng_1.6.10.bb b/meta/recipes-multimedia/libpng/libpng_1.6.10.bb index 0f514f8b73..babf87e392 100644 --- a/meta/recipes-multimedia/libpng/libpng_1.6.10.bb +++ b/meta/recipes-multimedia/libpng/libpng_1.6.10.bb | |||
@@ -15,7 +15,9 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/project/libpng/libpng${LIBV}/${PV}/libpng-${PV} | |||
15 | SRC_URI[md5sum] = "5f414b20f683b1d96b163c89e3eff768" | 15 | SRC_URI[md5sum] = "5f414b20f683b1d96b163c89e3eff768" |
16 | SRC_URI[sha256sum] = "4003f0fd0e36110a2b742fc5b9e1ab93ed7a7ab57ae8dc65f0e8101458775a56" | 16 | SRC_URI[sha256sum] = "4003f0fd0e36110a2b742fc5b9e1ab93ed7a7ab57ae8dc65f0e8101458775a56" |
17 | 17 | ||
18 | inherit autotools binconfig pkgconfig | 18 | BINCONFIG = "${bindir}/libpng-config ${bindir}/libpng16-config" |
19 | |||
20 | inherit autotools binconfig-disabled pkgconfig | ||
19 | 21 | ||
20 | # Work around missing symbols | 22 | # Work around missing symbols |
21 | EXTRA_OECONF_append_arm = " ${@bb.utils.contains("TUNE_FEATURES", "neon", "--enable-arm-neon=on", "--enable-arm-neon=off" ,d)}" | 23 | EXTRA_OECONF_append_arm = " ${@bb.utils.contains("TUNE_FEATURES", "neon", "--enable-arm-neon=on", "--enable-arm-neon=off" ,d)}" |
diff --git a/meta/recipes-support/gpgme/gpgme_1.4.3.bb b/meta/recipes-support/gpgme/gpgme_1.4.3.bb index 5a337d8a7e..ef08d4f2f4 100644 --- a/meta/recipes-support/gpgme/gpgme_1.4.3.bb +++ b/meta/recipes-support/gpgme/gpgme_1.4.3.bb | |||
@@ -19,7 +19,9 @@ DEPENDS = "libgpg-error libassuan" | |||
19 | 19 | ||
20 | EXTRA_OECONF = "--with-gpg=${bindir}/gpg --without-gpgsm" | 20 | EXTRA_OECONF = "--with-gpg=${bindir}/gpg --without-gpgsm" |
21 | 21 | ||
22 | inherit autotools texinfo binconfig pkgconfig | 22 | BINCONFIG = "${bindir}/gpgme-config" |
23 | |||
24 | inherit autotools texinfo binconfig-disabled pkgconfig | ||
23 | 25 | ||
24 | PACKAGES =+ "${PN}-pthread" | 26 | PACKAGES =+ "${PN}-pthread" |
25 | FILES_${PN}-pthread = "${libdir}/libgpgme-pthread.so.*" | 27 | FILES_${PN}-pthread = "${libdir}/libgpgme-pthread.so.*" |
diff --git a/meta/recipes-support/icu/icu.inc b/meta/recipes-support/icu/icu.inc index c592f85911..77321076d5 100644 --- a/meta/recipes-support/icu/icu.inc +++ b/meta/recipes-support/icu/icu.inc | |||
@@ -12,6 +12,8 @@ STAGING_ICU_DIR_NATIVE = "${STAGING_DATADIR_NATIVE}/${BPN}/${PV}" | |||
12 | PARALLEL_MAKE = "" | 12 | PARALLEL_MAKE = "" |
13 | CPPFLAGS_append_libc-uclibc = " -DU_TIMEZONE=0" | 13 | CPPFLAGS_append_libc-uclibc = " -DU_TIMEZONE=0" |
14 | 14 | ||
15 | BINCONFIG = "${bindir}/icu-config" | ||
16 | |||
15 | inherit autotools pkgconfig binconfig | 17 | inherit autotools pkgconfig binconfig |
16 | 18 | ||
17 | # ICU needs the native build directory as an argument to its --with-cross-build option when | 19 | # ICU needs the native build directory as an argument to its --with-cross-build option when |
diff --git a/meta/recipes-support/libassuan/libassuan_2.1.1.bb b/meta/recipes-support/libassuan/libassuan_2.1.1.bb index 6f7d6745fd..d66023320d 100644 --- a/meta/recipes-support/libassuan/libassuan_2.1.1.bb +++ b/meta/recipes-support/libassuan/libassuan_2.1.1.bb | |||
@@ -16,7 +16,9 @@ SRC_URI = "ftp://ftp.gnupg.org/gcrypt/libassuan/libassuan-${PV}.tar.bz2 \ | |||
16 | SRC_URI[md5sum] = "757243cc4a71b30ed8d8dbe784035d36" | 16 | SRC_URI[md5sum] = "757243cc4a71b30ed8d8dbe784035d36" |
17 | SRC_URI[sha256sum] = "23e2d67779b88e90d29fe1df6b157109f1c2a647d0f1b2a0f4295bb3c0b2039d" | 17 | SRC_URI[sha256sum] = "23e2d67779b88e90d29fe1df6b157109f1c2a647d0f1b2a0f4295bb3c0b2039d" |
18 | 18 | ||
19 | inherit autotools texinfo binconfig pkgconfig | 19 | BINCONFIG = "${bindir}/libassuan-config" |
20 | |||
21 | inherit autotools texinfo binconfig-disabled pkgconfig | ||
20 | 22 | ||
21 | do_configure_prepend () { | 23 | do_configure_prepend () { |
22 | # Else these could be used in prefernce to those in aclocal-copy | 24 | # Else these could be used in prefernce to those in aclocal-copy |
diff --git a/meta/recipes-support/libgcrypt/libgcrypt.inc b/meta/recipes-support/libgcrypt/libgcrypt.inc index 2b32b7eaed..fa2bc38284 100644 --- a/meta/recipes-support/libgcrypt/libgcrypt.inc +++ b/meta/recipes-support/libgcrypt/libgcrypt.inc | |||
@@ -16,7 +16,9 @@ SRC_URI = "ftp://ftp.gnupg.org/gcrypt/libgcrypt/libgcrypt-${PV}.tar.gz \ | |||
16 | file://fix-ICE-failure-on-mips-with-option-O-and-g.patch \ | 16 | file://fix-ICE-failure-on-mips-with-option-O-and-g.patch \ |
17 | " | 17 | " |
18 | 18 | ||
19 | inherit autotools-brokensep texinfo binconfig pkgconfig | 19 | BINCONFIG = "${bindir}/libgcrypt-config" |
20 | |||
21 | inherit autotools-brokensep texinfo binconfig-disabled pkgconfig | ||
20 | 22 | ||
21 | EXTRA_OECONF = "--disable-asm --with-capabilities" | 23 | EXTRA_OECONF = "--disable-asm --with-capabilities" |
22 | 24 | ||
diff --git a/meta/recipes-support/libgpg-error/libgpg-error_1.12.bb b/meta/recipes-support/libgpg-error/libgpg-error_1.12.bb index a47e31d167..af9574d8fd 100644 --- a/meta/recipes-support/libgpg-error/libgpg-error_1.12.bb +++ b/meta/recipes-support/libgpg-error/libgpg-error_1.12.bb | |||
@@ -17,7 +17,9 @@ SRC_URI = "ftp://ftp.gnupg.org/gcrypt/libgpg-error/libgpg-error-${PV}.tar.bz2 \ | |||
17 | SRC_URI[md5sum] = "8f0eb41a344d19ac2aa9bd101dfb9ce6" | 17 | SRC_URI[md5sum] = "8f0eb41a344d19ac2aa9bd101dfb9ce6" |
18 | SRC_URI[sha256sum] = "cafc9ed6a87c53a35175d5a1220a96ca386696eef2fa059cc0306211f246e55f" | 18 | SRC_URI[sha256sum] = "cafc9ed6a87c53a35175d5a1220a96ca386696eef2fa059cc0306211f246e55f" |
19 | 19 | ||
20 | inherit autotools binconfig pkgconfig gettext | 20 | BINCONFIG = "${bindir}/gpg-error-config" |
21 | |||
22 | inherit autotools binconfig-disabled pkgconfig gettext | ||
21 | 23 | ||
22 | FILES_${PN}-dev += "${bindir}/gpg-error" | 24 | FILES_${PN}-dev += "${bindir}/gpg-error" |
23 | 25 | ||
diff --git a/meta/recipes-support/libksba/libksba_1.3.0.bb b/meta/recipes-support/libksba/libksba_1.3.0.bb index 4ea6856b97..13ad437629 100644 --- a/meta/recipes-support/libksba/libksba_1.3.0.bb +++ b/meta/recipes-support/libksba/libksba_1.3.0.bb | |||
@@ -10,7 +10,9 @@ PR = "r1" | |||
10 | 10 | ||
11 | DEPENDS = "libgpg-error" | 11 | DEPENDS = "libgpg-error" |
12 | 12 | ||
13 | inherit autotools binconfig pkgconfig texinfo | 13 | BINCONFIG = "${bindir}/ksba-config" |
14 | |||
15 | inherit autotools binconfig-disabled pkgconfig texinfo | ||
14 | 16 | ||
15 | SRC_URI = "ftp://ftp.gnupg.org/gcrypt/${BPN}/${BPN}-${PV}.tar.bz2 \ | 17 | SRC_URI = "ftp://ftp.gnupg.org/gcrypt/${BPN}/${BPN}-${PV}.tar.bz2 \ |
16 | file://ksba-add-pkgconfig-support.patch" | 18 | file://ksba-add-pkgconfig-support.patch" |
diff --git a/meta/recipes-support/libpcre/libpcre_8.35.bb b/meta/recipes-support/libpcre/libpcre_8.35.bb index a99b34c8b6..92098c8c51 100644 --- a/meta/recipes-support/libpcre/libpcre_8.35.bb +++ b/meta/recipes-support/libpcre/libpcre_8.35.bb | |||
@@ -24,7 +24,9 @@ DEPENDS += "bzip2 zlib" | |||
24 | 24 | ||
25 | PACKAGECONFIG[pcretest-readline] = "--enable-pcretest-libreadline,--disable-pcretest-libreadline,readline," | 25 | PACKAGECONFIG[pcretest-readline] = "--enable-pcretest-libreadline,--disable-pcretest-libreadline,readline," |
26 | 26 | ||
27 | inherit autotools binconfig ptest | 27 | BINCONFIG = "${bindir}/pcre-config" |
28 | |||
29 | inherit autotools binconfig-disabled ptest | ||
28 | 30 | ||
29 | PARALLEL_MAKE = "" | 31 | PARALLEL_MAKE = "" |
30 | 32 | ||
diff --git a/meta/recipes-support/libusb/libusb-compat_0.1.5.bb b/meta/recipes-support/libusb/libusb-compat_0.1.5.bb index c316511b7f..74761d6a44 100644 --- a/meta/recipes-support/libusb/libusb-compat_0.1.5.bb +++ b/meta/recipes-support/libusb/libusb-compat_0.1.5.bb | |||
@@ -23,7 +23,9 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/libusb/libusb-compat-${PV}.tar.bz2" | |||
23 | SRC_URI[md5sum] = "2780b6a758a1e2c2943bdbf7faf740e4" | 23 | SRC_URI[md5sum] = "2780b6a758a1e2c2943bdbf7faf740e4" |
24 | SRC_URI[sha256sum] = "404ef4b6b324be79ac1bfb3d839eac860fbc929e6acb1ef88793a6ea328bc55a" | 24 | SRC_URI[sha256sum] = "404ef4b6b324be79ac1bfb3d839eac860fbc929e6acb1ef88793a6ea328bc55a" |
25 | 25 | ||
26 | inherit autotools pkgconfig binconfig lib_package | 26 | BINCONFIG = "${bindir}/libusb-config" |
27 | |||
28 | inherit autotools pkgconfig binconfig-disabled lib_package | ||
27 | 29 | ||
28 | EXTRA_OECONF = "--libdir=${base_libdir}" | 30 | EXTRA_OECONF = "--libdir=${base_libdir}" |
29 | 31 | ||
diff --git a/meta/recipes-support/libxslt/libxslt_1.1.28.bb b/meta/recipes-support/libxslt/libxslt_1.1.28.bb index 5401f3ce89..0b2526dbee 100644 --- a/meta/recipes-support/libxslt/libxslt_1.1.28.bb +++ b/meta/recipes-support/libxslt/libxslt_1.1.28.bb | |||
@@ -16,7 +16,9 @@ SRC_URI[md5sum] = "9667bf6f9310b957254fdcf6596600b7" | |||
16 | SRC_URI[sha256sum] = "5fc7151a57b89c03d7b825df5a0fae0a8d5f05674c0e7cf2937ecec4d54a028c" | 16 | SRC_URI[sha256sum] = "5fc7151a57b89c03d7b825df5a0fae0a8d5f05674c0e7cf2937ecec4d54a028c" |
17 | S = "${WORKDIR}/libxslt-${PV}" | 17 | S = "${WORKDIR}/libxslt-${PV}" |
18 | 18 | ||
19 | inherit autotools pkgconfig binconfig lib_package | 19 | BINCONFIG = "${bindir}/xslt-config" |
20 | |||
21 | inherit autotools pkgconfig binconfig-disabled lib_package | ||
20 | 22 | ||
21 | # We don't DEPEND on binutils for ansidecl.h so ensure we don't use the header | 23 | # We don't DEPEND on binutils for ansidecl.h so ensure we don't use the header |
22 | do_configure_prepend () { | 24 | do_configure_prepend () { |
diff --git a/meta/recipes-support/neon/neon_0.30.0.bb b/meta/recipes-support/neon/neon_0.30.0.bb index f6c5a6f43c..61bd7d9269 100644 --- a/meta/recipes-support/neon/neon_0.30.0.bb +++ b/meta/recipes-support/neon/neon_0.30.0.bb | |||
@@ -14,7 +14,9 @@ SRC_URI = "http://www.webdav.org/${BPN}/${BPN}-${PV}.tar.gz \ | |||
14 | SRC_URI[md5sum] = "fb60b3a124eeec441937a812c456fd94" | 14 | SRC_URI[md5sum] = "fb60b3a124eeec441937a812c456fd94" |
15 | SRC_URI[sha256sum] = "2962cfcb5d30f3272e3d2fa0e473434419770a3801afe3d46e5d1650787990c2" | 15 | SRC_URI[sha256sum] = "2962cfcb5d30f3272e3d2fa0e473434419770a3801afe3d46e5d1650787990c2" |
16 | 16 | ||
17 | inherit autotools binconfig lib_package pkgconfig | 17 | BINCONFIG = "${bindir}/neon-config" |
18 | |||
19 | inherit autotools binconfig-disabled lib_package pkgconfig | ||
18 | 20 | ||
19 | EXTRA_OECONF = "--with-ssl=gnutls --with-libxml2 --with-expat --enable-shared" | 21 | EXTRA_OECONF = "--with-ssl=gnutls --with-libxml2 --with-expat --enable-shared" |
20 | EXTRA_OECONF += "--without-gssapi" | 22 | EXTRA_OECONF += "--without-gssapi" |
diff --git a/meta/recipes-support/npth/npth_0.91.bb b/meta/recipes-support/npth/npth_0.91.bb index 56a9d9b69e..7105b94e3d 100644 --- a/meta/recipes-support/npth/npth_0.91.bb +++ b/meta/recipes-support/npth/npth_0.91.bb | |||
@@ -11,7 +11,9 @@ SRC_URI = "ftp://ftp.gnupg.org/gcrypt/npth/npth-${PV}.tar.bz2 \ | |||
11 | SRC_URI[md5sum] = "87712f0cee656c390b49773923e26e7f" | 11 | SRC_URI[md5sum] = "87712f0cee656c390b49773923e26e7f" |
12 | SRC_URI[sha256sum] = "caef86ced4a331e162897818a5b924860c8d6003e52da5bdf76da00e8e0dfae1" | 12 | SRC_URI[sha256sum] = "caef86ced4a331e162897818a5b924860c8d6003e52da5bdf76da00e8e0dfae1" |
13 | 13 | ||
14 | inherit autotools binconfig | 14 | BINCONFIG = "${bindir}/npth-config" |
15 | |||
16 | inherit autotools binconfig-disabled | ||
15 | 17 | ||
16 | FILES_${PN} = "${libdir}/libnpth.so.*" | 18 | FILES_${PN} = "${libdir}/libnpth.so.*" |
17 | FILES_${PN}-dev += "${bindir}/npth-config" | 19 | FILES_${PN}-dev += "${bindir}/npth-config" |
diff --git a/meta/recipes-support/pth/pth_2.0.7.bb b/meta/recipes-support/pth/pth_2.0.7.bb index 4a85332035..416e788e5d 100644 --- a/meta/recipes-support/pth/pth_2.0.7.bb +++ b/meta/recipes-support/pth/pth_2.0.7.bb | |||
@@ -20,7 +20,9 @@ SRC_URI[sha256sum] = "72353660c5a2caafd601b20e12e75d865fd88f6cf1a088b306a3963f0b | |||
20 | 20 | ||
21 | PARALLEL_MAKE="" | 21 | PARALLEL_MAKE="" |
22 | 22 | ||
23 | inherit autotools binconfig pkgconfig | 23 | BINCONFIG = "${bindir}/pth-config" |
24 | |||
25 | inherit autotools binconfig-disabled pkgconfig | ||
24 | 26 | ||
25 | do_configure() { | 27 | do_configure() { |
26 | ( cd ${S}; gnu-configize ) | 28 | ( cd ${S}; gnu-configize ) |
diff --git a/meta/recipes-support/taglib/taglib_1.9.1.bb b/meta/recipes-support/taglib/taglib_1.9.1.bb index 0421f61481..55e345f1cc 100644 --- a/meta/recipes-support/taglib/taglib_1.9.1.bb +++ b/meta/recipes-support/taglib/taglib_1.9.1.bb | |||
@@ -14,7 +14,9 @@ SRC_URI[sha256sum] = "72d371cd1419a87ae200447a53bff2be219283071e80fd12337928cc96 | |||
14 | 14 | ||
15 | S = "${WORKDIR}/${BP}" | 15 | S = "${WORKDIR}/${BP}" |
16 | 16 | ||
17 | inherit cmake pkgconfig binconfig | 17 | BINCONFIG = "${bindir}/taglib-config" |
18 | |||
19 | inherit cmake pkgconfig binconfig-disabled | ||
18 | 20 | ||
19 | PACKAGES =+ "${PN}-c" | 21 | PACKAGES =+ "${PN}-c" |
20 | FILES_${PN}-c = "${libdir}/libtag_c.so.*" | 22 | FILES_${PN}-c = "${libdir}/libtag_c.so.*" |