[oe,meta-intel-iot-middleware] upm: update to 0.6.1 release

Message ID 1460644716-29000-1-git-send-email-fathi.boudra@linaro.org
State New
Headers show

Commit Message

Fathi Boudra April 14, 2016, 2:38 p.m.
* update SRC_URI to 0.6.1 revision
* drop patch - merged upstream
* fix packageconfig: python/nodejs bindings are always turned off
  whatever the packageconfig value is

Signed-off-by: Fathi Boudra <fathi.boudra@linaro.org>

---
 ...438-CMakeLists.txt-stop-RPATH-being-added.patch | 31 ----------------------
 .../upm/{upm_0.4.1.bb => upm_0.6.1.bb}             |  8 +++---
 2 files changed, 3 insertions(+), 36 deletions(-)
 delete mode 100644 recipes-devtools/upm/upm/0001-adafruitms1438-CMakeLists.txt-stop-RPATH-being-added.patch
 rename recipes-devtools/upm/{upm_0.4.1.bb => upm_0.6.1.bb} (60%)

-- 
2.8.1

-- 
_______________________________________________
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

Patch hide | download patch | download mbox

diff --git a/recipes-devtools/upm/upm/0001-adafruitms1438-CMakeLists.txt-stop-RPATH-being-added.patch b/recipes-devtools/upm/upm/0001-adafruitms1438-CMakeLists.txt-stop-RPATH-being-added.patch
deleted file mode 100644
index 61822e3..0000000
--- a/recipes-devtools/upm/upm/0001-adafruitms1438-CMakeLists.txt-stop-RPATH-being-added.patch
+++ /dev/null
@@ -1,31 +0,0 @@ 
-From 0e89657449e320bf2cf71bbdd955b190102c7806 Mon Sep 17 00:00:00 2001
-From: Brendan Le Foll <brendan.le.foll@intel.com>
-Date: Tue, 2 Jun 2015 14:31:23 +0100
-Subject: [PATCH] adafruitms1438/CMakeLists.txt: stop RPATH being added to swig
-
-This stops an rpath warning in SWIG
-
-Signed-off-by: Brendan Le Foll <brendan.le.foll@intel.com>
----
- src/adafruitms1438/CMakeLists.txt | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/adafruitms1438/CMakeLists.txt b/src/adafruitms1438/CMakeLists.txt
-index e14d1d5..baf6c99 100644
---- a/src/adafruitms1438/CMakeLists.txt
-+++ b/src/adafruitms1438/CMakeLists.txt
-@@ -9,9 +9,11 @@ add_dependencies(${libname} pca9685)
- target_link_libraries(${libname} pca9685)
- if (BUILDSWIG)
-   if (BUILDSWIGNODE)
-+    set_target_properties(${SWIG_MODULE_jsupm_${libname}_REAL_NAME} PROPERTIES SKIP_BUILD_RPATH TRUE)
-     swig_link_libraries (jsupm_${libname} pca9685 ${MRAA_LIBRARIES} ${NODE_LIBRARIES})
-   endif()
-   if (BUILDSWIGPYTHON)
-+    set_target_properties(${SWIG_MODULE_pyupm_${libname}_REAL_NAME} PROPERTIES SKIP_BUILD_RPATH TRUE)
-     swig_link_libraries (pyupm_${libname} pca9685 ${PYTHON_LIBRARIES} ${MRAA_LIBRARIES})
-   endif()
- endif()
--- 
-2.4.1
-
diff --git a/recipes-devtools/upm/upm_0.4.1.bb b/recipes-devtools/upm/upm_0.6.1.bb
similarity index 60%
rename from recipes-devtools/upm/upm_0.4.1.bb
rename to recipes-devtools/upm/upm_0.6.1.bb
index fa79529..a045175 100644
--- a/recipes-devtools/upm/upm_0.4.1.bb
+++ b/recipes-devtools/upm/upm_0.6.1.bb
@@ -7,9 +7,7 @@  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=74691914fb3bb108f2f37e09e4a9851a52b4d504 \
-           file://0001-adafruitms1438-CMakeLists.txt-stop-RPATH-being-added.patch \
-"
+SRC_URI = "git://github.com/intel-iot-devkit/upm.git;protocol=git;rev=655ccee9afd259bff1773e9e8aea860f6e06b69f"
 
 S = "${WORKDIR}/git"
 
@@ -18,5 +16,5 @@  inherit distutils-base pkgconfig python-dir cmake
 FILES_${PN}-doc += "${datadir}/upm/examples/"
 
 PACKAGECONFIG ??= "python nodejs"
-PACKAGECONFIG[python] = "-DBUILDSWIGPYTHON=OFF, -DBUILDSWIGPYTHON=OFF, swig-native python"
-PACKAGECONFIG[nodejs] = "-DBUILDSWIGNODE=OFF, -DBUILDSWIGNODE=OFF, swig-native nodejs"
+PACKAGECONFIG[python] = "-DBUILDSWIGPYTHON=ON, -DBUILDSWIGPYTHON=OFF, swig-native python"
+PACKAGECONFIG[nodejs] = "-DBUILDSWIGNODE=ON, -DBUILDSWIGNODE=OFF, swig-native nodejs"