<div dir="ltr">Fixes for all 3 sent to oe-devel ML, thanks for review and test with world.</div><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">On Tue, Jan 28, 2020 at 12:39 AM Khem Raj <<a href="mailto:raj.khem@gmail.com">raj.khem@gmail.com</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">On Mon, Jan 27, 2020 at 7:43 AM Martin Jansa <<a href="mailto:martin.jansa@gmail.com" target="_blank">martin.jansa@gmail.com</a>> wrote:<br>
><br>
> * instead of installing all 51 nspr header files directly in ${includedir}<br>
><br>
> * ubuntu uses /usr/include/nspr as well as shown in:<br>
> <a href="https://packages.ubuntu.com/xenial/amd64/libnspr4-dev/filelist" rel="noreferrer" target="_blank">https://packages.ubuntu.com/xenial/amd64/libnspr4-dev/filelist</a><br>
> and some components assume the same path<br>
><br>
> * update nss configure to find them, similar change might be needed in<br>
> mozjs and ecryptfs-utils<br>
<br>
It does come with some userspace fallouts<br>
<br>
<a href="https://errors.yoctoproject.org/Errors/Details/308323/" rel="noreferrer" target="_blank">https://errors.yoctoproject.org/Errors/Details/308323/</a><br>
<a href="https://errors.yoctoproject.org/Errors/Details/308321/" rel="noreferrer" target="_blank">https://errors.yoctoproject.org/Errors/Details/308321/</a><br>
<a href="https://errors.yoctoproject.org/Errors/Details/308320/" rel="noreferrer" target="_blank">https://errors.yoctoproject.org/Errors/Details/308320/</a><br>
<br>
<br>
><br>
> Signed-off-by: Martin Jansa <<a href="mailto:Martin.Jansa@gmail.com" target="_blank">Martin.Jansa@gmail.com</a>><br>
> ---<br>
> meta/recipes-support/nspr/nspr/<a href="http://nspr.pc.in" rel="noreferrer" target="_blank">nspr.pc.in</a> | 2 +-<br>
> meta/recipes-support/nspr/<a href="http://nspr_4.24.bb" rel="noreferrer" target="_blank">nspr_4.24.bb</a> | 4 ++++<br>
> meta/recipes-support/nss/nss/<a href="http://nss.pc.in" rel="noreferrer" target="_blank">nss.pc.in</a> | 2 +-<br>
> meta/recipes-support/nss/<a href="http://nss_3.49.1.bb" rel="noreferrer" target="_blank">nss_3.49.1.bb</a> | 4 +++-<br>
> 4 files changed, 9 insertions(+), 3 deletions(-)<br>
><br>
> diff --git a/meta/recipes-support/nspr/nspr/<a href="http://nspr.pc.in" rel="noreferrer" target="_blank">nspr.pc.in</a> b/meta/recipes-support/nspr/nspr/<a href="http://nspr.pc.in" rel="noreferrer" target="_blank">nspr.pc.in</a><br>
> index d74caabe4c..1f15d19cfa 100644<br>
> --- a/meta/recipes-support/nspr/nspr/<a href="http://nspr.pc.in" rel="noreferrer" target="_blank">nspr.pc.in</a><br>
> +++ b/meta/recipes-support/nspr/nspr/<a href="http://nspr.pc.in" rel="noreferrer" target="_blank">nspr.pc.in</a><br>
> @@ -8,4 +8,4 @@ Name: NSPR<br>
> Description: The Netscape Portable Runtime<br>
> Version: NSPRVERSION<br>
> Libs: -L${libdir} -lplds4 -lplc4 -lnspr4 -lpthread -ldl<br>
> -Cflags:<br>
> +Cflags: -I${includedir}/nspr<br>
> diff --git a/meta/recipes-support/nspr/<a href="http://nspr_4.24.bb" rel="noreferrer" target="_blank">nspr_4.24.bb</a> b/meta/recipes-support/nspr/<a href="http://nspr_4.24.bb" rel="noreferrer" target="_blank">nspr_4.24.bb</a><br>
> index 5f823f8941..e98fe83ed3 100644<br>
> --- a/meta/recipes-support/nspr/<a href="http://nspr_4.24.bb" rel="noreferrer" target="_blank">nspr_4.24.bb</a><br>
> +++ b/meta/recipes-support/nspr/<a href="http://nspr_4.24.bb" rel="noreferrer" target="_blank">nspr_4.24.bb</a><br>
> @@ -156,6 +156,10 @@ MULTILIB_SCRIPTS = "${PN}-dev:${bindir}/nspr-config"<br>
> PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}"<br>
> PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6,"<br>
><br>
> +# Do not install nspr in usr/include, but in usr/include/nspr, the<br>
> +# preferred path upstream.<br>
> +EXTRA_OECONF += "--includedir=${includedir}/nspr"<br>
> +<br>
> do_compile_prepend() {<br>
> oe_runmake CROSS_COMPILE=1 CFLAGS="-DXP_UNIX ${BUILD_CFLAGS}" LDFLAGS="" CC="${BUILD_CC}" -C config export<br>
> }<br>
> diff --git a/meta/recipes-support/nss/nss/<a href="http://nss.pc.in" rel="noreferrer" target="_blank">nss.pc.in</a> b/meta/recipes-support/nss/nss/<a href="http://nss.pc.in" rel="noreferrer" target="_blank">nss.pc.in</a><br>
> index 200f635c65..402b4ecb33 100644<br>
> --- a/meta/recipes-support/nss/nss/<a href="http://nss.pc.in" rel="noreferrer" target="_blank">nss.pc.in</a><br>
> +++ b/meta/recipes-support/nss/nss/<a href="http://nss.pc.in" rel="noreferrer" target="_blank">nss.pc.in</a><br>
> @@ -7,5 +7,5 @@ Name: NSS<br>
> Description: Network Security Services<br>
> Version: %NSS_VERSION%<br>
> Requires: nspr >= %NSPR_VERSION%<br>
> -Libs: -lssl3 -lsmime3 -lnss3 -lsoftokn3 -lnssutil3<br>
> +Libs: -L${libdir} -lssl3 -lsmime3 -lnss3 -lsoftokn3 -lnssutil3<br>
> Cflags: -IOEINCDIR<br>
> diff --git a/meta/recipes-support/nss/<a href="http://nss_3.49.1.bb" rel="noreferrer" target="_blank">nss_3.49.1.bb</a> b/meta/recipes-support/nss/<a href="http://nss_3.49.1.bb" rel="noreferrer" target="_blank">nss_3.49.1.bb</a><br>
> index 94f4b88fa5..b16ade9f62 100644<br>
> --- a/meta/recipes-support/nss/<a href="http://nss_3.49.1.bb" rel="noreferrer" target="_blank">nss_3.49.1.bb</a><br>
> +++ b/meta/recipes-support/nss/<a href="http://nss_3.49.1.bb" rel="noreferrer" target="_blank">nss_3.49.1.bb</a><br>
> @@ -52,7 +52,7 @@ do_configure_prepend_libc-musl () {<br>
> }<br>
><br>
> do_compile_prepend_class-native() {<br>
> - export NSPR_INCLUDE_DIR=${STAGING_INCDIR_NATIVE}<br>
> + export NSPR_INCLUDE_DIR=${STAGING_INCDIR_NATIVE}/nspr<br>
> export NSPR_LIB_DIR=${STAGING_LIBDIR_NATIVE}<br>
> export NSS_ENABLE_WERROR=0<br>
> }<br>
> @@ -67,6 +67,8 @@ do_compile_prepend_class-native() {<br>
> }<br>
><br>
> do_compile() {<br>
> + export NSPR_INCLUDE_DIR=${STAGING_INCDIR}/nspr<br>
> +<br>
> export CROSS_COMPILE=1<br>
> export NATIVE_CC="${BUILD_CC}"<br>
> # Additional defines needed on Centos 7<br>
> --<br>
> 2.20.1<br>
><br>
> --<br>
> _______________________________________________<br>
> Openembedded-core mailing list<br>
> <a href="mailto:Openembedded-core@lists.openembedded.org" target="_blank">Openembedded-core@lists.openembedded.org</a><br>
> <a href="http://lists.openembedded.org/mailman/listinfo/openembedded-core" rel="noreferrer" target="_blank">http://lists.openembedded.org/mailman/listinfo/openembedded-core</a><br>
</blockquote></div>