From acc59d3a0a5056633a4bdbc2273478eca6850a6c Mon Sep 17 00:00:00 2001 From: Sebastian Kemper Date: Sun, 8 Jul 2018 11:45:24 +0200 Subject: [PATCH] gnunet: fix uclibc build issue libmariadb 10.2.x needs to be linked in together with iconv. On glibc and musl iconv is part of libc. But on uclibc libiconv-full needs to be used. gnunet only has access to iconv on uclibc when BUILD_NLS is selected. This commit adds hidden symbol GNUNET_HAS_ICONV_SUPPORT which sorts this out. Signed-off-by: Sebastian Kemper --- net/gnunet/Makefile | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/net/gnunet/Makefile b/net/gnunet/Makefile index b3567265b7..208a990cd3 100644 --- a/net/gnunet/Makefile +++ b/net/gnunet/Makefile @@ -5,7 +5,7 @@ PKG_SOURCE_VERSION:=2b99bddcb6961cfda34087138acdda4b8b9ccb9f PKG_MIRROR_HASH:=7b1567d4d4b316ed4b70372bbcfc2039a93d6a7bbf24c2b3036b2c7f3bccc9b4 PKG_VERSION:=0.10.2-git-20180607-$(PKG_SOURCE_VERSION) -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) @@ -72,6 +72,13 @@ define Package/gnunet/description well as their helpers. endef +define Package/gnunet/config +config GNUNET_HAS_ICONV_SUPPORT + depends on PACKAGE_gnunet && (!USE_UCLIBC || (USE_UCLIBC && BUILD_NLS)) + bool + default y +endef + define BuildComponent PKG_CONFIG_DEPENDS+=CONFIG_PACKAGE_$(PKG_NAME)-$(1) @@ -280,7 +287,7 @@ DEPENDS_fs-heap:=+gnunet-datastore PLUGIN_fs-heap:=datastore_heap CONFLICTS_fs-heap:=gnunet-fs-mysql gnunet-fs-pgsql gnunet-fs-sqlite -DEPENDS_mysql:=+libmysqlclient +DEPENDS_mysql:=+libmysqlclient @GNUNET_HAS_ICONV_SUPPORT LIB_mysql:=mysql my DEPENDS_social-mysql:=+gnunet-mysql +gnunet-social -- 2.30.2