sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

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>
This commit is contained in:
Richard Purdie 2014-05-22 10:59:33 +01:00
parent 3a88df9158
commit 3476a49b10
21 changed files with 71 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
meta/classes/binconfig-disabled.bbclass Normal file
View File

@ -0,0 +1,12 @@
#
# Class to disable binconfig files instead of installing them
#
FILES_${PN}-dev += "${bindir}/*-config"
do_install_append () {
for x in ${BINCONFIG}; do
echo "#!/bin/sh" > ${D}$x
echo "exit 1" >> ${D}$x
done
}

4
meta/recipes-connectivity/libpcap/libpcap.inc
View File

@ -19,7 +19,9 @@ INC_PR = "r5"
SRC_URI = "http://www.tcpdump.org/release/libpcap-${PV}.tar.gz"
inherit autotools binconfig
BINCONFIG = "${bindir}/pcap-config"
inherit autotools binconfig-disabled
EXTRA_OECONF = "--with-pcap=linux"

4
meta/recipes-core/libxml/libxml2.inc
View File

@ -22,7 +22,9 @@ SRC_URI = "ftp://xmlsoft.org/libxml2/libxml2-${PV}.tar.gz;name=libtar \
file://python-sitepackages-dir.patch \
"
inherit autotools pkgconfig binconfig pythonnative ptest
BINCONFIG = "${bindir}/xml2-config"
inherit autotools pkgconfig binconfig-disabled pythonnative ptest
RDEPENDS_${PN}-ptest_append_libc-glibc += "eglibc-gconv-ebcdic-us eglibc-gconv-ibm1141"

4
meta/recipes-core/ncurses/ncurses.inc
View File

@ -8,7 +8,9 @@ DEPENDS = "ncurses-native"
DEPENDS_class-native = ""
INC_PR = "r15"
inherit autotools binconfig multilib_header
BINCONFIG = "${bindir}/ncurses-config"
inherit autotools binconfig-disabled multilib_header
# Upstream has useful patches at times at ftp://invisible-island.net/ncurses/
SRC_URI = "${GNU_MIRROR}/ncurses/ncurses-${PV}.tar.gz"

4
meta/recipes-graphics/directfb/directfb.inc
View File

@ -19,7 +19,9 @@ S = "${WORKDIR}/DirectFB-${PV}"
LDFLAGS_append =" -lts -lm"
inherit autotools binconfig pkgconfig
BINCONFIG = "${bindir}/directfb-config"
inherit autotools binconfig-disabled pkgconfig
PACKAGECONFIG ??= ""
PACKAGECONFIG[jpeg2000] = "--enable-jpeg2000,--disable-jpeg2000,jasper"

4
meta/recipes-graphics/freetype/freetype_2.5.3.bb
View File

@ -17,7 +17,9 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/freetype/freetype-${PV}.tar.bz2"
SRC_URI[md5sum] = "d6b60f06bfc046e43ab2a6cbfd171d65"
SRC_URI[sha256sum] = "c0848b29d52ef3ca27ad92e08351f023c5e24ce8cea7d8fe69fc96358e65f75e"
inherit autotools-brokensep pkgconfig binconfig multilib_header
BINCONFIG = "${bindir}/freetype-config"
inherit autotools-brokensep pkgconfig binconfig-disabled multilib_header
LIBTOOL = "${S}/builds/unix/${HOST_SYS}-libtool"
EXTRA_OEMAKE = "'LIBTOOL=${LIBTOOL}'"

4
meta/recipes-graphics/libsdl/libsdl_1.2.15.bb
View File

@ -30,7 +30,9 @@ S = "${WORKDIR}/SDL-${PV}"
SRC_URI[md5sum] = "9d96df8417572a2afb781a7c4c811a85"
SRC_URI[sha256sum] = "d6d316a793e5e348155f0dd93b979798933fb98aa1edebcc108829d6474aad00"
inherit autotools lib_package binconfig pkgconfig
BINCONFIG = "${bindir}/sdl-config"
inherit autotools lib_package binconfig-disabled pkgconfig
EXTRA_OECONF = "--disable-static --enable-cdrom --enable-threads --enable-timers \
--enable-file --disable-oss --disable-esd --disable-arts \

4
meta/recipes-multimedia/libpng/libpng_1.6.10.bb
View File

