Patchwork pseudo: fix library path in FILES_${PN}

login
register
mail settings
Submitter rongqing.li@windriver.com
Date Oct. 29, 2013, 4:54 a.m.
Message ID <1383022443-4171-1-git-send-email-rongqing.li@windriver.com>
Download mbox | patch
Permalink /patch/60679/
State Accepted
Commit 47c7850c025994685aa1811057f4f9a5f0f2a3ae
Headers show

Comments

rongqing.li@windriver.com - Oct. 29, 2013, 4:54 a.m.
From: Roy Li <rongqing.li@windriver.com>

libpseudo.so is always installed into ${prefix}/lib/, not ${libdir},
so fix these paths; and skip libdir WARN_QA checking to ignore the
warning in 64bit and multilib enabled system

Signed-off-by: Roy Li <rongqing.li@windriver.com>
---
 meta/recipes-devtools/pseudo/pseudo.inc |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)
Khem Raj - Oct. 29, 2013, 11:03 p.m.
On Mon, Oct 28, 2013 at 9:54 PM,  <rongqing.li@windriver.com> wrote:
> -FILES_${PN} = "${libdir}/pseudo/lib*/libpseudo.so ${bindir}/* ${localstatedir}/pseudo ${prefix}/var/pseudo"
> -FILES_${PN}-dbg += "${libdir}/pseudo/lib*/.debug"
> +FILES_${PN} = "${prefix}/lib/pseudo/lib*/libpseudo.so ${bindir}/* ${localstatedir}/pseudo ${prefix}/var/pseudo"
> +FILES_${PN}-dbg += "${prefix}/lib/pseudo/lib*/.debug"
> +INSANE_SKIP_${PN} += "libdir"
> +INSANE_SKIP_${PN}-dbg += "libdir"
> +

may be you can use ${nonarch_base_libdir} instead of hardcoding
Richard Purdie - Oct. 30, 2013, 10:43 a.m.
On Tue, 2013-10-29 at 16:03 -0700, Khem Raj wrote:
> On Mon, Oct 28, 2013 at 9:54 PM,  <rongqing.li@windriver.com> wrote:
> > -FILES_${PN} = "${libdir}/pseudo/lib*/libpseudo.so ${bindir}/* ${localstatedir}/pseudo ${prefix}/var/pseudo"
> > -FILES_${PN}-dbg += "${libdir}/pseudo/lib*/.debug"
> > +FILES_${PN} = "${prefix}/lib/pseudo/lib*/libpseudo.so ${bindir}/* ${localstatedir}/pseudo ${prefix}/var/pseudo"
> > +FILES_${PN}-dbg += "${prefix}/lib/pseudo/lib*/.debug"
> > +INSANE_SKIP_${PN} += "libdir"
> > +INSANE_SKIP_${PN}-dbg += "libdir"
> > +
> 
> may be you can use ${nonarch_base_libdir} instead of hardcoding

