From b4cc2b782941c2f2e17f8098302d3b0073fff3cf Mon Sep 17 00:00:00 2001 From: Kevin Tian Date: Wed, 21 Jul 2010 15:34:51 +0800 Subject: pkgconfig_staging.bbclass: remove it this is one existing for stale reason when package's own Makefile doesn't handle .pc correctly. After previous commits to remove unnecessary inheritage on it (sqlite3, libpng), the only remaining is libgcrypt. Libgcrypt itself doesn't ship a .pc and poky generates one. In this case, simply move the manual installation to its own do_install. Then it's safe to remove this class file Signed-off-by: Kevin Tian --- meta/classes/pkgconfig_stage.bbclass | 9 --------- meta/packages/libgcrypt/libgcrypt.inc | 8 +++++++- 2 files changed, 7 insertions(+), 10 deletions(-) delete mode 100644 meta/classes/pkgconfig_stage.bbclass (limited to 'meta') diff --git a/meta/classes/pkgconfig_stage.bbclass b/meta/classes/pkgconfig_stage.bbclass deleted file mode 100644 index bd5bd8167..000000000 --- a/meta/classes/pkgconfig_stage.bbclass +++ /dev/null @@ -1,9 +0,0 @@ -SYSROOT_PREPROCESS_FUNCS += "pkgconfig_sysroot_preprocess" - -pkgconfig_sysroot_preprocess () { - install -d ${SYSROOT_DESTDIR}${PKG_CONFIG_DIR} - for pc in `find ${S} -name '*.pc' -type f | grep -v -- '-uninstalled.pc$'`; do - pcname=`basename $pc` - cat $pc > ${SYSROOT_DESTDIR}${PKG_CONFIG_DIR}/$pcname - done -} diff --git a/meta/packages/libgcrypt/libgcrypt.inc b/meta/packages/libgcrypt/libgcrypt.inc index 6c4608704..08fe7992f 100644 --- a/meta/packages/libgcrypt/libgcrypt.inc +++ b/meta/packages/libgcrypt/libgcrypt.inc @@ -14,10 +14,16 @@ DEPENDS = "libgpg-error" SRC_URI = "ftp://ftp.gnupg.org/gcrypt/libgcrypt/libgcrypt-${PV}.tar.gz \ file://add-pkgconfig-support.patch" -inherit autotools binconfig pkgconfig pkgconfig_stage +inherit autotools binconfig pkgconfig EXTRA_OECONF = "--without-pth --disable-asm --with-capabilities" +# libgcrypt.pc is added locally and thus installed here +do_install_append() { + install -d ${D}/${libdir}/pkgconfig + install -m 0644 ${S}/src/libgcrypt.pc ${D}/${libdir}/pkgconfig/ +} + ARM_INSTRUCTION_SET = "arm" # move libgcrypt-config into -dev package -- cgit v1.2.3