From 40aa2bb0abcebc70e5fdf508b77ab1ae3b2ca611 Mon Sep 17 00:00:00 2001 From: Jesse Gilles Date: Tue, 21 Jul 2015 13:35:45 -0500 Subject: monit: fix ssl configure flags --- recipes-extended/monit/monit_5.12.2.bb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/recipes-extended/monit/monit_5.12.2.bb b/recipes-extended/monit/monit_5.12.2.bb index 2774e29..017ac75 100644 --- a/recipes-extended/monit/monit_5.12.2.bb +++ b/recipes-extended/monit/monit_5.12.2.bb @@ -16,7 +16,11 @@ SRC_URI[sha256sum] = "8ab0296d1aa2351b1573481592d7b5e06de1edd49dff1b5552839605a4 inherit autotools -EXTRA_OECONF_armv5 += "libmonit_cv_setjmp_available=yes libmonit_cv_vsnprintf_c99_conformant=yes" +EXTRA_OECONF += "--with-ssl-lib-dir=${STAGING_LIBDIR} \ + --with-ssl-incl-dir=${STAGING_INCDIR} \ + " + +EXTRA_OECONF_append_armv5 = " libmonit_cv_setjmp_available=yes libmonit_cv_vsnprintf_c99_conformant=yes " inherit update-rc.d -- cgit v1.2.3 From 138785b17506fe1eec23b7f463c3f32919ac8e88 Mon Sep 17 00:00:00 2001 From: Jesse Gilles Date: Tue, 21 Jul 2015 13:58:31 -0500 Subject: nodejs-0.8.28: fix PROVIDES to avoid conflict with meta-nodejs --- recipes-devtools/nodejs/nodejs_0.8.28.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/recipes-devtools/nodejs/nodejs_0.8.28.bb b/recipes-devtools/nodejs/nodejs_0.8.28.bb index 96b01cb..6c9de2f 100644 --- a/recipes-devtools/nodejs/nodejs_0.8.28.bb +++ b/recipes-devtools/nodejs/nodejs_0.8.28.bb @@ -4,6 +4,8 @@ LICENSE = "MIT & BSD" LIC_FILES_CHKSUM = "file://LICENSE;md5=95a589a3257ab7dfe37d8a8379e3c72d" DEPENDS = "openssl" +PROVIDES = "virtual/node" +RPROVIDES_${PN} = "node" # use newer npm version that supports caret (^) versions # https://github.com/npm/npm/issues/4849 -- cgit v1.2.3