@ -15,7 +15,9 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/project/libpng/libpng${LIBV}/${PV}/libpng-${PV}
SRC_URI[md5sum] = "5f414b20f683b1d96b163c89e3eff768"
SRC_URI[sha256sum] = "4003f0fd0e36110a2b742fc5b9e1ab93ed7a7ab57ae8dc65f0e8101458775a56"
inherit autotools binconfig pkgconfig
BINCONFIG = "${bindir}/libpng-config ${bindir}/libpng16-config"
inherit autotools binconfig-disabled pkgconfig
# Work around missing symbols
EXTRA_OECONF_append_arm = " ${@bb.utils.contains("TUNE_FEATURES", "neon", "--enable-arm-neon=on", "--enable-arm-neon=off" ,d)}"

4
meta/recipes-support/gpgme/gpgme_1.4.3.bb
View File

@ -19,7 +19,9 @@ DEPENDS = "libgpg-error libassuan"
EXTRA_OECONF = "--with-gpg=${bindir}/gpg --without-gpgsm"
inherit autotools texinfo binconfig pkgconfig
BINCONFIG = "${bindir}/gpgme-config"
inherit autotools texinfo binconfig-disabled pkgconfig
PACKAGES =+ "${PN}-pthread"
FILES_${PN}-pthread = "${libdir}/libgpgme-pthread.so.*"

2
meta/recipes-support/icu/icu.inc
View File

@ -12,6 +12,8 @@ STAGING_ICU_DIR_NATIVE = "${STAGING_DATADIR_NATIVE}/${BPN}/${PV}"
PARALLEL_MAKE = ""
CPPFLAGS_append_libc-uclibc = " -DU_TIMEZONE=0"
BINCONFIG = "${bindir}/icu-config"
inherit autotools pkgconfig binconfig
# ICU needs the native build directory as an argument to its --with-cross-build option when

4
meta/recipes-support/libassuan/libassuan_2.1.1.bb
View File

