From b17b11939e55aab2b167b42ce13ff2f4059546e9 Mon Sep 17 00:00:00 2001 From: Eneas U de Queiroz Date: Tue, 7 Aug 2018 08:59:12 -0300 Subject: [PATCH] libupm: don't set SWIG_DIR, force python 2.7 CMake 3.0.12 uses SWIG_DIR to set SWIG_LIB, used as the library install location, which defaults to $(STAGING_HOSTPKG)/share/sig/(SWIGVERSION). If it is set, then the original installed swig library directory is ignored, and compilation fails: [ 0%] Swig source :1: Error: Unable to find 'swig.swg' :3: Error: Unable to find 'python.swg' Instead of setting it manually, let the default be used, which works well. Also, cmake picks up python3, while package wants 2.7, so we add -DPython_ADDITIONAL_VERSIONS=2.7 to force use of 2.7, not 3.x. Signed-off-by: Eneas U de Queiroz --- libs/libupm/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/libupm/Makefile b/libs/libupm/Makefile index 327c2f582..4ff86afc8 100644 --- a/libs/libupm/Makefile +++ b/libs/libupm/Makefile @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libupm PKG_VERSION:=0.4.0 -PKG_RELEASE=$(PKG_SOURCE_VERSION) +PKG_RELEASE=$(PKG_SOURCE_VERSION)-1 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/intel-iot-devkit/upm.git @@ -38,7 +38,7 @@ UPM_MODULES:= \ CMAKE_OPTIONS=-DBUILDARCH=$(CONFIG_ARCH) \ -DNODE_EXECUTABLE=$(STAGING_DIR_HOSTPKG)/bin/node \ - -DSWIG_DIR=$(STAGING_DIR_HOSTPKG)/bin + -DPython_ADDITIONAL_VERSIONS=2.7 define Package/libupm/Default SECTION:=libs