diff options
| -rw-r--r-- | recipes-devtools/upm/upm/0001-cmake-Solved-issue-with-nodejs-installation-path.patch | 35 | ||||
| -rw-r--r-- | recipes-devtools/upm/upm_0.6.1.bb | 52 |
2 files changed, 73 insertions, 14 deletions
diff --git a/recipes-devtools/upm/upm/0001-cmake-Solved-issue-with-nodejs-installation-path.patch b/recipes-devtools/upm/upm/0001-cmake-Solved-issue-with-nodejs-installation-path.patch new file mode 100644 index 0000000..81b2ea0 --- /dev/null +++ b/recipes-devtools/upm/upm/0001-cmake-Solved-issue-with-nodejs-installation-path.patch @@ -0,0 +1,35 @@ +From 8b56cc896a7d743d61379d1e538de35cef4ceb7f Mon Sep 17 00:00:00 2001 +From: Andrei Vasiliu <andrei.vasiliu@intel.com> +Date: Tue, 5 Apr 2016 16:30:56 +0300 +Subject: [PATCH] cmake: Solved issue with nodejs installation path + +Changed ${LIB_INSTALL_DIR} with lib, because the variable expands to +/usr/lib, making the install path /usr/usr/lib/node_modules, which +is incorrect. Now the install path is /usr/lib/node_modules. + +Signed-off-by: Andrei Vasiliu <andrei.vasiliu@intel.com> +--- + src/CMakeLists.txt | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 74bae09..d884c52 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -203,11 +203,11 @@ if (SWIG_FOUND) + # If a CMAKE_INSTALL_PREFIX has NOT been provided, set NODE_MODULE_INSTALL_PATH + # base on the NODE_ROOT_DIR. + if (CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) +- set (NODE_MODULE_INSTALL_PATH ${NODE_ROOT_DIR}/${LIB_INSTALL_DIR}/node_modules/jsupm_${libname}/) ++ set (NODE_MODULE_INSTALL_PATH ${NODE_ROOT_DIR}/lib/node_modules/jsupm_${libname}/) + # If a CMAKE_INSTALL_PREFIX has been provided, set NODE_MODULE_INSTALL_PATH + # relative to the provided install directory. + else () +- set (NODE_MODULE_INSTALL_PATH ${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/node_modules/jsupm_${libname}/) ++ set (NODE_MODULE_INSTALL_PATH ${CMAKE_INSTALL_PREFIX}/lib/node_modules/jsupm_${libname}/) + endif () + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/package.json + DESTINATION ${NODE_MODULE_INSTALL_PATH} COMPONENT ${libname}) +-- +1.9.1 + diff --git a/recipes-devtools/upm/upm_0.6.1.bb b/recipes-devtools/upm/upm_0.6.1.bb index 329ec37..97bdba8 100644 --- a/recipes-devtools/upm/upm_0.6.1.bb +++ b/recipes-devtools/upm/upm_0.6.1.bb @@ -8,18 +8,51 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=d1cc191275d6a8c5ce039c75b2b3dc29" DEPENDS = "nodejs swig-native mraa" SRC_URI = "git://github.com/intel-iot-devkit/upm.git;protocol=git;rev=655ccee9afd259bff1773e9e8aea860f6e06b69f \ -" + file://0001-cmake-Solved-issue-with-nodejs-installation-path.patch \ + " S = "${WORKDIR}/git" inherit distutils-base pkgconfig python-dir cmake -FILES_${PN}-doc += "${datadir}/upm/examples/" +PACKAGES =+ "python-${PN} node-${PN} ${PN}-java" + +# python-upm package containing Python bindings +FILES_python-${PN} = "${PYTHON_SITEPACKAGES_DIR}/ \ + ${datadir}/${BPN}/examples/python/ \ + ${prefix}/src/debug/${BPN}/${PV}-${PR}/build/src/*/pyupm_* \ + " +RDEPENDS_python-${PN} += "python mraa" +INSANE_SKIP_python-${PN} = "debug-files" + +# node-upm package containing Nodejs bindings +FILES_node-${PN} = "${libdir}/node_modules/ \ + ${datadir}/${BPN}/examples/javascript/ \ + " +RDEPENDS_node-${PN} += "nodejs mraa" +INSANE_SKIP_node-${PN} = "debug-files" + +# upm-java package containing Java bindings +FILES_${PN}-java = "${libdir}/libjava*.so \ + ${libdir}/java/ \ + ${datadir}/${BPN}/examples/java/ \ + ${prefix}/src/debug/${BPN}/${PV}-${PR}/build/src/*/*javaupm_* \ + ${libdir}/.debug/libjava*.so \ + " +# include .jar files in /usr/lib/java for 64 bit builds +FILES_${PN}-java_append = "${@' ${libdir}/../lib/java/*' if '${TARGET_ARCH}' == 'x86_64' else ''}" + +RDEPENDS_${PN}-java += "java-runtime mraa-java" +INSANE_SKIP_${PN}-java = "debug-files" + + +FILES_${PN}-doc += " ${datadir}/upm/examples/" +RDEPENDS_${PN} += " mraa" PACKAGECONFIG ??= "python nodejs java" -PACKAGECONFIG[python] = "-DBUILDSWIGPYTHON=OFF, -DBUILDSWIGPYTHON=OFF, swig-native python, python-mraa" -PACKAGECONFIG[nodejs] = "-DBUILDSWIGNODE=OFF, -DBUILDSWIGNODE=OFF, swig-native nodejs, node-mraa" -PACKAGECONFIG[java] = "-DBUILDSWIGJAVA=ON, -DBUILDSWIGJAVA=OFF, swig-native icedtea7-native, java-mraa" +PACKAGECONFIG[python] = "-DBUILDSWIGPYTHON=ON, -DBUILDSWIGPYTHON=OFF, swig-native python," +PACKAGECONFIG[nodejs] = "-DBUILDSWIGNODE=ON, -DBUILDSWIGNODE=OFF, swig-native nodejs," +PACKAGECONFIG[java] = "-DBUILDSWIGJAVA=ON, -DBUILDSWIGJAVA=OFF, swig-native icedtea7-native," export JAVA_HOME="${STAGING_DIR}/${BUILD_SYS}/usr/lib/jvm/icedtea7-native" @@ -33,12 +66,3 @@ set (JAVA_JVM_LIBRARY ${JAVA_HOME}/jre/lib/amd64/libjvm.so CACHE FILEPATH \"path " >> ${WORKDIR}/toolchain.cmake } -# include .jar files in /usr/lib/java for 64 bit builds -FILES_${PN}_append = "${@' ${libdir}/../lib/java/*.jar' if '${TARGET_ARCH}' == 'x86_64' else ''}" - -# include nodejs files in /usr/lib/node_modules for 64 bit builds -FILES_${PN}_append = "${@' ${libdir}/../lib/node_modules/*' if '${TARGET_ARCH}' == 'x86_64' else ''}" - -# include .so symlinks in main package -FILES_${PN}_append = "${@' ${libdir}/../lib64/*.so' if '${TARGET_ARCH}' == 'x86_64' else ' ${libdir}/../lib/*.so'}" -INSANE_SKIP_${PN} = "dev-so" |