From e7408d94c5167d1c5a3ccaf4df08c1b7ad008b46 Mon Sep 17 00:00:00 2001 From: Eneas U de Queiroz Date: Mon, 6 Aug 2018 10:39:01 -0300 Subject: [PATCH] libmraa: don't set SWIG_DIR CMake 3.0.12 uses SWIG_DIR to set SWIG_LIB, is used as the library install location, which defaults to $(STAGING_HOSTPKG)/share/sig/(SWIGVERSION). If it is set, then the installed swig library directory is ignored, and compilation fails: [ 32%] 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. Signed-off-by: Eneas U de Queiroz --- libs/libmraa/Makefile | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/libs/libmraa/Makefile b/libs/libmraa/Makefile index 633dc9effd..e41329ada1 100644 --- a/libs/libmraa/Makefile +++ b/libs/libmraa/Makefile @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libmraa PKG_VERSION:=0.9.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/mraa.git @@ -29,8 +29,7 @@ include $(INCLUDE_DIR)/cmake.mk CMAKE_OPTIONS=-DBUILDARCH=$(CONFIG_ARCH) \ -DENABLEEXAMPLES=0 \ - -DNODE_EXECUTABLE=$(STAGING_DIR_HOSTPKG)/bin/node \ - -DSWIG_DIR=$(STAGING_DIR_HOSTPKG)/bin + -DNODE_EXECUTABLE=$(STAGING_DIR_HOSTPKG)/bin/node TARGET_CFLAGS+=-I$(STAGING_DIR)/usr/include/node -- 2.30.2