diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2016-12-11 11:10:48 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2016-12-26 09:17:48 +0100 |
| commit | ec043831c0d4b1ceac1990b2318575c4f314b48a (patch) | |
| tree | 8b12cafd55fd1c60b3860a60bfce9bca7b9134c6 | |
| parent | 2403dd1975733517af51951d20168760ae3d2ba9 (diff) | |
uCLibc-ng includes libiconv-tiny
| -rw-r--r-- | package/Makefile | 4 | ||||
| -rw-r--r-- | package/libiconv-tiny/Makefile | 39 | ||||
| -rw-r--r-- | target/arm/uclibc-ng.config | 1 | ||||
| -rw-r--r-- | target/config/Config.in.toolchain | 5 |
4 files changed, 1 insertions, 48 deletions
diff --git a/package/Makefile b/package/Makefile index 7dbb6cfaf..2a04ad047 100644 --- a/package/Makefile +++ b/package/Makefile @@ -30,10 +30,6 @@ 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)) diff --git a/package/libiconv-tiny/Makefile b/package/libiconv-tiny/Makefile deleted file mode 100644 index f139fd31c..000000000 --- a/package/libiconv-tiny/Makefile +++ /dev/null @@ -1,39 +0,0 @@ -# This file is part of the OpenADK project. OpenADK is copyrighted -# material, please see the LICENCE file in the top-level directory. - -include $(ADK_TOPDIR)/rules.mk - -PKG_NAME:= libiconv-tiny -PKG_VERSION:= 0.1 -PKG_RELEASE:= 1 -PKG_HASH:= 1410d40697a5eda9de5e433edfbed540b66c3e1af7374b8507ab9c468b7d9012 -PKG_DESCR:= iconv stub and replacement -PKG_SECTION:= libs/misc -PKG_URL:= http://www.openwrt.org/ -PKG_SITES:= http://distfiles.openadk.org/ - -DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz - -include $(ADK_TOPDIR)/mk/host.mk -include $(ADK_TOPDIR)/mk/package.mk - -$(eval $(call HOST_template,LIBICONV_TINY,libiconv-tiny,$(PKG_VERSION)-${PKG_RELEASE})) -$(eval $(call PKG_template,LIBICONV_TINY,libiconv-tiny,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) - -HOST_STYLE:= manual -CONFIG_STYLE:= manual - -host-build: - (cd ${WRKBUILD} && env ${HOST_MAKE_ENV} ${MAKE} -f ${MAKE_FILE} \ - ${HOST_MAKE_FLAGS} ${HOST_ALL_TARGET}) - -libiconv-tiny-hostinstall: - $(CP) $(WRKBUILD)/libiconv.a $(STAGING_HOST_DIR)/usr/lib - $(CP) $(WRKBUILD)/include/* $(STAGING_HOST_DIR)/usr/include - $(CP) $(WRKBUILD)/charmaps $(STAGING_HOST_DIR)/usr/include - $(INSTALL_DIR) $(STAGING_HOST_DIR)/usr/share/aclocal - $(CP) $(WRKBUILD)/m4/iconv.m4 \ - $(STAGING_HOST_DIR)/usr/share/aclocal - -include ${ADK_TOPDIR}/mk/host-bottom.mk -include ${ADK_TOPDIR}/mk/pkg-bottom.mk diff --git a/target/arm/uclibc-ng.config b/target/arm/uclibc-ng.config index 490f56a96..ee721c754 100644 --- a/target/arm/uclibc-ng.config +++ b/target/arm/uclibc-ng.config @@ -167,6 +167,7 @@ UCLIBC_HAS_CTYPE_SIGNED=y UCLIBC_HAS_CTYPE_CHECKED=y # UCLIBC_HAS_CTYPE_ENFORCED is not set UCLIBC_HAS_WCHAR=y +UCLIBC_HAS_LIBICONV=y # UCLIBC_HAS_LOCALE is not set UCLIBC_HAS_HEXADECIMAL_FLOATS=y UCLIBC_HAS_GLIBC_CUSTOM_PRINTF=y diff --git a/target/config/Config.in.toolchain b/target/config/Config.in.toolchain index 3cf310e68..92bfd79d5 100644 --- a/target/config/Config.in.toolchain +++ b/target/config/Config.in.toolchain @@ -26,11 +26,6 @@ endchoice choice depends on ADK_TARGET_OS_LINUX bool "Iconv implementation" -default ADK_TARGET_WITHOUT_ICONV if ADK_TARGET_WITHOUT_MMU - -config ADK_TARGET_LIBICONV_TINY - bool "Use tiny libiconv package" - select ADK_PACKAGE_LIBICONV_TINY config ADK_TARGET_LIBC_ICONV bool "Use iconv from C library" |