summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/pseudo
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2011-09-26 21:12:25 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-09-28 14:58:50 +0100
commit6527c17d567405117bf32a51c0d8b03dc83b9b37 (patch)
treeb5cfffd352c0132ba3705fa6e0974c79441b2f6d /meta/recipes-devtools/pseudo
parent323e2919eb641112f12c7713ee124c4b3e83c475 (diff)
downloadpoky-6527c17d567405117bf32a51c0d8b03dc83b9b37.tar.gz
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) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/pseudo')
-rw-r--r--meta/recipes-devtools/pseudo/pseudo.inc18
1 files 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"
10DEPENDS = "sqlite3" 10DEPENDS = "sqlite3"
11 11
12FILES_${PN} = "${libdir}/libpseudo.so ${bindir}/* ${localstatedir}/pseudo" 12FILES_${PN} = "${libdir}/libpseudo.so ${bindir}/* ${localstatedir}/pseudo"
13FILES_${PN}-dbg += "${libdir}/pseudo/lib*/.debug"
13PROVIDES += "virtual/fakeroot" 14PROVIDES += "virtual/fakeroot"
14 15
16# In the nativesdk case, we'll already search the searchpaths
17# pseudo tries to build in so override RPATH
18MAKEOPTS = ""
19MAKEOPTS_virtclass-nativesdk = "'RPATH='"
20
15inherit siteinfo 21inherit siteinfo
16 22
17do_configure () { 23do_configure () {
@@ -27,7 +33,7 @@ do_compile () {
27 else 33 else
28 ${S}/configure --prefix=${prefix} --libdir=${prefix}/lib/pseudo/lib --with-sqlite=${STAGING_DIR_TARGET}${exec_prefix} --bits=${SITEINFO_BITS} 34 ${S}/configure --prefix=${prefix} --libdir=${prefix}/lib/pseudo/lib --with-sqlite=${STAGING_DIR_TARGET}${exec_prefix} --bits=${SITEINFO_BITS}
29 fi 35 fi
30 oe_runmake 36 oe_runmake ${MAKEOPTS}
31} 37}
32 38
33# Two below are the same 39# Two below are the same
@@ -37,9 +43,9 @@ do_compile_prepend_virtclass-native () {
37 if [ "${SITEINFO_BITS}" == "64" -a -e "/usr/include/gnu/stubs-32.h" -a "${PN}" == "pseudo-native" -a "${NO32LIBS}" != "1" ]; then 43 if [ "${SITEINFO_BITS}" == "64" -a -e "/usr/include/gnu/stubs-32.h" -a "${PN}" == "pseudo-native" -a "${NO32LIBS}" != "1" ]; then
38 # We need the 32-bit libpseudo on a 64-bit machine... 44 # We need the 32-bit libpseudo on a 64-bit machine...
39 ./configure --prefix=${prefix} --libdir=${prefix}/lib/pseudo/lib --with-sqlite=${STAGING_DIR_TARGET}${exec_prefix} --bits=32 45 ./configure --prefix=${prefix} --libdir=${prefix}/lib/pseudo/lib --with-sqlite=${STAGING_DIR_TARGET}${exec_prefix} --bits=32
40 oe_runmake libpseudo 46 oe_runmake ${MAKEOPTS} libpseudo
41 # prevent it from removing the lib, but remove everything else 47 # prevent it from removing the lib, but remove everything else
42 make 'LIB=foo' distclean 48 make 'LIB=foo' ${MAKEOPTS} distclean
43 fi 49 fi
44} 50}
45 51
@@ -47,14 +53,14 @@ do_compile_prepend_virtclass-nativesdk () {
47 if [ "${SITEINFO_BITS}" == "64" -a -e "/usr/include/gnu/stubs-32.h" -a "${PN}" == "pseudo-native" -a "${NO32LIBS}" != "1" ]; then 53 if [ "${SITEINFO_BITS}" == "64" -a -e "/usr/include/gnu/stubs-32.h" -a "${PN}" == "pseudo-native" -a "${NO32LIBS}" != "1" ]; then
48 # We need the 32-bit libpseudo on a 64-bit machine... 54 # We need the 32-bit libpseudo on a 64-bit machine...
49 ./configure --prefix=${prefix} --libdir=${prefix}/lib/pseudo/lib --with-sqlite=${STAGING_DIR_TARGET}${exec_prefix} --bits=32 55 ./configure --prefix=${prefix} --libdir=${prefix}/lib/pseudo/lib --with-sqlite=${STAGING_DIR_TARGET}${exec_prefix} --bits=32
50 oe_runmake libpseudo 56 oe_runmake ${MAKEOPTS} libpseudo
51 # prevent it from removing the lib, but remove everything else 57 # prevent it from removing the lib, but remove everything else
52 make 'LIB=foo' distclean 58 make 'LIB=foo' ${MAKEOPTS} distclean
53 fi 59 fi
54} 60}
55 61
56do_install () { 62do_install () {
57 oe_runmake 'DESTDIR=${D}' 'LIB=lib/pseudo/lib$(MARK64)' install 63 oe_runmake 'DESTDIR=${D}' ${MAKEOPTS} 'LIB=lib/pseudo/lib$(MARK64)' install
58} 64}
59 65
60# Two below are the same 66# Two below are the same