mozjs: search nspr header files in ${STAGING_INCDIR}/nspr directory
PATCH 1/3 mozjs: search nspr header files in ${STAGING_INCDIR}/nspr directory
Signed-off-by Martin Jansa <[email protected]>
--- meta-oe/recipes-extended/mozjs/mozjs_60.9.0.bb | 1 + 1 file changed, 1 insertion(+)
meta-oe/recipes-extended/mozjs/mozjs_60.9.0.bb +1 -0
@@ -53,6 +53,7 @@ EXTRA_OECONF = " \ --libdir=${libdir} \ --disable-tests --disable-strip --disable-optimize \ --disable-jemalloc \ + --with-nspr-cflags='-I${STAGING_INCDIR}/nspr -I${STAGING_INCDIR}/nss3' \ --with-nspr-libs='-lplds4 -lplc4 -lnspr4' \ ${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', "--enable-gold", '--disable-gold', d)} \ "
Signature · 1 line
2.20.1
PATCH 2/3 ypbind-mt: search nspr header files in ${STAGING_INCDIR}/nspr
Signed-off-by Martin Jansa <[email protected]>
--- meta-networking/recipes-support/nis/ypbind-mt_2.6.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta-networking/recipes-support/nis/ypbind-mt_2.6.bb +1 -1
@@ -45,7 +45,7 @@ INITSCRIPT_PARAMS = "start 44 3 5 . stop 70 0 1 2 6 ." CACHED_CONFIGUREVARS = "ac_cv_prog_STRIP=/bin/true" -CFLAGS_append_libc-musl = " -I${STAGING_INCDIR}/nss3" +CFLAGS_append = " -I${STAGING_INCDIR}/nss3 -I${STAGING_INCDIR}/nspr" do_install_append () { install -d ${D}${sysconfdir}/init.d
Signature · 1 line
2.20.1
PATCH 3/3 xmlsec1: search nspr header files in ${STAGING_INCDIR}/nspr
In reply to Martin Jansa* the --with-nspr/--with-nss should be just ${prefix} as mentioned in:
https://www.aleksey.com/pipermail/xmlsec/2005/007172.html
remove the change-finding-path-of-nss.patch parts handling nspr and handling incorrect --with-nspr/--with-nss value in the recipe missing "/usr" prefix
Signed-off-by Martin Jansa <[email protected]>
--- .../xmlsec1/change-finding-path-of-nss.patch | 44 +------------------ .../recipes-support/xmlsec1/xmlsec1_1.2.29.bb | 6 +-- 2 files changed, 5 insertions(+), 45 deletions(-)
meta-oe/recipes-support/xmlsec1/xmlsec1/change-finding-path-of-nss.patch +2 -42
@@ -16,12 +16,8 @@ diff --git a/configure.ac b/configure.ac index 951b3eb..1fdeb0f 100644 --- a/configure.ac +++ b/configure.ac -@@ -866,10 +866,10 @@ MOZILLA_MIN_VERSION="1.4" - NSS_CRYPTO_LIB="$XMLSEC_PACKAGE-nss" - NSPR_PACKAGE=mozilla-nspr - NSS_PACKAGE=mozilla-nss --NSPR_INCLUDE_MARKER="nspr/nspr.h" -+NSPR_INCLUDE_MARKER="nspr.h" +@@ -866,7 +866,7 @@ MOZILLA_MIN_VERSION="1.4" + NSPR_INCLUDE_MARKER="nspr/nspr.h" NSPR_LIB_MARKER="libnspr4$shrext" NSPR_LIBS_LIST="-lnspr4 -lplds4 -lplc4" -NSS_INCLUDE_MARKER="nss/nss.h"
@@ -29,39 +25,3 @@ index 951b3eb..1fdeb0f 100644 NSS_LIB_MARKER="libnss3$shrext" NSS_LIBS_LIST="-lnss3 -lsmime3" -@@ -898,24 +898,24 @@ fi - dnl Priority 1: User specifies the path to installation - if test "z$NSPR_FOUND" = "zno" -a "z$with_nspr" != "z" -a "z$with_nspr" != "zyes" ; then - AC_MSG_CHECKING(for nspr library installation in "$with_nspr" folder) -- if test -f "$with_nspr/include/$NSPR_INCLUDE_MARKER" -a -f "$with_nspr/lib/$NSPR_LIB_MARKER" ; then -- NSPR_INCLUDE_PATH="$with_nspr/include" -- NSPR_LIB_PATH="$with_nspr/lib" -+ if test -f "$with_nspr/usr/include/$NSPR_INCLUDE_MARKER" -a -f "$with_nspr/${libdir}/$NSPR_LIB_MARKER" ; then -+ NSPR_INCLUDE_PATH="$with_nspr/usr/include" -+ NSPR_LIB_PATH="$with_nspr/${libdir}" - NSPR_FOUND="yes" - AC_MSG_RESULT([yes]) - else -- AC_MSG_ERROR([not found: "$with_nspr/include/$NSPR_INCLUDE_MARKER" and/or "$with_nspr/lib/$NSPR_LIB_MARKER" files don't exist), typo?]) -+ AC_MSG_ERROR([not found: "$with_nspr/usr/include/$NSPR_INCLUDE_MARKER" and/or "$with_nspr/${libdir}/$NSPR_LIB_MARKER" files don't exist), typo?]) - fi - fi - if test "z$NSS_FOUND" = "zno" -a "z$with_nss" != "z" -a "z$with_nss" != "zyes" ; then - AC_MSG_CHECKING(for nss library installation in "$with_nss" folder) -- if test -f "$with_nss/include/$NSS_INCLUDE_MARKER" -a -f "$with_nss/lib/$NSS_LIB_MARKER" ; then -- NSS_INCLUDE_PATH="$with_nss/include" -- NSS_LIB_PATH="$with_nss/lib" -+ if test -f "$with_nss/usr/include/$NSS_INCLUDE_MARKER" -a -f "$with_nss/${libdir}/$NSS_LIB_MARKER" ; then -+ NSS_INCLUDE_PATH="$with_nss/usr/include/nss3" -+ NSS_LIB_PATH="$with_nss/${libdir}" - NSS_FOUND="yes" - AC_MSG_RESULT([yes]) - else -- AC_MSG_ERROR([not found: "$with_nss/include/$NSS_INCLUDE_MARKER" and/or "$with_nss/lib/$NSS_LIB_MARKER" files don't exist), typo?]) -+ AC_MSG_ERROR([not found: "$with_nss/usr/include/$NSS_INCLUDE_MARKER" and/or "$with_nss/${libdir}/$NSS_LIB_MARKER" files don't exist), typo?]) - fi - fi - --- -2.7.4 -
meta-oe/recipes-support/xmlsec1/xmlsec1_1.2.29.bb +3 -3
@@ -25,13 +25,13 @@ SRC_URI[sha256sum] = "b1d1deba966019930f608d1f2b95c40ca3450f1393bcd3a3c001a8ba1d inherit autotools-brokensep ptest pkgconfig -CFLAGS += "-I${STAGING_INCDIR}/nspr4 -I${STAGING_INCDIR}/nss3" -CPPFLAGS += "-I${STAGING_INCDIR}/nspr4 -I${STAGING_INCDIR}/nss3" +#CFLAGS += "-I${STAGING_INCDIR}/nss3" +#CPPFLAGS += "-I${STAGING_INCDIR}/nss3" PACKAGECONFIG ??= "gnutls libgcrypt nss openssl des" PACKAGECONFIG[gnutls] = ",,gnutls" PACKAGECONFIG[libgcrypt] = ",,libgcrypt" -PACKAGECONFIG[nss] = "--with-nss=${STAGING_LIBDIR}/../.. --with-nspr=${STAGING_LIBDIR}/../..,,nss nspr" +PACKAGECONFIG[nss] = "--with-nss=${STAGING_LIBDIR}/.. --with-nspr=${STAGING_LIBDIR}/..,,nss nspr" PACKAGECONFIG[openssl] = ",,openssl" PACKAGECONFIG[des] = ",--disable-des,,"
Signature · 1 line
2.20.1