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:11:20 +0000 |
commit | 77eb2bac5645183dcfc65485368cf4002b933b4e (patch) | |
tree | 23b4fabae2f720a92104dc08bce7e6d89bd2521c /meta/recipes-support | |
parent | a57648c8bff2648c8bb7278ce507246c601daffd (diff) | |
download | poky-77eb2bac5645183dcfc65485368cf4002b933b4e.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
(From OE-Core rev: 274128830a9d52bdd2827cc0a323d575025ce62f)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support')
-rw-r--r-- | meta/recipes-support/nspr/nspr/nspr.pc.in | 2 | ||||
-rw-r--r-- | meta/recipes-support/nspr/nspr_4.24.bb | 4 | ||||
-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 |
4 files changed, 9 insertions, 3 deletions
diff --git a/meta/recipes-support/nspr/nspr/nspr.pc.in b/meta/recipes-support/nspr/nspr/nspr.pc.in index d74caabe4c..1f15d19cfa 100644 --- a/meta/recipes-support/nspr/nspr/nspr.pc.in +++ b/meta/recipes-support/nspr/nspr/nspr.pc.in | |||
@@ -8,4 +8,4 @@ Name: NSPR | |||
8 | Description: The Netscape Portable Runtime | 8 | Description: The Netscape Portable Runtime |
9 | Version: NSPRVERSION | 9 | Version: NSPRVERSION |
10 | Libs: -L${libdir} -lplds4 -lplc4 -lnspr4 -lpthread -ldl | 10 | Libs: -L${libdir} -lplds4 -lplc4 -lnspr4 -lpthread -ldl |
11 | Cflags: | 11 | Cflags: -I${includedir}/nspr |
diff --git a/meta/recipes-support/nspr/nspr_4.24.bb b/meta/recipes-support/nspr/nspr_4.24.bb index 5f823f8941..e98fe83ed3 100644 --- a/meta/recipes-support/nspr/nspr_4.24.bb +++ b/meta/recipes-support/nspr/nspr_4.24.bb | |||
@@ -156,6 +156,10 @@ MULTILIB_SCRIPTS = "${PN}-dev:${bindir}/nspr-config" | |||
156 | PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}" | 156 | PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}" |
157 | PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," | 157 | PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," |
158 | 158 | ||
159 | # Do not install nspr in usr/include, but in usr/include/nspr, the | ||
160 | # preferred path upstream. | ||
161 | EXTRA_OECONF += "--includedir=${includedir}/nspr" | ||
162 | |||
159 | do_compile_prepend() { | 163 | do_compile_prepend() { |
160 | oe_runmake CROSS_COMPILE=1 CFLAGS="-DXP_UNIX ${BUILD_CFLAGS}" LDFLAGS="" CC="${BUILD_CC}" -C config export | 164 | oe_runmake CROSS_COMPILE=1 CFLAGS="-DXP_UNIX ${BUILD_CFLAGS}" LDFLAGS="" CC="${BUILD_CC}" -C config export |
161 | } | 165 | } |
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 | |||
7 | Description: Network Security Services | 7 | Description: Network Security Services |
8 | Version: %NSS_VERSION% | 8 | Version: %NSS_VERSION% |
9 | Requires: nspr >= %NSPR_VERSION% | 9 | Requires: nspr >= %NSPR_VERSION% |
10 | Libs: -lssl3 -lsmime3 -lnss3 -lsoftokn3 -lnssutil3 | 10 | Libs: -L${libdir} -lssl3 -lsmime3 -lnss3 -lsoftokn3 -lnssutil3 |
11 | Cflags: -IOEINCDIR | 11 | 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 () { | |||
52 | } | 52 | } |
53 | 53 | ||
54 | do_compile_prepend_class-native() { | 54 | do_compile_prepend_class-native() { |
55 | export NSPR_INCLUDE_DIR=${STAGING_INCDIR_NATIVE} | 55 | export NSPR_INCLUDE_DIR=${STAGING_INCDIR_NATIVE}/nspr |
56 | export NSPR_LIB_DIR=${STAGING_LIBDIR_NATIVE} | 56 | export NSPR_LIB_DIR=${STAGING_LIBDIR_NATIVE} |
57 | export NSS_ENABLE_WERROR=0 | 57 | export NSS_ENABLE_WERROR=0 |
58 | } | 58 | } |
@@ -67,6 +67,8 @@ do_compile_prepend_class-native() { | |||
67 | } | 67 | } |
68 | 68 | ||
69 | do_compile() { | 69 | do_compile() { |
70 | export NSPR_INCLUDE_DIR=${STAGING_INCDIR}/nspr | ||
71 | |||
70 | export CROSS_COMPILE=1 | 72 | export CROSS_COMPILE=1 |
71 | export NATIVE_CC="${BUILD_CC}" | 73 | export NATIVE_CC="${BUILD_CC}" |
72 | # Additional defines needed on Centos 7 | 74 | # Additional defines needed on Centos 7 |