From 658069d50ff42b184de6f5e07cd0d62756322d70 Mon Sep 17 00:00:00 2001
From: vanhofen <vanhofen@gmx.de>
Date: Sat, 26 Oct 2019 22:32:41 +0200
Subject: [PATCH] - move iconv target to target-libs.mk

---
 make/target-libs.mk                           | 34 +++++++++++++++++++
 make/target-tools.mk                          | 34 -------------------
 .../disable_transliterations.patch}           |  0
 .../strip_charsets.patch}                     |  0
 4 files changed, 34 insertions(+), 34 deletions(-)
 rename patches/{iconv-disable_transliterations.patch => libiconv/disable_transliterations.patch} (100%)
 rename patches/{iconv-strip_charsets.patch => libiconv/strip_charsets.patch} (100%)

diff --git a/make/target-libs.mk b/make/target-libs.mk
index fdc401f3..f5e86728 100644
--- a/make/target-libs.mk
+++ b/make/target-libs.mk
@@ -1325,3 +1325,37 @@ popt: $(ARCHIVE)/$(POPT_SOURCE) | $(TARGET_DIR)
 	$(REWRITE_LIBTOOL)/libpopt.la
 	$(REMOVE)/$(POPT_TMP)
 	$(TOUCH)
+
+# -----------------------------------------------------------------------------
+
+LIBICONV_VER    = 1.13.1
+LIBICONV_TMP    = libiconv-$(LIBICONV_VER)
+LIBICONV_SOURCE = libiconv-$(LIBICONV_VER).tar.gz
+LIBICONV_URL    = https://ftp.gnu.org/gnu/libiconv
+
+$(ARCHIVE)/$(LIBICONV_SOURCE):
+	$(DOWNLOAD) $(LIBICONV_URL)/$(LIBICONV_SOURCE)
+
+LIBICONV_PATCH  = disable_transliterations.patch
+LIBICONV_PATCH += strip_charsets.patch
+
+# builds only stripped down iconv binary used for smarthomeinfo plugin
+iconv: $(ARCHIVE)/$(LIBICONV_SOURCE) | $(TARGET_DIR)
+	$(REMOVE)/$(LIBICONV_TMP)
+	$(UNTAR)/$(LIBICONV_SOURCE)
+	$(CHDIR)/$(LIBICONV_TMP); \
+		$(call apply_patches, $(addprefix libiconv/,$(LIBICONV_PATCH))); \
+		$(CONFIGURE) \
+			--target=$(TARGET) \
+			--prefix= \
+			--datarootdir=$(remove-datarootdir) \
+			--includedir=$(remove-includedir) \
+			--libdir=$(remove-libdir) \
+			--enable-static \
+			--disable-shared \
+			--enable-relocatable \
+			; \
+		$(MAKE); \
+		$(MAKE) install DESTDIR=$(TARGET_DIR)
+	$(REMOVE)/$(LIBICONV_TMP)
+	$(TOUCH)
diff --git a/make/target-tools.mk b/make/target-tools.mk
index 2bd38189..f3048d62 100644
--- a/make/target-tools.mk
+++ b/make/target-tools.mk
@@ -1628,40 +1628,6 @@ wget: $(WGET_DEPS) $(ARCHIVE)/$(WGET_SOURCE) | $(TARGET_DIR)
 
 # -----------------------------------------------------------------------------
 
-LIBICONV_VER    = 1.13.1
-LIBICONV_TMP    = libiconv-$(LIBICONV_VER)
-LIBICONV_SOURCE = libiconv-$(LIBICONV_VER).tar.gz
-LIBICONV_URL    = https://ftp.gnu.org/gnu/libiconv
-
-$(ARCHIVE)/$(LIBICONV_SOURCE):
-	$(DOWNLOAD) $(LIBICONV_URL)/$(LIBICONV_SOURCE)
-
-LIBICONV_PATCH  = iconv-disable_transliterations.patch
-LIBICONV_PATCH += iconv-strip_charsets.patch
-
-# builds only stripped down iconv binary used for smarthomeinfo plugin
-iconv: $(ARCHIVE)/$(LIBICONV_SOURCE) | $(TARGET_DIR)
-	$(REMOVE)/$(LIBICONV_TMP)
-	$(UNTAR)/$(LIBICONV_SOURCE)
-	$(CHDIR)/$(LIBICONV_TMP); \
-		$(call apply_patches, $(LIBICONV_PATCH)); \
-		$(CONFIGURE) \
-			--target=$(TARGET) \
-			--prefix= \
-			--datarootdir=$(remove-datarootdir) \
-			--includedir=$(remove-includedir) \
-			--libdir=$(remove-libdir) \
-			--enable-static \
-			--disable-shared \
-			--enable-relocatable \
-			; \
-		$(MAKE); \
-		$(MAKE) install DESTDIR=$(TARGET_DIR)
-	$(REMOVE)/$(LIBICONV_TMP)
-	$(TOUCH)
-
-# -----------------------------------------------------------------------------
-
 ofgwrite: $(SOURCE_DIR)/$(NI-OFGWRITE) | $(TARGET_DIR)
 	$(REMOVE)/$(NI-OFGWRITE)
 	tar -C $(SOURCE_DIR) -cp $(NI-OFGWRITE) --exclude-vcs | tar -C $(BUILD_TMP) -x
diff --git a/patches/iconv-disable_transliterations.patch b/patches/libiconv/disable_transliterations.patch
similarity index 100%
rename from patches/iconv-disable_transliterations.patch
rename to patches/libiconv/disable_transliterations.patch
diff --git a/patches/iconv-strip_charsets.patch b/patches/libiconv/strip_charsets.patch
similarity index 100%
rename from patches/iconv-strip_charsets.patch
rename to patches/libiconv/strip_charsets.patch