diff options
author | Martin Jansa <martin.jansa@gmail.com> | 2020-01-27 16:43:30 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-01-28 11:07:54 +0000 |
commit | 274128830a9d52bdd2827cc0a323d575025ce62f (patch) | |
tree | f3174b7315f9180bda2a4dc12e451125387b03cb /meta/recipes-support/nss | |
parent | 96c286a1b2f9fc8e8bf4fb29ae62551a323af5c3 (diff) | |
download | openembedded-core-274128830a9d52bdd2827cc0a323d575025ce62f.tar.gz |
nspr, nss: use ${includedir}/nspr like e.g. ubuntu does
* instead of installing all 51 nspr header files directly in ${includedir}
* ubuntu uses /usr/include/nspr as well as shown in:
https://packages.ubuntu.com/xenial/amd64/libnspr4-dev/filelist
and some components assume the same path
* update nss configure to find them, similar change might be needed in
mozjs and ecryptfs-utils
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support/nss')
-rw-r--r-- | meta/recipes-support/nss/nss/nss.pc.in | 2 | ||||
-rw-r--r-- | meta/recipes-support/nss/nss_3.49.1.bb | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/meta/recipes-support/nss/nss/nss.pc.in b/meta/recipes-support/nss/nss/nss.pc.in index 200f635c65..402b4ecb33 100644 --- a/meta/recipes-support/nss/nss/nss.pc.in +++ b/meta/recipes-support/nss/nss/nss.pc.in @@ -7,5 +7,5 @@ Name: NSS Description: Network Security Services Version: %NSS_VERSION% Requires: nspr >= %NSPR_VERSION% -Libs: -lssl3 -lsmime3 -lnss3 -lsoftokn3 -lnssutil3 +Libs: -L${libdir} -lssl3 -lsmime3 -lnss3 -lsoftokn3 -lnssutil3 Cflags: -IOEINCDIR diff --git a/meta/recipes-support/nss/nss_3.49.1.bb b/meta/recipes-support/nss/nss_3.49.1.bb index 94f4b88fa5..b16ade9f62 100644 --- a/meta/recipes-support/nss/nss_3.49.1.bb +++ b/meta/recipes-support/nss/nss_3.49.1.bb @@ -52,7 +52,7 @@ do_configure_prepend_libc-musl () { } do_compile_prepend_class-native() { - export NSPR_INCLUDE_DIR=${STAGING_INCDIR_NATIVE} + export NSPR_INCLUDE_DIR=${STAGING_INCDIR_NATIVE}/nspr export NSPR_LIB_DIR=${STAGING_LIBDIR_NATIVE} export NSS_ENABLE_WERROR=0 } @@ -67,6 +67,8 @@ do_compile_prepend_class-native() { } do_compile() { + export NSPR_INCLUDE_DIR=${STAGING_INCDIR}/nspr + export CROSS_COMPILE=1 export NATIVE_CC="${BUILD_CC}" # Additional defines needed on Centos 7 |