From: Sebastian Kemper <sebastian_ml@gmx.net>
Date: Fri, 13 Jul 2018 21:05:01 +0000 (+0200)
Subject: gnunet: remove iconv hack
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=f546ac9b80335695e6c2147cbf9dbe4665fac1f5;p=feed%2Fpackages.git

gnunet: remove iconv hack

Undo previous commit that added an iconv hack. The problem was actually
fixed by including nls.mk in the mariadb package.

Signed-off-by: Sebastian Kemper <sebastian_ml@gmx.net>
---

diff --git a/net/gnunet/Makefile b/net/gnunet/Makefile
index 208a990cd3..f966ad34a8 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:=2
+PKG_RELEASE:=3
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
@@ -72,13 +72,6 @@ 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)
 
@@ -287,7 +280,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 @GNUNET_HAS_ICONV_SUPPORT
+DEPENDS_mysql:=+libmysqlclient
 LIB_mysql:=mysql my
 
 DEPENDS_social-mysql:=+gnunet-mysql +gnunet-social