@ -16,7 +16,9 @@ SRC_URI = "ftp://ftp.gnupg.org/gcrypt/libassuan/libassuan-${PV}.tar.bz2 \
SRC_URI[md5sum] = "757243cc4a71b30ed8d8dbe784035d36"
SRC_URI[sha256sum] = "23e2d67779b88e90d29fe1df6b157109f1c2a647d0f1b2a0f4295bb3c0b2039d"
inherit autotools texinfo binconfig pkgconfig
BINCONFIG = "${bindir}/libassuan-config"
inherit autotools texinfo binconfig-disabled pkgconfig
do_configure_prepend () {
# Else these could be used in prefernce to those in aclocal-copy

4
meta/recipes-support/libgcrypt/libgcrypt.inc
View File

@ -16,7 +16,9 @@ SRC_URI = "ftp://ftp.gnupg.org/gcrypt/libgcrypt/libgcrypt-${PV}.tar.gz \
file://fix-ICE-failure-on-mips-with-option-O-and-g.patch \
"
inherit autotools-brokensep texinfo binconfig pkgconfig
BINCONFIG = "${bindir}/libgcrypt-config"
inherit autotools-brokensep texinfo binconfig-disabled pkgconfig
EXTRA_OECONF = "--disable-asm --with-capabilities"

4
meta/recipes-support/libgpg-error/libgpg-error_1.12.bb
View File

@ -17,7 +17,9 @@ SRC_URI = "ftp://ftp.gnupg.org/gcrypt/libgpg-error/libgpg-error-${PV}.tar.bz2 \
SRC_URI[md5sum] = "8f0eb41a344d19ac2aa9bd101dfb9ce6"
SRC_URI[sha256sum] = "cafc9ed6a87c53a35175d5a1220a96ca386696eef2fa059cc0306211f246e55f"
inherit autotools binconfig pkgconfig gettext
BINCONFIG = "${bindir}/gpg-error-config"
inherit autotools binconfig-disabled pkgconfig gettext
FILES_${PN}-dev += "${bindir}/gpg-error"

4
meta/recipes-support/libksba/libksba_1.3.0.bb
View File

@ -10,7 +10,9 @@ PR = "r1"
DEPENDS = "libgpg-error"
inherit autotools binconfig pkgconfig texinfo
BINCONFIG = "${bindir}/ksba-config"
inherit autotools binconfig-disabled pkgconfig texinfo
SRC_URI = "ftp://ftp.gnupg.org/gcrypt/${BPN}/${BPN}-${PV}.tar.bz2 \
file://ksba-add-pkgconfig-support.patch"

4
meta/recipes-support/libpcre/libpcre_8.35.bb
View File

@ -24,7 +24,9 @@ DEPENDS += "bzip2 zlib"
PACKAGECONFIG[pcretest-readline] = "--enable-pcretest-libreadline,--disable-pcretest-libreadline,readline,"
inherit autotools binconfig ptest
BINCONFIG = "${bindir}/pcre-config"
inherit autotools binconfig-disabled ptest
PARALLEL_MAKE = ""

4
meta/recipes-support/libusb/libusb-compat_0.1.5.bb
View File

@ -23,7 +23,9 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/libusb/libusb-compat-${PV}.tar.bz2"
SRC_URI[md5sum] = "2780b6a758a1e2c2943bdbf7faf740e4"
SRC_URI[sha256sum] = "404ef4b6b324be79ac1bfb3d839eac860fbc929e6acb1ef88793a6ea328bc55a"
inherit autotools pkgconfig binconfig lib_package
BINCONFIG = "${bindir}/libusb-config"
inherit autotools pkgconfig binconfig-disabled lib_package
EXTRA_OECONF = "--libdir=${base_libdir}"

4
meta/recipes-support/libxslt/libxslt_1.1.28.bb
View File

@ -16,7 +16,9 @@ SRC_URI[md5sum] = "9667bf6f9310b957254fdcf6596600b7"
SRC_URI[sha256sum] = "5fc7151a57b89c03d7b825df5a0fae0a8d5f05674c0e7cf2937ecec4d54a028c"
S = "${WORKDIR}/libxslt-${PV}"
inherit autotools pkgconfig binconfig lib_package
BINCONFIG = "${bindir}/xslt-config"
inherit autotools pkgconfig binconfig-disabled lib_package
# We don't DEPEND on binutils for ansidecl.h so ensure we don't use the header
do_configure_prepend () {

4
meta/recipes-support/neon/neon_0.30.0.bb
View File

@ -14,7 +14,9 @@ SRC_URI = "http://www.webdav.org/${BPN}/${BPN}-${PV}.tar.gz \
SRC_URI[md5sum] = "fb60b3a124eeec441937a812c456fd94"
SRC_URI[sha256sum] = "2962cfcb5d30f3272e3d2fa0e473434419770a3801afe3d46e5d1650787990c2"
inherit autotools binconfig lib_package pkgconfig
BINCONFIG = "${bindir}/neon-config"
inherit autotools binconfig-disabled lib_package pkgconfig
EXTRA_OECONF = "--with-ssl=gnutls --with-libxml2 --with-expat --enable-shared"
EXTRA_OECONF += "--without-gssapi"

4
meta/recipes-support/npth/npth_0.91.bb
View File

@ -11,7 +11,9 @@ SRC_URI = "ftp://ftp.gnupg.org/gcrypt/npth/npth-${PV}.tar.bz2 \
SRC_URI[md5sum] = "87712f0cee656c390b49773923e26e7f"
SRC_URI[sha256sum] = "caef86ced4a331e162897818a5b924860c8d6003e52da5bdf76da00e8e0dfae1"
inherit autotools binconfig
BINCONFIG = "${bindir}/npth-config"
inherit autotools binconfig-disabled
FILES_${PN} = "${libdir}/libnpth.so.*"
FILES_${PN}-dev += "${bindir}/npth-config"

4
meta/recipes-support/pth/pth_2.0.7.bb
View File

@ -20,7 +20,9 @@ SRC_URI[sha256sum] = "72353660c5a2caafd601b20e12e75d865fd88f6cf1a088b306a3963f0b
PARALLEL_MAKE=""
inherit autotools binconfig pkgconfig
BINCONFIG = "${bindir}/pth-config"
inherit autotools binconfig-disabled pkgconfig
do_configure() {
( cd ${S}; gnu-configize )

4
meta/recipes-support/taglib/taglib_1.9.1.bb
View File

@ -14,7 +14,9 @@ SRC_URI[sha256sum] = "72d371cd1419a87ae200447a53bff2be219283071e80fd12337928cc96
S = "${WORKDIR}/${BP}"
inherit cmake pkgconfig binconfig
BINCONFIG = "${bindir}/taglib-config"
inherit cmake pkgconfig binconfig-disabled
PACKAGES =+ "${PN}-c"
FILES_${PN}-c = "${libdir}/libtag_c.so.*"