diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2018-01-12 03:32:08 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2018-01-12 20:15:50 +0100 |
| commit | 64fe6eaadef5011aa56833b284f425fcf78c8666 (patch) | |
| tree | 3151cda2b302e7cae4d6f043d476ec860724cb3e | |
| parent | a5a60ae7133fc9b893f3d44c793ccc322fd913d3 (diff) | |
Revert "libiconv symbol was removed"
This reverts commit 9ca35e7ead58b872cca3ff9d7e3976863f8f8715.
| -rw-r--r-- | package/Makefile | 2 | ||||
| -rw-r--r-- | package/cups/Makefile | 2 | ||||
| -rw-r--r-- | package/glib/Makefile | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/package/Makefile b/package/Makefile index 4cc797176..2a04ad047 100644 --- a/package/Makefile +++ b/package/Makefile @@ -26,7 +26,7 @@ COMPILE_PACKAGES:=$(patsubst %,%-compile,$(package-y)) HOST_COMPILE_PACKAGES:=$(patsubst %,%-host-compile,$(hostpackage-y)) INSTALL_PACKAGES:=$(patsubst %,%-install,$(package-y)) -ifeq ($(ADK_TARGET_LIBC_WITH_LIBICONV),y) +ifeq ($(ADK_TARGET_LIBICONV),y) COMPILE_ICONV:=libiconv-compile INSTALL_ICONV:=libiconv-install endif diff --git a/package/cups/Makefile b/package/cups/Makefile index dc2aaa967..086896562 100644 --- a/package/cups/Makefile +++ b/package/cups/Makefile @@ -25,7 +25,7 @@ include ${ADK_TOPDIR}/mk/package.mk $(eval $(call HOST_template,CUPS,cups,${PKG_VERSION}-${PKG_RELEASE})) $(eval $(call PKG_template,CUPS,cups,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) -ifeq ($(ADK_TARGET_LIBC_WITH_LIBICONV),y) +ifeq ($(ADK_TARGET_LIBICONV),y) TARGET_LDFLAGS+= -liconv endif diff --git a/package/glib/Makefile b/package/glib/Makefile index 57e9b8f74..dd818f5a4 100644 --- a/package/glib/Makefile +++ b/package/glib/Makefile @@ -24,7 +24,7 @@ include $(ADK_TOPDIR)/mk/package.mk $(eval $(call HOST_template,GLIB,glib,$(PKG_VERSION)-$(PKG_RELEASE))) $(eval $(call PKG_template,GLIB,glib,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION),$(PKG_OPTS))) -ifeq ($(ADK_TARGET_LIBC_WITH_LIBICONV),y) +ifeq ($(ADK_TARGET_LIBICONV),y) CONFIGURE_ARGS+= --with-libiconv=yes endif CONFIGURE_ARGS+= --disable-mem-pools \ |