From 360767f2ef426c9249131831286df32bd4bb666d Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Wed, 1 Jul 2015 12:53:29 -0500 Subject: first step to rework iconv setup Add a choice to select libiconv, C library iconv or libiconv-tiny. --- package/Makefile | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) (limited to 'package/Makefile') diff --git a/package/Makefile b/package/Makefile index bfe4a0bd7..a5b851d02 100644 --- a/package/Makefile +++ b/package/Makefile @@ -35,6 +35,15 @@ COMPILE_PACKAGES:=$(patsubst %,%-compile,$(package-y)) HOST_COMPILE_PACKAGES:=$(patsubst %,%-host-compile,$(hostpackage-y)) INSTALL_PACKAGES:=$(patsubst %,%-install,$(package-y)) +ifeq ($(ADK_TARGET_LIBICONV),y) +COMPILE_ICONV:=libiconv-compile +INSTALL_ICONV:=libiconv-install +endif +ifeq ($(ADK_TARGET_LIBICONV_TINY),y) +COMPILE_ICONV:=libiconv-tiny-compile +INSTALL_ICONV:=libiconv-tiny-install +endif + all: compile download: $(patsubst %,%-download,$(package-y)) clean: $(patsubst %,%-clean,$(package-) $(package-y) base-files) @@ -43,8 +52,8 @@ ifeq ($(ADK_TOOLCHAIN_ONLY),y) compile: $(COMPILE_PACKAGES) install: $(INSTALL_PACKAGES) else -compile: base-files-compile $(COMPILE_PACKAGES) -install: base-files-install $(INSTALL_PACKAGES) +compile: base-files-compile $(COMPILE_ICONV) $(COMPILE_PACKAGES) +install: base-files-install $(INSTALL_ICONV) $(INSTALL_PACKAGES) endif %-download: -- cgit v1.2.3