- add iconv to image (stripped version)

cleanup special tools target, as this will no longer be needed
8 years ago · 84f7f9ef2c
3 changed files with 24 additions and 72 deletions
--- a/make/ni.mk
+++ b/make/ni.mk
@ -62,6 +62,7 @@ ni-image:
 	make -j$(NUM_CPUS) wpa_supplicant
 	make -j$(NUM_CPUS) mtd-utils
 	make -j$(NUM_CPUS) wget
+	make -j$(NUM_CPUS) iconv
 ifeq ($(BOXSERIES), hd2)
 	make plugins-hd2
 	make -j$(NUM_CPUS) less
--- a/make/system-tools-extra.mk
+++ b/make/system-tools-extra.mk
@ -1,77 +1,5 @@
 # makefile to build extra system tools (mostly unused)

-################################# special tools for some addons/scripts
-
-make special-tools:
-	make clean BOXSERIES=hd1
-	make -j$(NUM_CPUS) xmllint BOXSERIES=hd1
-	make -j$(NUM_CPUS) iconv BOXSERIES=hd1
-	make -j$(NUM_CPUS) openvpn BOXSERIES=hd1
-	find $(TARGETPREFIX)/bin -type f -print0 | xargs -0 $(TARGET)-strip || true
-	find $(TARGETPREFIX)/sbin -type f -print0 | xargs -0 $(TARGET)-strip || true
-	mv $(TARGETPREFIX)/bin/xmllint $(UPDATE_DIR) && zip -j $(UPDATE_DIR)/xmllint_hd1.zip $(UPDATE_DIR)/xmllint && rm $(UPDATE_DIR)/xmllint
-	mv $(TARGETPREFIX)/bin/iconv $(UPDATE_DIR) && zip -j $(UPDATE_DIR)/iconv_hd1.zip $(UPDATE_DIR)/iconv && rm $(UPDATE_DIR)/iconv
-	mv $(TARGETPREFIX)/sbin/openvpn $(UPDATE_DIR) && zip -j $(UPDATE_DIR)/openvpn_hd1.zip $(UPDATE_DIR)/openvpn && rm $(UPDATE_DIR)/openvpn
-	#
-	make clean BOXSERIES=hd2
-	make -j$(NUM_CPUS) xmllint BOXSERIES=hd2
-	make -j$(NUM_CPUS) iconv BOXSERIES=hd2
-	find $(TARGETPREFIX)/bin -type f -print0 | xargs -0 $(TARGET)-strip || true
-	mv $(TARGETPREFIX)/bin/xmllint $(UPDATE_DIR) && zip -j $(UPDATE_DIR)/xmllint_hd2.zip $(UPDATE_DIR)/xmllint && rm $(UPDATE_DIR)/xmllint
-	mv $(TARGETPREFIX)/bin/iconv $(UPDATE_DIR) && zip -j $(UPDATE_DIR)/iconv_hd2.zip $(UPDATE_DIR)/iconv && rm $(UPDATE_DIR)/iconv
-	#
-	make clean
-
-$(D)/iconv: $(ARCHIVE)/libiconv-$(LIBICONV_VER).tar.gz | $(TARGETPREFIX)
-	$(UNTAR)/libiconv-$(LIBICONV_VER).tar.gz
-	pushd $(BUILD_TMP)/libiconv-$(LIBICONV_VER) && \
-	$(PATCH)/iconv-disable_transliterations.patch && \
-	$(PATCH)/iconv-strip_charsets.patch && \
-		$(CONFIGURE) \
-			--target=$(TARGET) \
-			--prefix= \
-			--enable-static \
-			--disable-shared \
-			--enable-relocatable \
-			--disable-rpath \
-			--datarootdir=/.remove && \
-		$(MAKE) && \
-		$(MAKE) install DESTDIR=$(TARGETPREFIX)
-	rm -rf $(TARGETLIB)/preloadable_libiconv.so
-	rm -rf $(TARGETLIB)/charset.alias
-	$(REMOVE)/libiconv-$(LIBICONV_VER)
-	$(REWRITE_LIBTOOL)/libiconv.la
-	$(REWRITE_LIBTOOL)/libcharset.la
-	touch $@
-
-$(D)/xmllint: $(ARCHIVE)/libxml2-$(LIBXML2_VER).tar.gz | $(TARGETPREFIX)
-	$(UNTAR)/libxml2-$(LIBXML2_VER).tar.gz
-	pushd $(BUILD_TMP)/libxml2-$(LIBXML2_VER) && \
-		$(CONFIGURE) \
-			--prefix= \
-			--enable-static \
-			--disable-shared \
-			--datarootdir=/.remove \
-			--without-python \
-			--without-debug \
-			--without-sax1 \
-			--without-legacy \
-			--without-catalog \
-			--without-docbook \
-			--without-lzma \
-			--without-schematron && \
-		$(MAKE) && \
-		$(MAKE) install DESTDIR=$(TARGETPREFIX)
-	mv $(TARGETPREFIX)/bin/xml2-config $(HOSTPREFIX)/bin
-	$(REWRITE_LIBTOOL)/libxml2.la
-	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/libxml-2.0.pc
-	$(REWRITE_PKGCONF) $(HOSTPREFIX)/bin/xml2-config
-	rm -rf $(TARGETLIB)/xml2Conf.sh
-	$(REMOVE)/libxml2-$(LIBXML2_VER)
-	touch $@
-
-#################################
-
 $(D)/openvpn-hd1: $(D)/kernel-cst-hd1 $(D)/lzo $(D)/openssl $(ARCHIVE)/openvpn-$(OPENVPN_VER).tar.xz | $(TARGETPREFIX)
 	$(UNTAR)/openvpn-$(OPENVPN_VER).tar.xz
 	cd $(BUILD_TMP)/openvpn-$(OPENVPN_VER) && \
--- a/make/system-tools.mk
+++ b/make/system-tools.mk
@ -948,3 +948,26 @@ $(D)/wget: $(D)/openssl $(ARCHIVE)/wget-$(WGET_VER).tar.gz | $(TARGETPREFIX)
 		$(MAKE) install DESTDIR=$(TARGETPREFIX)
 	$(REMOVE)/wget-$(WGET_VER)
 	touch $@
+
+# only used for smarthomeinfo plugin (stripped version)
+$(D)/iconv: $(ARCHIVE)/libiconv-$(LIBICONV_VER).tar.gz | $(TARGETPREFIX)
+	$(UNTAR)/libiconv-$(LIBICONV_VER).tar.gz
+	pushd $(BUILD_TMP)/libiconv-$(LIBICONV_VER) && \
+	$(PATCH)/iconv-disable_transliterations.patch && \
+	$(PATCH)/iconv-strip_charsets.patch && \
+		$(CONFIGURE) \
+			--target=$(TARGET) \
+			--prefix= \
+			--enable-static \
+			--disable-shared \
+			--enable-relocatable \
+			--disable-rpath \
+			--datarootdir=/.remove && \
+		$(MAKE) && \
+		$(MAKE) install DESTDIR=$(TARGETPREFIX)
+	rm -rf $(TARGETLIB)/preloadable_libiconv.so
+	rm -rf $(TARGETLIB)/charset.alias
+	$(REMOVE)/libiconv-$(LIBICONV_VER)
+	$(REWRITE_LIBTOOL)/libiconv.la
+	$(REWRITE_LIBTOOL)/libcharset.la
+	touch $@