From 63edc1b4f00ce5b17a8e3815d0223cbaf56ceead Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Tue, 23 Apr 2019 21:56:49 -0700 Subject: [PATCH] sysrepo: Fix compilation with bindings enabled By default the buildbot does not build the bindings and thus misses this. The BUILD_DEPENDS is totally broken. Removing the + sign should fix it. The SWIG directories are wrong. Fix them. Signed-off-by: Rosen Penev --- net/sysrepo/Makefile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/net/sysrepo/Makefile b/net/sysrepo/Makefile index a9fb24fdb8..2b91abba81 100644 --- a/net/sysrepo/Makefile +++ b/net/sysrepo/Makefile @@ -12,7 +12,7 @@ PKG_MAINTAINER:=Mislav Novakovic PKG_NAME:=sysrepo PKG_VERSION:=0.7.7 -PKG_RELEASE:=3 +PKG_RELEASE:=4 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/sysrepo/sysrepo/tar.gz/v$(PKG_VERSION)? @@ -33,7 +33,7 @@ define Package/libsysrepo/config source "$(SOURCE)/Config_libsysrepo.in" endef -PKG_BUILD_DEPENDS:=+SYSREPO_BINDINGS:swig/host +PKG_BUILD_DEPENDS:=SYSREPO_BINDINGS:swig/host define Package/libsysrepo SECTION:=utils @@ -109,7 +109,8 @@ ifeq ($(CONFIG_SYSREPO_BINDINGS),y) CMAKE_OPTIONS += \ -DCMAKE_DISABLE_FIND_PACKAGE_SWIG=FALSE \ -DGEN_LANGUAGE_BINDINGS:BOOL=TRUE \ - -DSWIG_DIR=$(STAGING_DIR)/host/share/swig \ + -DSWIG_DIR=$(STAGING_DIR_HOSTPKG)/share/swig \ + -DSWIG_EXECUTABLE=$(STAGING_DIR_HOSTPKG)/bin/swig \ -DCALL_TARGET_BINS_DIRECTLY=OFF endif