diff options
| author | Jason Reiss <jreiss@multitech.com> | 2015-07-22 15:17:35 -0500 |
|---|---|---|
| committer | Jason Reiss <jreiss@multitech.com> | 2015-07-22 15:17:35 -0500 |
| commit | 0704c8e4edacd9994f5ffe6fbd7138e7b72e0c61 (patch) | |
| tree | dba4879bc73a5d352708ce45f9cbc5336d6ea938 | |
| parent | 0914807c022cac32bf41e06e765f6c3da6752d79 (diff) | |
| parent | 138785b17506fe1eec23b7f463c3f32919ac8e88 (diff) | |
| download | meta-mlinux-0704c8e4edacd9994f5ffe6fbd7138e7b72e0c61.tar.gz meta-mlinux-0704c8e4edacd9994f5ffe6fbd7138e7b72e0c61.tar.bz2 meta-mlinux-0704c8e4edacd9994f5ffe6fbd7138e7b72e0c61.zip | |
Merge branch 'master' of git://git.multitech.net/meta-mlinux
| -rw-r--r-- | recipes-devtools/nodejs/nodejs_0.8.28.bb | 2 | ||||
| -rw-r--r-- | recipes-extended/monit/monit_5.12.2.bb | 6 |
2 files changed, 7 insertions, 1 deletions
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 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 |