From ae97dbe1dbe4294f7f18a1f2643c3560c3813330 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Mon, 26 Sep 2011 21:12:25 +0100 Subject: [PATCH] pseudo: Fix QA warnings This fixes two QA warnings: a) Debug files being contained in the main package (by adding an appropriate FILES expression) b) Stop hardcoding the RPATH in the nativesdk case since our path is on the loaders default search path (From OE-Core rev: 1577975202437f8f89ef24a5e4d3f6c6c8a88c5c) (From OE-Core rev: 0c345e7aa83196e55cd554a958690e4cc261ef16) Signed-off-by: Richard Purdie --- meta/recipes-devtools/pseudo/pseudo.inc | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/meta/recipes-devtools/pseudo/pseudo.inc b/meta/recipes-devtools/pseudo/pseudo.inc index 0416a53d7d..0c7185b85b 100644 --- a/meta/recipes-devtools/pseudo/pseudo.inc +++ b/meta/recipes-devtools/pseudo/pseudo.inc @@ -10,8 +10,14 @@ LICENSE = "LGPL2.1" DEPENDS = "sqlite3" FILES_${PN} = "${libdir}/libpseudo.so ${bindir}/* ${localstatedir}/pseudo" +FILES_${PN}-dbg += "${libdir}/pseudo/lib*/.debug" PROVIDES += "virtual/fakeroot" +# In the nativesdk case, we'll already search the searchpaths +# pseudo tries to build in so override RPATH +MAKEOPTS = "" +MAKEOPTS_virtclass-nativesdk = "'RPATH='" + inherit siteinfo do_configure () { @@ -27,7 +33,7 @@ do_compile () { else ${S}/configure --prefix=${prefix} --libdir=${prefix}/lib/pseudo/lib --with-sqlite=${STAGING_DIR_TARGET}${exec_prefix} --bits=${SITEINFO_BITS} fi - oe_runmake + oe_runmake ${MAKEOPTS} } # Two below are the same @@ -37,9 +43,9 @@ do_compile_prepend_virtclass-native () { if [ "${SITEINFO_BITS}" == "64" -a -e "/usr/include/gnu/stubs-32.h" -a "${PN}" == "pseudo-native" -a "${NO32LIBS}" != "1" ]; then # We need the 32-bit libpseudo on a 64-bit machine... ./configure --prefix=${prefix} --libdir=${prefix}/lib/pseudo/lib --with-sqlite=${STAGING_DIR_TARGET}${exec_prefix} --bits=32 - oe_runmake libpseudo + oe_runmake ${MAKEOPTS} libpseudo # prevent it from removing the lib, but remove everything else - make 'LIB=foo' distclean + make 'LIB=foo' ${MAKEOPTS} distclean fi } @@ -47,14 +53,14 @@ do_compile_prepend_virtclass-nativesdk () { if [ "${SITEINFO_BITS}" == "64" -a -e "/usr/include/gnu/stubs-32.h" -a "${PN}" == "pseudo-native" -a "${NO32LIBS}" != "1" ]; then # We need the 32-bit libpseudo on a 64-bit machine... ./configure --prefix=${prefix} --libdir=${prefix}/lib/pseudo/lib --with-sqlite=${STAGING_DIR_TARGET}${exec_prefix} --bits=32 - oe_runmake libpseudo + oe_runmake ${MAKEOPTS} libpseudo # prevent it from removing the lib, but remove everything else - make 'LIB=foo' distclean + make 'LIB=foo' ${MAKEOPTS} distclean fi } do_install () { - oe_runmake 'DESTDIR=${D}' 'LIB=lib/pseudo/lib$(MARK64)' install + oe_runmake 'DESTDIR=${D}' ${MAKEOPTS} 'LIB=lib/pseudo/lib$(MARK64)' install } # Two below are the same