diff options
| author | Sebastian Kemper <sebastian_ml@gmx.net> | 2018-07-13 23:05:01 +0200 |
|---|---|---|
| committer | Sebastian Kemper <sebastian_ml@gmx.net> | 2018-07-13 23:06:03 +0200 |
| commit | f546ac9b80335695e6c2147cbf9dbe4665fac1f5 (patch) | |
| tree | 7b17ed4d9600ca69a28e7415db649090e773ee7d /net | |
| parent | 3fdef4e2f309aeec69686e02a29f1f8cb1b4618b (diff) | |
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>
Diffstat (limited to 'net')
| -rw-r--r-- | net/gnunet/Makefile | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/net/gnunet/Makefile b/net/gnunet/Makefile index 208a990cd..f966ad34a 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 |