cubixle/packages
1
0
Fork 0
mirror of https://github.com/novatiq/packages.git synced 2026-04-30 15:38:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

libupm: don't set SWIG_DIR, force python 2.7

Browse Source 
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 <cote2004-github@yahoo.com>
This commit is contained in:
Eneas U de Queiroz
2018-08-07 08:59:12 -03:00
parent 30694e641e
commit b17b11939e
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libs/libupm/Makefile
+2 -2
View File
@@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=libupm PKG_NAME:=libupm
PKG_VERSION:=0.4.0 PKG_VERSION:=0.4.0
PKG_RELEASE=$(PKG_SOURCE_VERSION) PKG_RELEASE=$(PKG_SOURCE_VERSION)-1
PKG_SOURCE_PROTO:=git PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=https://github.com/intel-iot-devkit/upm.git PKG_SOURCE_URL:=https://github.com/intel-iot-devkit/upm.git
@@ -38,7 +38,7 @@ UPM_MODULES:= \
CMAKE_OPTIONS=-DBUILDARCH=$(CONFIG_ARCH) \ CMAKE_OPTIONS=-DBUILDARCH=$(CONFIG_ARCH) \
-DNODE_EXECUTABLE=$(STAGING_DIR_HOSTPKG)/bin/node \ -DNODE_EXECUTABLE=$(STAGING_DIR_HOSTPKG)/bin/node \
-DSWIG_DIR=$(STAGING_DIR_HOSTPKG)/bin -DPython_ADDITIONAL_VERSIONS=2.7
define Package/libupm/Default define Package/libupm/Default
SECTION:=libs SECTION:=libs