From 274128830a9d52bdd2827cc0a323d575025ce62f Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Mon, 27 Jan 2020 16:43:30 +0100 Subject: 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 Signed-off-by: Richard Purdie --- meta/recipes-support/nspr/nspr/nspr.pc.in | 2 +- meta/recipes-support/nspr/nspr_4.24.bb | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) (limited to 'meta/recipes-support/nspr') 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 Description: The Netscape Portable Runtime Version: NSPRVERSION Libs: -L${libdir} -lplds4 -lplc4 -lnspr4 -lpthread -ldl -Cflags: +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" PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}" PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," +# Do not install nspr in usr/include, but in usr/include/nspr, the +# preferred path upstream. +EXTRA_OECONF += "--includedir=${includedir}/nspr" + do_compile_prepend() { oe_runmake CROSS_COMPILE=1 CFLAGS="-DXP_UNIX ${BUILD_CFLAGS}" LDFLAGS="" CC="${BUILD_CC}" -C config export } -- cgit 1.2.3-korg