It is pointless using that expression if the path is hardcoded into the
source though, which in this case, I suspect it is :(

Cheers,

Richard
rongqing.li@windriver.com - Oct. 31, 2013, 12:45 a.m.
On 10/30/2013 06:43 PM, Richard Purdie wrote:
> On Tue, 2013-10-29 at 16:03 -0700, Khem Raj wrote:
>> On Mon, Oct 28, 2013 at 9:54 PM,  <rongqing.li@windriver.com> wrote:
>>> -FILES_${PN} = "${libdir}/pseudo/lib*/libpseudo.so ${bindir}/* ${localstatedir}/pseudo ${prefix}/var/pseudo"
>>> -FILES_${PN}-dbg += "${libdir}/pseudo/lib*/.debug"
>>> +FILES_${PN} = "${prefix}/lib/pseudo/lib*/libpseudo.so ${bindir}/* ${localstatedir}/pseudo ${prefix}/var/pseudo"
>>> +FILES_${PN}-dbg += "${prefix}/lib/pseudo/lib*/.debug"
>>> +INSANE_SKIP_${PN} += "libdir"
>>> +INSANE_SKIP_${PN}-dbg += "libdir"
>>> +
>>
>> may be you can use ${nonarch_base_libdir} instead of hardcoding
>
> It is pointless using that expression if the path is hardcoded into the
> source though, which in this case, I suspect it is :(
>
> Cheers,


It is true, if we use ${nonarch_base_libdir}, we need to change the all:

lirq@lirq-OptiPlex-780:/home/prj/oe-core/meta/recipes-devtools/pseudo$ 
grep "${prefix}/lib" ./ -r
./pseudo.inc:FILES_${PN} = "${prefix}/lib/pseudo/lib*/libpseudo.so 
${bindir}/* ${localstatedir}/pseudo ${prefix}/var/pseudo"
./pseudo.inc:FILES_${PN}-dbg += "${prefix}/lib/pseudo/lib*/.debug"
./pseudo.inc:	  ${S}/configure ${PSEUDO_EXTRA_OPTS} --prefix=${prefix} 
--libdir=${prefix}/lib/pseudo/lib${SITEINFO_BITS} 
--with-sqlite-lib=${baselib} 
--with-sqlite=${STAGING_DIR_TARGET}${exec_prefix} --cflags="${CFLAGS}" 
--bits=${SITEINFO_BITS} --enable-static-sqlite --without-rpath
./pseudo.inc:	  ${S}/configure ${PSEUDO_EXTRA_OPTS} --prefix=${prefix} 
--libdir=${prefix}/lib/pseudo/lib --with-sqlite-lib=${baselib} 
--with-sqlite=${STAGING_DIR_TARGET}${exec_prefix} --cflags="${CFLAGS}" 
--bits=${SITEINFO_BITS} --enable-static-sqlite --without-rpath
./pseudo.inc:		./configure ${PSEUDO_EXTRA_OPTS} --prefix=${prefix} 
--libdir=${prefix}/lib/pseudo/lib --with-sqlite-lib=${baselib} 
--with-sqlite=${STAGING_DIR_TARGET}${exec_prefix} --bits=32 --without-rpath
./pseudo.inc:		./configure ${PSEUDO_EXTRA_OPTS} --prefix=${prefix} 
--libdir=${prefix}/lib/pseudo/lib --with-sqlite-lib=${baselib} 
--with-sqlite=${STAGING_DIR_TARGET}${exec_prefix} --bits=32 --without-rpath
./pseudo.inc:	oe_runmake 'DESTDIR=${D}' ${MAKEOPTS} 
'LIB=lib/pseudo/lib$(MARK64)' install
./pseudo.inc:		mkdir -p ${D}${prefix}/lib/pseudo/lib
./pseudo.inc:		cp lib/pseudo/lib/libpseudo.so ${D}${prefix}/lib/pseudo/lib/.
./pseudo.inc:		mkdir -p ${D}${prefix}/lib/pseudo/lib
./pseudo.inc:		cp lib/pseudo/lib/libpseudo.so ${D}${prefix}/lib/pseudo/lib/.
lirq@lirq-OptiPlex-780:/home/prj/oe-core/meta/recipes-devtools/pseudo$


-Roy

>
> Richard
>
>
>

Patch

diff --git a/meta/recipes-devtools/pseudo/pseudo.inc b/meta/recipes-devtools/pseudo/pseudo.inc
index 0471cd6..9411c57 100644
--- a/meta/recipes-devtools/pseudo/pseudo.inc
+++ b/meta/recipes-devtools/pseudo/pseudo.inc
@@ -13,8 +13,11 @@  SRC_URI_append_class-nativesdk = " file://symver.patch"
 
 SRC_URI_append_class-native = " file://symver.patch"
 
-FILES_${PN} = "${libdir}/pseudo/lib*/libpseudo.so ${bindir}/* ${localstatedir}/pseudo ${prefix}/var/pseudo"
-FILES_${PN}-dbg += "${libdir}/pseudo/lib*/.debug"
+FILES_${PN} = "${prefix}/lib/pseudo/lib*/libpseudo.so ${bindir}/* ${localstatedir}/pseudo ${prefix}/var/pseudo"
+FILES_${PN}-dbg += "${prefix}/lib/pseudo/lib*/.debug"
+INSANE_SKIP_${PN} += "libdir"
+INSANE_SKIP_${PN}-dbg += "libdir"
+
 PROVIDES += "virtual/fakeroot"
 
 MAKEOPTS = ""