Op 7 aug. 2012, om 19:31 heeft Yao Zhao <yao.z...@windriver.com> het volgende
geschreven:
> In order to fix the QA Issue for libpam which installed to /lib but
> reference /usr/libxx/libz and libcrack, install libz and libcrack
> to /lib.
>
> Signed-off-by: Yao Zhao <yao.z...@windriver.com>
> ---
> meta/recipes-core/zlib/zlib_1.2.7.bb | 8 ++++++--
> meta/recipes-extended/cracklib/cracklib_2.8.19.bb | 2 ++
> 2 files changed, 8 insertions(+), 2 deletions(-)
>
> diff --git a/meta/recipes-core/zlib/zlib_1.2.7.bb
> b/meta/recipes-core/zlib/zlib_1.2.7.bb
> index 803fec3..d351437 100644
> --- a/meta/recipes-core/zlib/zlib_1.2.7.bb
> +++ b/meta/recipes-core/zlib/zlib_1.2.7.bb
> @@ -13,7 +13,8 @@ SRC_URI[md5sum] = "2ab442d169156f34c379c968f3f482dd"
> SRC_URI[sha256sum] =
> "49e2e9658dfb036900da6ea0267a737fa3c4eee6666776d378c79d52e9334934"
>
> do_configure (){
> - ./configure --prefix=${prefix} --shared --libdir=${libdir}
> + #sharedlibdir sets to {libdir} if not set
> + ./configure --prefix=${prefix} --shared --libdir="${base_libdir}"
> }
>
> do_compile (){
> @@ -21,7 +22,10 @@ do_compile (){
> }
>
> do_install() {
> - oe_runmake DESTDIR=${D} install
> + #libz.a installs to libdir, overwrite the env libdir
> + #install pkgconfig to env libdir/pkgconfig
> + oe_runmake DESTDIR=${D} pkgconfigdir="${libdir}/pkgconfig" \
> + libdir="${base_libdir}" install
> }
>
> BBCLASSEXTEND = "native nativesdk"
> diff --git a/meta/recipes-extended/cracklib/cracklib_2.8.19.bb
> b/meta/recipes-extended/cracklib/cracklib_2.8.19.bb
> index 2951396..aca6211 100644
> --- a/meta/recipes-extended/cracklib/cracklib_2.8.19.bb
> +++ b/meta/recipes-extended/cracklib/cracklib_2.8.19.bb
> @@ -15,3 +15,5 @@ SRC_URI[md5sum] = "ca0ec168d9c6466612204e8dfb2df8a9"
> SRC_URI[sha256sum] =
> "7086b0ca23f875c9cd9ea2a993c262384b274dba9c4ea1da845ec8ac290748a9"
>
> inherit autotools gettext
> +
> +libdir = "${base_libdir}"
Again, missing PR bump and missing buildhistory diffs.
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
