diff options
| author | Rosen Penev <rosenp@gmail.com> | 2019-06-21 00:50:49 -0700 |
|---|---|---|
| committer | Rosen Penev <rosenp@gmail.com> | 2019-06-21 12:25:54 -0700 |
| commit | 50719a639a89a3da57b2fbdf393cee03837dd640 (patch) | |
| tree | 58b4b697d5eb1cb8a30ac053b35aafe6f97cabf5 /libs/elektra/Makefile | |
| parent | 134ebb7a9d5ea2f96f7ea74b4b6df7a97c9b28c1 (diff) | |
elektra: Fix compilation with uClibc-ng
Add patch that checks for libiconv instead of iconv. nls.mk handles this.
Signed-off-by: Rosen Penev <rosenp@gmail.com>
Diffstat (limited to 'libs/elektra/Makefile')
| -rw-r--r-- | libs/elektra/Makefile | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/libs/elektra/Makefile b/libs/elektra/Makefile index 3c2c14671..a38de8da5 100644 --- a/libs/elektra/Makefile +++ b/libs/elektra/Makefile @@ -15,7 +15,7 @@ PKG_NAME:=elektra PKG_LICENSE:=BSD-3-Clause PKG_LICENSE_FILES:=LICENSE.md PKG_VERSION:=0.8.21 -PKG_RELEASE:=2 +PKG_RELEASE:=3 # Use this for official releasees PKG_HASH:=51892570f18d1667d0da4d0908a091e41b41c20db9835765677109a3d150cd26 @@ -34,6 +34,7 @@ PKG_BUILD_DEPENDS:=elektra/host swig/host include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/host-build.mk include $(INCLUDE_DIR)/cmake.mk +include $(INCLUDE_DIR)/nls.mk define Package/libelektra/Default SECTION:=libs @@ -93,7 +94,7 @@ endef define Package/libelektra-plugins $(call Package/libelektra/Default) TITLE:=Useful elektra plugins - DEPENDS:=+libelektra-core + DEPENDS:=+libelektra-core $(ICONV_DEPENDS) endef define CONTENT_ELEKTRA_PLUGINS_TEXT @@ -302,7 +303,10 @@ CMAKE_OPTIONS = \ -DKDB_DEFAULT_RESOLVER=resolver_fm_pb_b \ -DKDB_DEFAULT_STORAGE=ini \ -DENABLE_OPTIMIZATIONS=OFF \ - -DPLUGINS="ALL;-multifile" + -DPLUGINS="ALL;-multifile" \ + -DICONV_FIND_REQUIRED=ON \ + -DICONV_INCLUDE_DIR="$(ICONV_PREFIX)/include" \ + -DICONV_LIBRARY="$(ICONV_PREFIX)/lib" CMAKE_HOST_OPTIONS = \ -DCMAKE_SKIP_RPATH=FALSE \ |